feat: 菜单功能优化

roncoo · Jan 14, 2024 · f59cfe8 · f59cfe8
1 parent a80c265
commit f59cfe8
Show file tree

Hide file tree

Showing 10 changed files with 411 additions and 272 deletions.
diff --git a/...education-common-core/src/main/java/com/roncoo/education/common/core/tools/Constants.java b/...education-common-core/src/main/java/com/roncoo/education/common/core/tools/Constants.java
@@ -23,7 +23,7 @@ private Constants() {
     public final static int SESSIONTIME = 40;
 
     public interface RedisPre {
-        String ADMINI_MENU = "admin::menu::";
+        String ADMINI_APIS = "admin::apis::";
         String ADMIN_VERI_CODE = "admin::ver::code::";
         String USER_STUDY = "user::study::";
         /**

diff --git a/...-education-gateway/src/main/java/com/roncoo/education/gateway/filter/EduGlobalFilter.java b/...-education-gateway/src/main/java/com/roncoo/education/gateway/filter/EduGlobalFilter.java
@@ -85,16 +85,16 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         Long userId = getUserId(request);
         if (FilterUtil.checkUri(uri, FilterUtil.ADMIN_URL_PREFIX)) {
             // admin校验
-            if (!stringRedisTemplate.hasKey(Constants.RedisPre.ADMINI_MENU.concat(userId.toString()))) {
+            if (!stringRedisTemplate.hasKey(Constants.RedisPre.ADMINI_APIS.concat(userId.toString()))) {
                 throw new BaseException(ResultEnum.MENU_PAST);
             }
-            String tk = stringRedisTemplate.opsForValue().get(Constants.RedisPre.ADMINI_MENU.concat(userId.toString()));
+            String tk = stringRedisTemplate.opsForValue().get(Constants.RedisPre.ADMINI_APIS.concat(userId.toString()));
             // 校验接口是否有权限
             if (!checkUri(uri, tk)) {
                 throw new BaseException(ResultEnum.MENU_NO);
             }
             // 更新时间，使用户菜单不过期
-            stringRedisTemplate.expire(Constants.RedisPre.ADMINI_MENU.concat(userId.toString()), Constants.SESSIONTIME, TimeUnit.MINUTES);
+            stringRedisTemplate.expire(Constants.RedisPre.ADMINI_APIS.concat(userId.toString()), Constants.SESSIONTIME, TimeUnit.MINUTES);
         }
         request.mutate().header(Constants.USER_ID, String.valueOf(userId));
         return chain.filter(exchange);

diff --git a/...vice-system/src/main/java/com/roncoo/education/system/dao/impl/mapper/entity/SysMenu.java b/...vice-system/src/main/java/com/roncoo/education/system/dao/impl/mapper/entity/SysMenu.java
@@ -16,22 +16,24 @@ public class SysMenu implements Serializable {
 
     private Long parentId;
 
+    private Boolean isShow;
+
     private Integer menuType;
 
     private String menuName;
 
     private String menuIcon;
 
-    private String pathRouter;
-
-    private String pathApi;
+    private String path;
 
-    private String componentPath;
+    private String component;
 
-    private String componentName;
+    private String apis;
 
     private String permission;
 
+    private String remark;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -82,6 +84,14 @@ public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 
+    public Boolean getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(Boolean isShow) {
+        this.isShow = isShow;
+    }
+
     public Integer getMenuType() {
         return menuType;
     }
@@ -106,36 +116,28 @@ public void setMenuIcon(String menuIcon) {
         this.menuIcon = menuIcon == null ? null : menuIcon.trim();
     }
 
-    public String getPathRouter() {
-        return pathRouter;
+    public String getPath() {
+        return path;
     }
 
-    public void setPathRouter(String pathRouter) {
-        this.pathRouter = pathRouter == null ? null : pathRouter.trim();
+    public void setPath(String path) {
+        this.path = path == null ? null : path.trim();
     }
 
-    public String getPathApi() {
-        return pathApi;
+    public String getComponent() {
+        return component;
     }
 
-    public void setPathApi(String pathApi) {
-        this.pathApi = pathApi == null ? null : pathApi.trim();
+    public void setComponent(String component) {
+        this.component = component == null ? null : component.trim();
     }
 
-    public String getComponentPath() {
-        return componentPath;
+    public String getApis() {
+        return apis;
     }
 
-    public void setComponentPath(String componentPath) {
-        this.componentPath = componentPath == null ? null : componentPath.trim();
-    }
-
-    public String getComponentName() {
-        return componentName;
-    }
-
-    public void setComponentName(String componentName) {
-        this.componentName = componentName == null ? null : componentName.trim();
+    public void setApis(String apis) {
+        this.apis = apis == null ? null : apis.trim();
     }
 
     public String getPermission() {
@@ -146,6 +148,14 @@ public void setPermission(String permission) {
         this.permission = permission == null ? null : permission.trim();
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -158,14 +168,15 @@ public String toString() {
         sb.append(", statusId=").append(statusId);
         sb.append(", sort=").append(sort);
         sb.append(", parentId=").append(parentId);
+        sb.append(", isShow=").append(isShow);
         sb.append(", menuType=").append(menuType);
         sb.append(", menuName=").append(menuName);
         sb.append(", menuIcon=").append(menuIcon);
-        sb.append(", pathRouter=").append(pathRouter);
-        sb.append(", pathApi=").append(pathApi);
-        sb.append(", componentPath=").append(componentPath);
-        sb.append(", componentName=").append(componentName);
+        sb.append(", path=").append(path);
+        sb.append(", component=").append(component);
+        sb.append(", apis=").append(apis);
         sb.append(", permission=").append(permission);
+        sb.append(", remark=").append(remark);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();