diff --git a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java b/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java index b987a3a8..b6603264 100644 --- a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java +++ b/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java @@ -17,8 +17,8 @@ public class MyI18nInterceptor implements HandlerInterceptor { final String key = "language"; String language = request.getHeader(key); // 前端传递的language必须是zh-CN格式的,中间的-必须要完整,不能只传递zh或en - log.info("当前语言={}", language); - if(language == null || language.equals("")) { + log.debug("当前语言={}", language); + if(language == null || language.isEmpty()) { language = "zh-CN"; } Locale locale = new Locale(language.split("-")[0],language.split("-")[1]); diff --git a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/util/MessageUtil.java b/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/util/MessageUtil.java similarity index 93% rename from win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/util/MessageUtil.java rename to win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/util/MessageUtil.java index 18f754d0..c2d1d054 100644 --- a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/util/MessageUtil.java +++ b/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/util/MessageUtil.java @@ -1,4 +1,4 @@ -package com.win.framework.util; +package com.win.framework.web.core.util; import cn.hutool.extra.spring.SpringUtil; import org.springframework.context.MessageSource; diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserImportRespVO.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserImportRespVO.java deleted file mode 100644 index e107eb9a..00000000 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserImportRespVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.win.module.system.controller.user.vo.user; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -@Schema(description = "管理后台 - 用户导入 Response VO") -@Data -@Builder -public class UserImportRespVO { - - @Schema(description = "创建成功的用户名数组", requiredMode = Schema.RequiredMode.REQUIRED) - private List createUsernames; - - @Schema(description = "更新成功的用户名数组", requiredMode = Schema.RequiredMode.REQUIRED) - private List updateUsernames; - - @Schema(description = "导入失败的用户集合,key 为用户名,value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) - private Map failureUsernames; - -} diff --git a/win-module-system/win-module-system-biz/src/main/resources/i18n/system.properties b/win-module-system/win-module-system-biz/src/main/resources/i18n/system.properties deleted file mode 100644 index 3d822273..00000000 --- a/win-module-system/win-module-system-biz/src/main/resources/i18n/system.properties +++ /dev/null @@ -1,2 +0,0 @@ -captcha.code.not.null=\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a -captcha.code.error=\u9a8c\u8bc1\u7801\u9519\u8bef \ No newline at end of file diff --git a/win-module-system/win-module-system-biz/src/main/resources/i18n/system_zh_CN.properties b/win-module-system/win-module-system-biz/src/main/resources/i18n/system_zh_CN.properties deleted file mode 100644 index 3d822273..00000000 --- a/win-module-system/win-module-system-biz/src/main/resources/i18n/system_zh_CN.properties +++ /dev/null @@ -1,2 +0,0 @@ -captcha.code.not.null=\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a -captcha.code.error=\u9a8c\u8bc1\u7801\u9519\u8bef \ No newline at end of file diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index 2116b903..9c972caf 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -1,6 +1,9 @@ spring: application: name: win-server + # i18 message 配置,对应 MessageSourceProperties 配置类 + messages: + basename: i18n/message # 文件路径基础名 profiles: include: druid @@ -91,10 +94,6 @@ spring: redis: repositories: enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度 - # i18 message 配置,对应 MessageSourceProperties 配置类 - messages: - basename: i18n/system # 文件路径基础名 - encoding: UTF-8 # 使用 UTF-8 编码 --- #################### 闻荫相关配置 #################### win: diff --git a/win-server/src/main/resources/i18n/message.properties b/win-server/src/main/resources/i18n/message.properties new file mode 100644 index 00000000..e69de29b diff --git a/win-module-system/win-module-system-biz/src/main/resources/i18n/system_en_US.properties b/win-server/src/main/resources/i18n/message_en_US.properties similarity index 100% rename from win-module-system/win-module-system-biz/src/main/resources/i18n/system_en_US.properties rename to win-server/src/main/resources/i18n/message_en_US.properties diff --git a/win-server/src/main/resources/i18n/message_zh_CN.properties b/win-server/src/main/resources/i18n/message_zh_CN.properties new file mode 100644 index 00000000..47985ae1 --- /dev/null +++ b/win-server/src/main/resources/i18n/message_zh_CN.properties @@ -0,0 +1,2 @@ +captcha.code.not.null=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A +captcha.code.error=\u9A8C\u8BC1\u7801\u9519\u8BEF \ No newline at end of file