gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【i18n】统一语种编码名称，loginUser增加当前用户的语种

pull/3/head
fengshuonan 2021-01-27 21:56:53 +08:00
parent 36b7ac11e2
commit a71a276c28
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
View File

@ -94,6 +94,13 @@ public class LoginUser implements Serializable {
*/ */
private String wsUrl; private String wsUrl;
/**
* 当前用户语种的标识，例如：chinese，english
* <p>
* 这个值是根据字典获取，字典类型编码 languages
*/
private String tranLanguageCode;
public String getWsUrl() { public String getWsUrl() {
AtomicReference<String> returnUrl = new AtomicReference<>(StrUtil.EMPTY); AtomicReference<String> returnUrl = new AtomicReference<>(StrUtil.EMPTY);
Optional.ofNullable(this.wsUrl).ifPresent(url -> { Optional.ofNullable(this.wsUrl).ifPresent(url -> {

2
kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/TranslationDict.java
View File

@ -26,7 +26,7 @@ public class TranslationDict implements Serializable {
/** /**
* 多语言语种的编码，值是字典的值，字典类型的编码是 languages * 多语言语种的编码，值是字典的值，字典类型的编码是 languages
*/ */
private String translationLanguages; private String tranLanguageCode;
/** /**
* 翻译的值，例如：账号 * 翻译的值，例如：账号

2
kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java
View File

@ -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; private String tranLanguageCode;
/** /**

2
kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/factory/TranslationDictFactory.java
View File

@ -22,7 +22,7 @@ public class TranslationDictFactory {
translationDict.setTranName(translation.getTranName()); translationDict.setTranName(translation.getTranName());
translationDict.setTranCode(translation.getTranCode()); translationDict.setTranCode(translation.getTranCode());
translationDict.setTranValue(translation.getTranValue()); translationDict.setTranValue(translation.getTranValue());
translationDict.setTranslationLanguages(translationLanguages); translationDict.setTranLanguageCode(translationLanguages);
return translationDict; return translationDict;
} }

2
kernel-d-i18n/i18n-sdk/src/main/java/cn/stylefeng/roses/kernel/i18n/TranslationContainer.java
View File

@ -37,7 +37,7 @@ public class TranslationContainer implements TranslationApi {
@Override @Override
public void addTranslationDict(TranslationDict translationDict) { public void addTranslationDict(TranslationDict translationDict) {
String translationLanguages = translationDict.getTranslationLanguages(); String translationLanguages = translationDict.getTranLanguageCode();
Map<String, String> languageDict = TRAN_DICT_CONTAINER.get(translationLanguages); Map<String, String> languageDict = TRAN_DICT_CONTAINER.get(translationLanguages);
if (languageDict == null) { if (languageDict == null) {