diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index 768d979ae..7bdab7d42 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -14,7 +14,6 @@ import tk.mybatis.spring.annotation.MapperScan; @MapperScan(basePackages = {"com.iformall.mapper"}) @EnableSwagger2 @EnableEncryptableProperties - public class UserApplication { public static void main(String[] args) { diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java index 58ac99de5..a60c0f7c8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java @@ -1,33 +1,43 @@ package com.iformall.config; -import com.alibaba.fastjson.serializer.SerializeConfig; -import com.alibaba.fastjson.serializer.ToStringSerializer; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; @Configuration +@EnableWebMvc public class WebConfig implements WebMvcConfigurer { @Override public void configureMessageConverters(List> converters) { - FastJsonHttpMessageConverter fastConverter = - new FastJsonHttpMessageConverter(); - - FastJsonConfig fastJsonConfig = new FastJsonConfig(); - SerializeConfig serializeConfig = SerializeConfig.globalInstance; - serializeConfig.put(BigInteger.class, ToStringSerializer.instance); - serializeConfig.put(Long.class, ToStringSerializer.instance); - serializeConfig.put(Long.TYPE, ToStringSerializer.instance); - fastJsonConfig.setSerializeConfig(serializeConfig); - fastConverter.setFastJsonConfig(fastJsonConfig); - converters.add(fastConverter); + MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); + //ObjectMapper 是Jackson库的主要类。它提供一些功能将转换成Java对象匹配JSON结构,反之亦然 + ObjectMapper objectMapper = new ObjectMapper(); + SimpleModule simpleModule = new SimpleModule(); + //序列化将Long转String类型 + simpleModule.addSerializer(Long.class, ToStringSerializer.instance); + simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); + SimpleModule bigIntegerModule = new SimpleModule(); + //序列化将BigInteger转String类型 + bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); + SimpleModule bigDecimalModule = new SimpleModule(); + //序列化将BigDecimal转String类型 + bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); + objectMapper.registerModule(simpleModule); + objectMapper.registerModule(bigDecimalModule); + objectMapper.registerModule(bigIntegerModule); + jackson2HttpMessageConverter.setObjectMapper(objectMapper); + converters.add(jackson2HttpMessageConverter); } diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 00d2c1964..c67834124 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -42,3 +42,4 @@ logging: level: tk.mybatis: debug com.iformall.mapper: debug + path: ./logs/admin diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index f558a7388..34a54b59e 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -38,4 +38,5 @@ spring: logging: level: tk.mybatis: debug - com.iformall.mapper: debug \ No newline at end of file + com.iformall.mapper: debug + path: ./logs/admin \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java index c92720c67..f7332b147 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -1,19 +1,20 @@ package com.iformall.config; -import com.alibaba.fastjson.serializer.SerializeConfig; -import com.alibaba.fastjson.serializer.ToStringSerializer; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.iformall.interceptor.AuthorizationInterceptor; import com.iformall.resolver.LoginUserHandlerMethodArgumentResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; @@ -53,16 +54,23 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void configureMessageConverters(List> converters) { - FastJsonHttpMessageConverter fastConverter = - new FastJsonHttpMessageConverter(); - - FastJsonConfig fastJsonConfig = new FastJsonConfig(); - SerializeConfig serializeConfig = SerializeConfig.globalInstance; - serializeConfig.put(BigInteger.class, ToStringSerializer.instance); - serializeConfig.put(Long.class, ToStringSerializer.instance); - serializeConfig.put(Long.TYPE, ToStringSerializer.instance); - fastJsonConfig.setSerializeConfig(serializeConfig); - fastConverter.setFastJsonConfig(fastJsonConfig); - converters.add(fastConverter); + MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); + //ObjectMapper 是Jackson库的主要类。它提供一些功能将转换成Java对象匹配JSON结构,反之亦然 + ObjectMapper objectMapper = new ObjectMapper(); + SimpleModule simpleModule = new SimpleModule(); + //序列化将Long转String类型 + simpleModule.addSerializer(Long.class, ToStringSerializer.instance); + simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); + SimpleModule bigIntegerModule = new SimpleModule(); + //序列化将BigInteger转String类型 + bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); + SimpleModule bigDecimalModule = new SimpleModule(); + //序列化将BigDecimal转String类型 + bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); + objectMapper.registerModule(simpleModule); + objectMapper.registerModule(bigDecimalModule); + objectMapper.registerModule(bigIntegerModule); + jackson2HttpMessageConverter.setObjectMapper(objectMapper); + converters.add(jackson2HttpMessageConverter); } } \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 970bf437d..17185a214 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -37,4 +37,5 @@ spring: logging: level: tk.mybatis: debug - com.iformall.mapper: debug \ No newline at end of file + com.iformall.mapper: debug + path: ./logs/b \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java index c92720c67..dc1576e7e 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -1,19 +1,20 @@ package com.iformall.config; -import com.alibaba.fastjson.serializer.SerializeConfig; -import com.alibaba.fastjson.serializer.ToStringSerializer; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.iformall.interceptor.AuthorizationInterceptor; import com.iformall.resolver.LoginUserHandlerMethodArgumentResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; @@ -53,16 +54,23 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void configureMessageConverters(List> converters) { - FastJsonHttpMessageConverter fastConverter = - new FastJsonHttpMessageConverter(); - - FastJsonConfig fastJsonConfig = new FastJsonConfig(); - SerializeConfig serializeConfig = SerializeConfig.globalInstance; - serializeConfig.put(BigInteger.class, ToStringSerializer.instance); - serializeConfig.put(Long.class, ToStringSerializer.instance); - serializeConfig.put(Long.TYPE, ToStringSerializer.instance); - fastJsonConfig.setSerializeConfig(serializeConfig); - fastConverter.setFastJsonConfig(fastJsonConfig); - converters.add(fastConverter); + MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); + //ObjectMapper 是Jackson库的主要类。它提供一些功能将转换成Java对象匹配JSON结构,反之亦然 + ObjectMapper objectMapper = new ObjectMapper(); + SimpleModule simpleModule = new SimpleModule(); + //序列化将Long转String类型 + simpleModule.addSerializer(Long.class, com.fasterxml.jackson.databind.ser.std.ToStringSerializer.instance); + simpleModule.addSerializer(Long.TYPE, com.fasterxml.jackson.databind.ser.std.ToStringSerializer.instance); + SimpleModule bigIntegerModule = new SimpleModule(); + //序列化将BigInteger转String类型 + bigIntegerModule.addSerializer(BigInteger.class, com.fasterxml.jackson.databind.ser.std.ToStringSerializer.instance); + SimpleModule bigDecimalModule = new SimpleModule(); + //序列化将BigDecimal转String类型 + bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); + objectMapper.registerModule(simpleModule); + objectMapper.registerModule(bigDecimalModule); + objectMapper.registerModule(bigIntegerModule); + jackson2HttpMessageConverter.setObjectMapper(objectMapper); + converters.add(jackson2HttpMessageConverter); } } \ No newline at end of file diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index a4518d7b0..e7eed4493 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -41,3 +41,4 @@ logging: level: tk.mybatis: debug com.iformall.mapper: debug + path: ./logs/c diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 970bf437d..fe026acc3 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -37,4 +37,5 @@ spring: logging: level: tk.mybatis: debug - com.iformall.mapper: debug \ No newline at end of file + com.iformall.mapper: debug + path: ./logs/c \ No newline at end of file diff --git a/pom.xml b/pom.xml index 378b91a6e..d6042d777 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,7 @@ com.amazonaws aws-java-sdk - 1.11.404 + 1.11.423