Explorar el Código

优化 简体中文出错问题

wuxw hace 4 años
padre
commit
303bff235c

+ 1 - 0
java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java

@@ -152,6 +152,7 @@ public class CommonConstant {
 
     public final static String INSTANCE_N = "N";
 
+    public static final String LANG_ZH_CN = "zh-cn";
     public static final String JAVA110_LANG = "java110-lang";
     public static final String APP_ID = "app-id";
     public static final String TRANSACTION_ID = "transaction-id";

+ 1 - 1
service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java

@@ -92,7 +92,7 @@ public class ListCatalogCmd extends AbstractServiceCmdListener {
         }
 
         String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
-        if (!StringUtil.isEmpty(lang)) {
+        if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
             Language language = ApplicationContextFactory.getBean(lang, Language.class);
             if (language != null) {
                 menuCatalogDtos = language.getMenuCatalog(menuCatalogDtos);

+ 1 - 1
service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java

@@ -94,7 +94,7 @@ public class ListCatalogMenusCmd extends AbstractServiceCmdListener {
 
         List<Map> menus = menuCatalogV1InnerServiceSMOImpl.queryMenus(menuCatalogDto);
         String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
-        if (!StringUtil.isEmpty(lang)) {
+        if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
             Language language = ApplicationContextFactory.getBean(lang, Language.class);
             if (language != null) {
                 menus = language.getMenuDto(menus);