Jenkins自动合并

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -31,6 +31,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU;
+
 /**
  * @Description :
  * @Reference :
@@ -236,14 +238,15 @@ public class SystemInitService implements ISystemInitService {
                 String redisLanguageKey = CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_MENU + ":" + language.getLanguageCode();
 
                 for (SysMenu menu : menus) {
-                    SysLocaleResource res = resourceKeyMap.get(StringUtils.join(language.getLanguageCode(),menu.getName()));
+                    SysLocaleResource res = resourceKeyMap.get(
+                            StringUtils.join(language.getLanguageCode(),RESOURCE_PREFIX_MENU,menu.getName()));
                     if(res == null){
                         // 当系统没有相应的功能权限资源时创建资源
                         res = new SysLocaleResource();
                         res.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MENU.getValue());
                         res.setLanguageCode(language.getLanguageCode());
                         res.setLanguageNameRdd(language.getLanguageName());
-                        res.setResourceKey(menu.getName());
+                        res.setResourceKey(RESOURCE_PREFIX_MENU + menu.getName());
                         res.setResourceValue(menu.getName());
                         res.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
                         ConvertBean.serviceModelInitialize(res, PlatformConstWords.SYSTEM_INIT_USER);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java

@@ -31,6 +31,8 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
+import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU;
+
 /**
  * @Description : 系统资源
  * @Reference :
@@ -204,12 +206,12 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
                 for (SysMenu menu : menuList) {
                     if (menu != null) {
                         if (StringUtils.isNotBlank(menu.getName())) {
-                            String menuName = (String)menuResourceMap.get(menu.getName());
+                            String menuName = (String) menuResourceMap.get(RESOURCE_PREFIX_MENU + menu.getName());
                             menu.setName(StringUtils.isNotBlank(menuName) ? menuName : menu.getName());
                         }
 
                         if (StringUtils.isNotBlank(menu.getParentNameRdd())) {
-                            String parentNameRdd = (String)menuResourceMap.get(menu.getParentNameRdd());
+                            String parentNameRdd = (String) menuResourceMap.get(RESOURCE_PREFIX_MENU + menu.getParentNameRdd());
                             menu.setParentNameRdd(StringUtils.isNotBlank(parentNameRdd) ? parentNameRdd : menu.getParentNameRdd());
                         }
                     }