Merge branch 'master' of https://gitee.com/zouxuan/mec

cms/src/main/java/com/ym/mec/cms/config/WebMvcConfig.java

@@ -46,6 +46,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		registry.addConverterFactory(new EnumConverterFactory());
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Bean
 	@Primary
 	public ObjectMapper ObjectMapper() {
@@ -66,10 +67,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 		// BaseEnum序列化
-		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum>() {
 
 			@Override
-			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+			public void serialize(BaseEnum enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
 				jsonGenerator.writeString(enumObj.getCode().toString());
 			}
 

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

@@ -46,6 +46,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		registry.addConverterFactory(new EnumConverterFactory());
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Bean
 	@Primary
 	public ObjectMapper ObjectMapper() {
@@ -66,10 +67,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 		// BaseEnum序列化
-		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum>() {
 
 			@Override
-			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+			public void serialize(BaseEnum enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
 				jsonGenerator.writeString(enumObj.getCode().toString());
 			}
 

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

@@ -46,6 +46,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		registry.addConverterFactory(new EnumConverterFactory());
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Bean
 	@Primary
 	public ObjectMapper ObjectMapper() {
@@ -66,10 +67,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 		// BaseEnum序列化
-		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum>() {
 
 			@Override
-			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+			public void serialize(BaseEnum enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
 				jsonGenerator.writeString(enumObj.getCode().toString());
 			}
 

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

@@ -46,6 +46,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		registry.addConverterFactory(new EnumConverterFactory());
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Bean
 	@Primary
 	public ObjectMapper ObjectMapper() {
@@ -66,10 +67,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
 		// BaseEnum序列化
-		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum<?, ?>>() {
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum>() {
 
 			@Override
-			public void serialize(BaseEnum<?, ?> enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+			public void serialize(BaseEnum enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
 				jsonGenerator.writeString(enumObj.getCode().toString());
 			}