持续更新中

lmxdawn · lmxdawn · commit 4a4b2b0211fa · 2018-11-16T19:54:02.000+08:00
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/annotation/AdminAuthRuleAnnotation.java b/admin-api/src/main/java/com/lmxdawn/admin/annotation/AdminAuthRuleAnnotation.java
@@ -0,0 +1,17 @@
+package com.lmxdawn.admin.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 后台登录授权/权限验证的注解
+ */
+//此注解只能修饰方法
+@Target(ElementType.METHOD)
+//当前注解如何去保持
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AdminAuthRuleAnnotation {
+    String value();
+}
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/aspect/AdminAuthorizeAspect.java b/admin-api/src/main/java/com/lmxdawn/admin/aspect/AdminAuthorizeAspect.java
@@ -1,20 +1,22 @@
 package com.lmxdawn.admin.aspect;
 
+import com.lmxdawn.admin.annotation.AdminAuthRuleAnnotation;
 import com.lmxdawn.admin.enums.ResultEnum;
 import com.lmxdawn.admin.exception.JsonException;
 import com.lmxdawn.admin.utils.JwtUtil;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
 
 /**
  * 登录验证 AOP
@@ -23,12 +25,19 @@
 @Component
 @Slf4j
 public class AdminAuthorizeAspect {
-    @Pointcut("execution(public * com.lmxdawn.admin.controller.*.Auth*.*(..))" +
-            "&& !execution(public * com.lmxdawn.admin.controller.admin.AuthLoginController.index(..))")
-    public void verify() {}
+    @Pointcut("@annotation(com.lmxdawn.admin.annotation.AdminAuthRuleAnnotation)")
+    public void adminAuthVerify() {}
+
+    @Before("adminAuthVerify()")
+    public void doAdminAuthVerify(JoinPoint joinPoint) {
+
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        //从切面中获取当前方法
+        Method method = signature.getMethod();
+        //得到了方,提取出他的注解
+        AdminAuthRuleAnnotation action = method.getAnnotation(AdminAuthRuleAnnotation.class);
+        System.out.println(action.value());
 
-    @Before("verify()")
-    public void doVerify() {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if (attributes == null) {
             throw new JsonException(ResultEnum.NOT_NETWORK);
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/controller/admin/auth/LoginController.java b/admin-api/src/main/java/com/lmxdawn/admin/controller/admin/auth/LoginController.java
@@ -1,5 +1,6 @@
-package com.lmxdawn.admin.controller.admin;
+package com.lmxdawn.admin.controller.admin.auth;
 
+import com.lmxdawn.admin.annotation.AdminAuthRuleAnnotation;
 import com.lmxdawn.admin.entity.AuthAdmin;
 import com.lmxdawn.admin.enums.ResultEnum;
 import com.lmxdawn.admin.form.LoginForm;
@@ -18,6 +19,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,7 +29,7 @@
 @RestController
 @RequestMapping("/admin/auth/login")
 @Slf4j
-public class AuthLoginController {
+public class LoginController {
 
     @Autowired
     private AuthAdminService authAdminService;
@@ -68,11 +70,12 @@ public ResultVO index(@Valid LoginForm loginForm,
      * 获取登录用户信息
      * @return
      */
+    @AdminAuthRuleAnnotation("admin/auth/login/userInfo")
     @GetMapping("/userInfo")
-    public ResultVO userInfo(HttpServletRequest request) {
+    public ResultVO userInfo(String[] str, HttpServletRequest request) {
         String adminId = request.getHeader("X-Adminid");
         Long id = Long.valueOf(adminId);
-
+        System.out.println(Arrays.toString(str));
         AuthAdmin authAdmin = authAdminService.findById(id);
 
 
