feat:重构权限的拦截

Author: pedro

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>io.github.talelin</groupId>
     <artifactId>merak</artifactId>
-    <version>0.0.1-RC4</version>
+    <version>0.0.1-RC5</version>
     <name>merak</name>
     <description>Demo project for lin cms</description>
 
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>io.github.talelin</groupId>
             <artifactId>lin-cms-spring-boot-starter</artifactId>
-            <version>0.0.1-RC4</version>
+            <version>0.0.1-RC5</version>
         </dependency>
 
         <dependency>

src/main/java/io/github/talelin/merak/common/interceptor/AuthorizeVerifyResolverImpl.java

@@ -3,11 +3,11 @@
 import com.auth0.jwt.exceptions.*;
 import com.auth0.jwt.exceptions.TokenExpiredException;
 import com.auth0.jwt.interfaces.Claim;
+import io.github.talelin.autoconfigure.beans.MetaInfo;
 import io.github.talelin.autoconfigure.exception.AuthenticationException;
 import io.github.talelin.autoconfigure.exception.AuthorizationException;
 import io.github.talelin.autoconfigure.exception.NotFoundException;
 import io.github.talelin.autoconfigure.exception.TokenInvalidException;
-import io.github.talelin.core.annotation.RouteMeta;
 import io.github.talelin.merak.common.LocalUser;
 import io.github.talelin.merak.model.PermissionDO;
 import io.github.talelin.merak.model.UserDO;
@@ -18,8 +18,6 @@
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.ModelAndView;
-
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,7 +43,7 @@ public class AuthorizeVerifyResolverImpl implements AuthorizeVerifyResolver {
     private GroupService groupService;
 
 
-    public boolean handleLogin(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
+    public boolean handleLogin(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         String tokenStr = verifyHeader(request, response);
         Map<String, Claim> claims = null;
         try {
@@ -59,22 +57,22 @@ public boolean handleLogin(HttpServletRequest request, HttpServletResponse respo
     }
 
     @Override
-    public boolean handleGroup(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
+    public boolean handleGroup(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         handleLogin(request, response, meta);
         UserDO user = LocalUser.getLocalUser();
         if (verifyAdmin(user))
             return true;
         long userId = user.getId();
-        String permission = meta.permission();
-        String module = meta.module();
+        String permission = meta.getPermission();
+        String module = meta.getModule();
         List<PermissionDO> permissions = userService.getUserPermissions(userId);
         boolean matched = permissions.stream().anyMatch(it -> it.getModule().equals(module) && it.getName().equals(permission));
         if (!matched)
             throw new AuthenticationException("you don't have the permission to access", 10001);
         return true;
     }
 
-    public boolean handleAdmin(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
+    public boolean handleAdmin(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         handleLogin(request, response, meta);
         UserDO user = LocalUser.getLocalUser();
         if (!verifyAdmin(user))
@@ -83,7 +81,7 @@ public boolean handleAdmin(HttpServletRequest request, HttpServletResponse respo
     }
 
 
-    public boolean handleRefresh(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
+    public boolean handleRefresh(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         String tokenStr = verifyHeader(request, response);
         Map<String, Claim> claims = null;
         try {

src/main/java/io/github/talelin/merak/common/listener/PermissionHandleListener.java

@@ -1,8 +1,8 @@
 package io.github.talelin.merak.common.listener;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.github.talelin.autoconfigure.beans.MetaInfo;
 import io.github.talelin.autoconfigure.beans.RouteMetaCollector;
-import io.github.talelin.core.annotation.RouteMeta;
 import io.github.talelin.merak.model.PermissionDO;
 import io.github.talelin.merak.service.PermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,23 +30,21 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 
     private void addNewPermissions() {
         metaCollector.getMetaMap().values().forEach(meta -> {
-            if (meta.mount()) {
-                String module = meta.module();
-                String permission = meta.permission();
-                createPermissionIfNotExist(permission, module);
-            }
+            String module = meta.getModule();
+            String permission = meta.getPermission();
+            createPermissionIfNotExist(permission, module);
         });
     }
 
     private void removeUnusedPermissions() {
         List<PermissionDO> allPermissions = permissionService.list();
-        Map<String, RouteMeta> metaMap = metaCollector.getMetaMap();
+        Map<String, MetaInfo> metaMap = metaCollector.getMetaMap();
         for (PermissionDO permission : allPermissions) {
             boolean stayedInMeta = metaMap
                     .values()
                     .stream()
-                    .anyMatch(meta -> meta.mount() && meta.module().equals(permission.getModule())
-                            && meta.permission().equals(permission.getName()));
+                    .anyMatch(meta -> meta.getModule().equals(permission.getModule())
+                            && meta.getPermission().equals(permission.getName()));
             if (!stayedInMeta) {
                 permissionService.removeById(permission.getId());
             }

src/main/java/io/github/talelin/merak/controller/cms/TestController.java

@@ -1,9 +1,6 @@
 package io.github.talelin.merak.controller.cms;
 
-import io.github.talelin.core.annotation.GroupRequired;
-import io.github.talelin.core.annotation.Logger;
-import io.github.talelin.core.annotation.LoginRequired;
-import io.github.talelin.core.annotation.RouteMeta;
+import io.github.talelin.core.annotation.*;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -34,13 +31,12 @@ public Map getTestMsg() {
     }
 
     @RequestMapping("/info")
-    @RouteMeta(permission = "查看lin的信息", module = "信息", mount = true)
-    @GroupRequired
+    //@RouteMeta(permission = "查看lin的信息", module = "信息", mount = true)
+    //@GroupRequired
+    @GroupMeta(permission = "查看lin的信息", module = "信息", mount = true)
     public Map getTestInfo() {
         Map res = new HashMap();
         res.put("msg", "Lin 是一套基于 Spring boot 的一整套开箱即用的后台管理系统（CMS）。Lin 遵循简洁、高效的原则，通过核心库加插件的方式来驱动整个系统高效的运行");
         return res;
     }
-
-
 }