diff --git a/server/DirectoryV2.xml b/server/DirectoryV2.xml
index f9d46b51..db0fcdd0 100644
--- a/server/DirectoryV2.xml
+++ b/server/DirectoryV2.xml
@@ -33,4 +33,5 @@
+
\ No newline at end of file
diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java
index 9d2b57db..f4bb065a 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java
@@ -2,13 +2,15 @@ package com.mdd.admin;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson2.JSON;
-import com.mdd.admin.config.AdminConfig;
-import com.mdd.admin.service.ISystemAuthAdminService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mdd.common.aop.NotPower;
+import com.mdd.common.aop.NotLogin;
import com.mdd.common.core.AjaxResult;
+import com.mdd.common.entity.system.SystemAuthAdmin;
import com.mdd.common.enums.HttpEnum;
-import com.mdd.common.util.RedisUtils;
+import com.mdd.common.exception.LoginException;
+import com.mdd.common.mapper.system.SystemAuthAdminMapper;
import com.mdd.common.util.StringUtils;
-import com.mdd.common.util.ToolsUtils;
import com.mdd.common.util.YmlUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Component;
@@ -18,9 +20,9 @@ import org.springframework.web.servlet.HandlerInterceptor;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
/**
* 拦截器
@@ -29,33 +31,45 @@ import java.util.Map;
public class LikeAdminInterceptor implements HandlerInterceptor {
@Resource
- ISystemAuthAdminService iSystemAuthAdminService;
+ SystemAuthAdminMapper systemAuthAdminMapper;
+ /**
+ * 前置处理器
+ *
+ * @param request 请求
+ * @param response 响应
+ * @param handler 处理
+ * @return boolean
+ * @throws Exception 异常
+ */
@Override
public boolean preHandle(@NotNull HttpServletRequest request,
@NotNull HttpServletResponse response,
@NotNull Object handler) throws Exception {
- // 请求的类型
+ // 请求方法类型
response.setContentType("application/json;charset=utf-8");
if (!(handler instanceof HandlerMethod)) {
return HandlerInterceptor.super.preHandle(request, response, handler);
}
- // 路由转权限
- String prefix = "/api/";
- String route = request.getRequestURI().replaceFirst(prefix, "");
- String auths = route.replace("/", ":");
-
- // 免登录接口
- List notLoginUri = Arrays.asList(AdminConfig.notLoginUri);
- if (notLoginUri.contains(auths)) {
- return HandlerInterceptor.super.preHandle(request, response, handler);
+ // 登录权限校验
+ try {
+ Method method = this.obtainAop(handler);
+ String reqUri = request.getRequestURI();
+ this.checkLogin(method, reqUri);
+ } catch (LoginException e) {
+ AjaxResult