yonge 5 years ago
parent
commit
6b9bdf71d8

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

@@ -33,6 +33,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.enums.BaseEnum;
 
 
 @Configuration
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -64,6 +65,16 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 
+		// BaseEnum序列化
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+
+			@Override
+			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+				jsonGenerator.writeString(enumObj.getCode().toString());
+			}
+
+		});
+
 		// Date序列化和反序列化
 		// Date序列化和反序列化
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 			@Override
 			@Override
@@ -73,6 +84,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				jsonGenerator.writeString(formattedDate);
 				jsonGenerator.writeString(formattedDate);
 			}
 			}
 		});
 		});
+
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 			@Override
 			@Override
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {

+ 12 - 0
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebMvcConfig.java

@@ -33,6 +33,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.enums.BaseEnum;
 
 
 @Configuration
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -64,6 +65,16 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 
+		// BaseEnum序列化
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+
+			@Override
+			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+				jsonGenerator.writeString(enumObj.getCode().toString());
+			}
+
+		});
+
 		// Date序列化和反序列化
 		// Date序列化和反序列化
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 			@Override
 			@Override
@@ -73,6 +84,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				jsonGenerator.writeString(formattedDate);
 				jsonGenerator.writeString(formattedDate);
 			}
 			}
 		});
 		});
+
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 			@Override
 			@Override
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {

+ 12 - 0
mec-task/src/main/java/com/ym/mec/task/config/WebMvcConfig.java

@@ -33,6 +33,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.enums.BaseEnum;
 
 
 @Configuration
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -64,6 +65,16 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 
+		// BaseEnum序列化
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+
+			@Override
+			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+				jsonGenerator.writeString(enumObj.getCode().toString());
+			}
+
+		});
+
 		// Date序列化和反序列化
 		// Date序列化和反序列化
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 			@Override
 			@Override
@@ -73,6 +84,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				jsonGenerator.writeString(formattedDate);
 				jsonGenerator.writeString(formattedDate);
 			}
 			}
 		});
 		});
+
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 			@Override
 			@Override
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {

+ 12 - 0
mec-web/src/main/java/com/ym/mec/web/config/WebMvcConfig.java

@@ -33,6 +33,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.enums.BaseEnum;
 
 
 @Configuration
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -64,6 +65,16 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 
+		// BaseEnum序列化
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+
+			@Override
+			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+				jsonGenerator.writeString(enumObj.getCode().toString());
+			}
+
+		});
+
 		// Date序列化和反序列化
 		// Date序列化和反序列化
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
 			@Override
 			@Override
@@ -73,6 +84,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				jsonGenerator.writeString(formattedDate);
 				jsonGenerator.writeString(formattedDate);
 			}
 			}
 		});
 		});
+
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
 			@Override
 			@Override
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
 			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {