解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/WebConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/WebConfig.java
index 55d2e34..30808c8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/WebConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/WebConfig.java
@@ -1,6 +1,8 @@
package com.ruoyi;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.web.filter.CharacterEncodingFilter;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -11,4 +13,11 @@
registry.addResourceHandler("/uploads/**")
.addResourceLocations("file:uploads/");
}
+ @Bean
+ public CharacterEncodingFilter characterEncodingFilter() {
+ CharacterEncodingFilter filter = new CharacterEncodingFilter();
+ filter.setEncoding("UTF-8");
+ filter.setForceEncoding(true); // 强制覆盖响应编码
+ return filter;
+ }
}