Browse Source

国际化。

master
刘忱 2 years ago
parent
commit
714aedde54
  1. 4
      win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java
  2. 2
      win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/util/MessageUtil.java
  3. 24
      win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserImportRespVO.java
  4. 2
      win-module-system/win-module-system-biz/src/main/resources/i18n/system.properties
  5. 2
      win-module-system/win-module-system-biz/src/main/resources/i18n/system_zh_CN.properties
  6. 7
      win-server/src/main/resources/application.yaml
  7. 0
      win-server/src/main/resources/i18n/message.properties
  8. 0
      win-server/src/main/resources/i18n/message_en_US.properties
  9. 2
      win-server/src/main/resources/i18n/message_zh_CN.properties

4
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"; final String key = "language";
String language = request.getHeader(key); String language = request.getHeader(key);
// 前端传递的language必须是zh-CN格式的,中间的-必须要完整,不能只传递zh或en // 前端传递的language必须是zh-CN格式的,中间的-必须要完整,不能只传递zh或en
log.info("当前语言={}", language); log.debug("当前语言={}", language);
if(language == null || language.equals("")) { if(language == null || language.isEmpty()) {
language = "zh-CN"; language = "zh-CN";
} }
Locale locale = new Locale(language.split("-")[0],language.split("-")[1]); Locale locale = new Locale(language.split("-")[0],language.split("-")[1]);

2
win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/util/MessageUtil.java → 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 cn.hutool.extra.spring.SpringUtil;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;

24
win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserImportRespVO.java

@ -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<String> createUsernames;
@Schema(description = "更新成功的用户名数组", requiredMode = Schema.RequiredMode.REQUIRED)
private List<String> updateUsernames;
@Schema(description = "导入失败的用户集合,key 为用户名,value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
private Map<String, String> failureUsernames;
}

2
win-module-system/win-module-system-biz/src/main/resources/i18n/system.properties

@ -1,2 +0,0 @@
captcha.code.not.null=\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a
captcha.code.error=\u9a8c\u8bc1\u7801\u9519\u8bef

2
win-module-system/win-module-system-biz/src/main/resources/i18n/system_zh_CN.properties

@ -1,2 +0,0 @@
captcha.code.not.null=\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a
captcha.code.error=\u9a8c\u8bc1\u7801\u9519\u8bef

7
win-server/src/main/resources/application.yaml

@ -1,6 +1,9 @@
spring: spring:
application: application:
name: win-server name: win-server
# i18 message 配置,对应 MessageSourceProperties 配置类
messages:
basename: i18n/message # 文件路径基础名
profiles: profiles:
include: druid include: druid
@ -91,10 +94,6 @@ spring:
redis: redis:
repositories: repositories:
enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度 enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度
# i18 message 配置,对应 MessageSourceProperties 配置类
messages:
basename: i18n/system # 文件路径基础名
encoding: UTF-8 # 使用 UTF-8 编码
--- #################### 闻荫相关配置 #################### --- #################### 闻荫相关配置 ####################
win: win:

0
win-server/src/main/resources/i18n/message.properties

0
win-module-system/win-module-system-biz/src/main/resources/i18n/system_en_US.properties → win-server/src/main/resources/i18n/message_en_US.properties

2
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
Loading…
Cancel
Save