yonge 5 年 前
コミット
0e6a8e9b6b

+ 9 - 0
cms/src/main/java/com/ym/mec/cms/config/WebMvcConfig.java

@@ -9,6 +9,7 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -98,6 +99,14 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				}
 			}
 		});
+		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
+			@Override
+			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
+			}
+		});
 
 		objectMapper.registerModule(javaTimeModule);
 		return objectMapper;

+ 3 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebMvcConfig.java

@@ -61,7 +61,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});
 		// 日期和时间格式化

+ 3 - 1
mec-education/src/main/java/com/ym/mec/education/config/WebMvcConfig.java

@@ -63,7 +63,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});
 		// 日期和时间格式化

+ 3 - 1
mec-im/src/main/java/com/ym/config/WebMvcConfig.java

@@ -55,7 +55,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});
 		// 日期和时间格式化

+ 3 - 1
mec-student/src/main/java/com/ym/mec/student/config/WebMvcConfig.java

@@ -61,7 +61,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});
 		// 日期和时间格式化

+ 3 - 1
mec-task/src/main/java/com/ym/mec/task/config/WebMvcConfig.java

@@ -61,7 +61,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});
 		// 日期和时间格式化

+ 1 - 1
mec-teacher/src/main/java/com/ym/mec/teacher/TeacherApplication.java

@@ -17,7 +17,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
 @MapperScan("com.ym.mec.biz.dal.dao")
-@ComponentScan(basePackages = "com.ym.mec")
+@ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine" })
 @Configuration
 @EnableSwagger2Doc
 public class TeacherApplication {

+ 3 - 1
mec-teacher/src/main/java/com/ym/mec/teacher/config/WebMvcConfig.java

@@ -61,7 +61,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});
 		// 日期和时间格式化

+ 3 - 1
mec-web/src/main/java/com/ym/mec/web/config/WebMvcConfig.java

@@ -61,7 +61,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});
 		// 日期和时间格式化

+ 3 - 1
mec-workflow/src/main/java/com/ym/mec/workfow/config/WebMvcConfig.java

@@ -102,7 +102,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		objectMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
 			@Override
 			public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-				jsonGenerator.writeString(StringUtils.EMPTY);
+				if (o instanceof String) {
+					jsonGenerator.writeString(StringUtils.EMPTY);
+				}
 			}
 		});