july 4 лет назад
Родитель
Сommit
e223b0debd

+ 1 - 2
ldt-core/src/main/java/org/springblade/common/aop/core/DecryptResolver.java

@@ -6,7 +6,6 @@ import org.springblade.common.aop.bean.DecryptBodyDTO;
 import org.springblade.common.config.ApiEncryptConfig;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.utils.AESEncryptUtil;
-import org.springblade.common.utils.JsonUtils;
 import org.springblade.common.utils.RequestUtil;
 import org.springblade.common.utils.ResponseUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -64,7 +63,7 @@ public class DecryptResolver implements HandlerMethodArgumentResolver {
 
 		// 解密后操作 解密前端传输套多一层{data:value}
 		if (decrypt) {
-			DecryptBodyDTO decryptBody = JsonUtils.jsonToPojo(result, DecryptBodyDTO.class);
+			DecryptBodyDTO decryptBody = JSONObject.parseObject(result, DecryptBodyDTO.class);
 			if (ObjectUtils.isEmpty(decryptBody) || StringUtils.isEmpty(decryptBody.getData())) {
 				throw new ServiceException(ResCode.PARAMETER_ERROR);
 			}

+ 0 - 118
ldt-core/src/main/java/org/springblade/common/utils/JsonUtils.java

@@ -1,118 +0,0 @@
-package org.springblade.common.utils;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springblade.common.aop.bean.DecryptBodyDTO;
-import org.springblade.common.config.ApiEncryptConfig;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @date: 2021/6/7 15:46
- * @Author: AaronXu
- * @Description: json工具类
- */
-public class JsonUtils {
-
-	// 定义jackson对象
-	private static final ObjectMapper MAPPER;
-
-	static {
-		MAPPER = JsonMapper.builder()
-//                忽略不能转移的参数
-			.configure(JsonParser.Feature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER, true)
-			.build();
-	}
-
-	/**
-	 * 将对象转换成json字符串。
-	 * <p>Title: pojoToJson</p>
-	 * <p>Description: </p>
-	 *
-	 * @param data
-	 * @return
-	 */
-	public static String objectToJson(Object data) {
-		try {
-			String string = MAPPER.writeValueAsString(data);
-			return string;
-		} catch (JsonProcessingException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 将json结果集转化为对象
-	 *
-	 * @param jsonData json数据
-	 * @param beanType 对象中的object类型
-	 * @return
-	 */
-	public static <T> T jsonToPojo(String jsonData, Class<T> beanType) {
-		try {
-			T t = MAPPER.readValue(jsonData, beanType);
-			return t;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static <T> T decryptJsonToPojo(String jsonData, Class<T> beanType) {
-		try {
-			T t;
-			if (ApiEncryptConfig.requestStatic) {//解密后操作 解密前端传输套多一层{data:value}
-				DecryptBodyDTO decryptBodyDTO = MAPPER.readValue(jsonData, DecryptBodyDTO.class);
-				String data = AESEncryptUtil.decrypt(decryptBodyDTO.getData());
-				t = MAPPER.readValue(data, beanType);
-			} else {
-				t = MAPPER.readValue(jsonData, beanType);
-			}
-			return t;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 将json数据转换成pojo对象list
-	 * <p>Title: jsonToList</p>
-	 * <p>Description: </p>
-	 *
-	 * @param jsonData
-	 * @param beanType
-	 * @return
-	 */
-	public static <T> List<T> jsonToList(String jsonData, Class<T> beanType) {
-		JavaType javaType = MAPPER.getTypeFactory().constructParametricType(List.class, beanType);
-		try {
-			List<T> list = MAPPER.readValue(jsonData, javaType);
-			return list;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	public static Map<String, Object> jsonToMap(String json) {
-		try {
-			return jsonToPojo(json, Map.class);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-}

+ 0 - 43
ldt-core/src/main/java/org/springblade/common/utils/LocalDateTimeSerializer.java

@@ -1,43 +0,0 @@
-package org.springblade.common.utils;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-
-/**
- * @author July
- * @version 1.0.0
- * @ClassName LocalDateTimeSerializer.java
- * @Description 时间序列化时变为时间戳
- * @createTime 2021年11月02日 10:50:00
- */
-class LocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
-	@Override
-	public void serialize(LocalDateTime localDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
-		jsonGenerator.writeNumber(localDateTime.toInstant(ZoneOffset.ofHours(8)).toEpochMilli());
-	}
-}
-
-/**
- * @author July
- * @version 1.0.0
- * @ClassName LocalDateTimeSerializer.java
- * @Description 时间戳反序列化时间
- * @createTime 2021年11月02日 10:50:00
- */
-class LocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
-	@Override
-	public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-		Long timestamp = jsonParser.getLongValue();
-		return LocalDateTime.ofEpochSecond(timestamp / 1000, 0, ZoneOffset.ofHours(8));
-	}
-}
-

+ 5 - 4
ldt-core/src/main/java/org/springblade/common/utils/ResponseUtil.java

@@ -1,6 +1,7 @@
 package org.springblade.common.utils;
 
 
+import com.alibaba.fastjson.JSONObject;
 import org.springblade.common.config.ApiEncryptConfig;
 import org.springblade.core.tool.api.R;
 import org.springframework.util.ObjectUtils;
@@ -27,19 +28,19 @@ public class ResponseUtil {
 			//需要加密
 			if (ApiEncryptConfig.responseStatic) {
 				if (ObjectUtils.isEmpty(result)) {
-					writer.write(JsonUtils.objectToJson(apiResponse));
+					writer.write(JSONObject.toJSONString(apiResponse));
 				} else {
-					String json = JsonUtils.objectToJson(result);
+					String json = JSONObject.toJSONString(result);
 					System.out.println("返回值加密前===" + json);
 					String encrypt1 = AESEncryptUtil.encrypt(json).replaceAll(System.getProperty("line.separator"), "");
 					apiResponse.setData(encrypt1);
 
-					writer.write(JsonUtils.objectToJson(apiResponse));
+					writer.write(JSONObject.toJSONString(apiResponse));
 				}
 
 			} else {
 				apiResponse.setData(result);
-				writer.write(JsonUtils.objectToJson(apiResponse));
+				writer.write(JSONObject.toJSONString(apiResponse));
 			}
 			writer.flush();
 			writer.close();