From a71a276c287fe9512b94e41242b6c08ac6af4375 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 27 Jan 2021 21:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90i18n=E3=80=91=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=AF=AD=E7=A7=8D=E7=BC=96=E7=A0=81=E5=90=8D=E7=A7=B0=EF=BC=8C?= =?UTF-8?q?loginUser=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E8=AF=AD=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/auth/api/pojo/login/LoginUser.java | 7 +++++++ .../roses/kernel/i18n/api/pojo/TranslationDict.java | 2 +- .../kernel/i18n/api/pojo/request/TranslationRequest.java | 2 +- .../i18n/modular/factory/TranslationDictFactory.java | 2 +- .../stylefeng/roses/kernel/i18n/TranslationContainer.java | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java index 2b29d1d96..fbd16a202 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java @@ -94,6 +94,13 @@ public class LoginUser implements Serializable { */ private String wsUrl; + /** + * 当前用户语种的标识，例如：chinese，english + *

+ * 这个值是根据字典获取，字典类型编码 languages + */ + private String tranLanguageCode; + public String getWsUrl() { AtomicReference returnUrl = new AtomicReference<>(StrUtil.EMPTY); Optional.ofNullable(this.wsUrl).ifPresent(url -> { diff --git a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/TranslationDict.java b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/TranslationDict.java index bb2e3034f..4909e7a6b 100644 --- a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/TranslationDict.java +++ b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/TranslationDict.java @@ -26,7 +26,7 @@ public class TranslationDict implements Serializable { /** * 多语言语种的编码，值是字典的值，字典类型的编码是 languages */ - private String translationLanguages; + private String tranLanguageCode; /** * 翻译的值，例如：账号 diff --git a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java index d087f2b5e..f8b2a37b0 100644 --- a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java +++ b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java @@ -40,7 +40,7 @@ public class TranslationRequest extends BaseRequest { /** * 语种字典 */ - @NotBlank(message = "language不能为空", groups = {add.class, edit.class}) + @NotBlank(message = "tranLanguageCode不能为空", groups = {add.class, edit.class}) private String tranLanguageCode; /** diff --git a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/factory/TranslationDictFactory.java b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/factory/TranslationDictFactory.java index cb390cc7a..5f544e04f 100644 --- a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/factory/TranslationDictFactory.java +++ b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/factory/TranslationDictFactory.java @@ -22,7 +22,7 @@ public class TranslationDictFactory { translationDict.setTranName(translation.getTranName()); translationDict.setTranCode(translation.getTranCode()); translationDict.setTranValue(translation.getTranValue()); - translationDict.setTranslationLanguages(translationLanguages); + translationDict.setTranLanguageCode(translationLanguages); return translationDict; } diff --git a/kernel-d-i18n/i18n-sdk/src/main/java/cn/stylefeng/roses/kernel/i18n/TranslationContainer.java b/kernel-d-i18n/i18n-sdk/src/main/java/cn/stylefeng/roses/kernel/i18n/TranslationContainer.java index 7a05fa9df..74b26b9af 100644 --- a/kernel-d-i18n/i18n-sdk/src/main/java/cn/stylefeng/roses/kernel/i18n/TranslationContainer.java +++ b/kernel-d-i18n/i18n-sdk/src/main/java/cn/stylefeng/roses/kernel/i18n/TranslationContainer.java @@ -37,7 +37,7 @@ public class TranslationContainer implements TranslationApi { @Override public void addTranslationDict(TranslationDict translationDict) { - String translationLanguages = translationDict.getTranslationLanguages(); + String translationLanguages = translationDict.getTranLanguageCode(); Map languageDict = TRAN_DICT_CONTAINER.get(translationLanguages); if (languageDict == null) {