菜单重构

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -188,8 +188,12 @@ public class MenuInit {
 
 
     private void addDefaultFunctionMenu(int menuSort, Menu parentMenu, String title, String path, String component, String icon, String... clientLabels){
     private void addDefaultFunctionMenu(int menuSort, Menu parentMenu, String title, String path, String component, String icon, String... clientLabels){
         Menu menu = Menu.createFunctionMenu(parentMenu, title, menuSort, path, component, icon);
         Menu menu = Menu.createFunctionMenu(parentMenu, title, menuSort, path, component, icon);
-        for (String clientLabel : clientLabels) {
-            addMenu(clientLabel, menu);
+        if(clientLabels.length == 0){
+            addMenu("",menu);
+        }else{
+            for (String clientLabel : clientLabels) {
+                addMenu(clientLabel, menu);
+            }
         }
         }
     }
     }
 
 

src/main/java/com/neotel/smfcore/common/utils/PermissionInitUtil.java

@@ -81,7 +81,7 @@ public class PermissionInitUtil {
                     if (array.length >= 1 && permissionSet.contains(array[0])) {
                     if (array.length >= 1 && permissionSet.contains(array[0])) {
 
 
                     } else {
                     } else {
-                        log.info("未找到权限【" + hasP + "】");
+                        //log.info("未找到权限【" + hasP + "】");
                     }
                     }
                 }
                 }
             }
             }

src/main/java/com/neotel/smfcore/custom/haman/HamanMenu.java

@@ -52,7 +52,7 @@ public class HamanMenu {
         menuInit.labelMenu("haman", menus);
         menuInit.labelMenu("haman", menus);
 
 
         String apiName = smfApi.getApiName();
         String apiName = smfApi.getApiName();
-        if(Strings.isNotBlank(apiName)){
+        if(Strings.isNotBlank(apiName) && apiName.equals("haman")){
             menuInit.showMenu(apiName);
             menuInit.showMenu(apiName);
         }
         }
     }
     }

src/main/java/com/neotel/smfcore/security/rest/MenuController.java

@@ -20,6 +20,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.init.MenuInit;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
@@ -36,6 +37,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
@@ -66,7 +68,18 @@ public class MenuController {
     private final IMenuManager menuManager;
     private final IMenuManager menuManager;
     @Autowired
     @Autowired
     private final MenuMapper menuMapper;
     private final MenuMapper menuMapper;
-    private static final String ENTITY_NAME = "menu";
+
+    @Autowired
+    MenuInit menuInit;
+
+    @RequestMapping(value = "/show")
+    @AnonymousAccess
+    public ResponseEntity<Object> show(@RequestParam String menuPath) {
+        if(Strings.isNotBlank(menuPath)){
+            menuInit.showMenu(menuPath);
+        }
+        return new ResponseEntity<>("OK", HttpStatus.OK);
+    }
 
 
     @GetMapping(value = "/build")
     @GetMapping(value = "/build")
     @ApiOperation("获取前端所需菜单")
     @ApiOperation("获取前端所需菜单")

src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8800
   port: 8800
 
 
 api:
 api:
-  name: haman
+  name: Neotel
   inCheckUrl:
   inCheckUrl:
   outNotifyUrl:
   outNotifyUrl:
   inNotifyUrl:
   inNotifyUrl: