规范对外接口

authorize-api-service/src/main/java/com/xy/config/SaTokenInterceptorImpl.java

@@ -1,54 +0,0 @@
-package com.xy.config;
-
-import cn.dev33.satoken.stp.StpUtil;
-import com.xy.ServerWebConfig;
-import com.xy.enums.SaTokenEnum;
-import com.xy.error.CommRuntimeException;
-import com.xy.swagger.Knife4jConfig;
-import com.xy.utils.AuthorizeUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 权限系统权限拦截器
- */
-@Component
-@AllArgsConstructor
-public class SaTokenInterceptorImpl extends HandlerInterceptorAdapter implements WebMvcConfigurer {
-
-    private SaTokenAuthorizeConfig saTokenAuthorizeConfig;
-
-    /**
-     * 方法执行前
-     */
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        //登录鉴权
-        String satoken = request.getHeader(saTokenAuthorizeConfig.getTokenName());
-        boolean b = AuthorizeUtils.authByLogin(satoken);
-        if (!b) {
-            throw new CommRuntimeException(SaTokenEnum.NO_LOGIN.getKey(), SaTokenEnum.NO_LOGIN.getName());
-        }
-        //token续签
-        StpUtil.renewTimeout(satoken, saTokenAuthorizeConfig.getTimeout());
-        return true;
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        List<String> excludePaths = saTokenAuthorizeConfig.getExcludePaths();
-        excludePaths.addAll(Knife4jConfig.swaggerExcludes);
-        excludePaths.addAll(ServerWebConfig.serverWebExcludes);
-        registry.addInterceptor(this)
-                .excludePathPatterns(excludePaths)
-                .addPathPatterns("/**");
-    }
-
-}

authorize-api-service/src/main/java/com/xy/service/impl/AuthorizeServiceImpl.java

@@ -1,10 +1,11 @@
 package com.xy.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import com.xy.config.SaTokenAuthorizeConfig;
 import com.xy.dto.AuthorizeDto;
 import com.xy.dto.SysMenuDto;
 import com.xy.redis.RedisCache;
 import com.xy.service.AuthorizeService;
-import com.xy.service.SysMenuService;
 import com.xy.utils.R;
 import com.xy.utils.SaTokenUtils;
 import io.swagger.annotations.Api;
@@ -21,6 +22,8 @@ public class AuthorizeServiceImpl implements AuthorizeService {
 
     private SysMenuServiceImpl sysMenuService;
 
+    private SaTokenAuthorizeConfig saTokenAuthorizeConfig;
+
     @Override
     @ApiOperation("获取菜单")
     public R<List<SysMenuDto.Vo>> workMenu(SysMenuDto.WorkMenu workMenu) {
@@ -96,4 +99,11 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         Object loginId = RedisCache.getLoginId(SaTokenUtils.getToken(), Object.class);
         return R.ok(loginId);
     }
+
+    @Override
+    @ApiOperation("token续签")
+    public R<Boolean> renewTimeout() {
+        StpUtil.renewTimeout(SaTokenUtils.getToken(), saTokenAuthorizeConfig.getTimeout());
+        return null;
+    }
 }

authorize-api/src/main/java/com/xy/service/AuthorizeService.java

@@ -107,4 +107,12 @@ public interface AuthorizeService {
      */
     @PostMapping("getLoginId")
     R<Object> getLoginId();
+
+    /**
+     * token续签
+     *
+     * @return
+     */
+    @PostMapping("renewTimeout")
+    R<Boolean> renewTimeout();
 }

sql/init.sql

@@ -3,10 +3,10 @@ delete from sys_work_user where id = 1;
 insert into sys_work_user(id, account, password, create_time, update_time)
 values(1, 'xyadmin', 'e10adc3949ba59abbe56e057f20f883e', now(), now());
 
--- 新增权限系统
+-- 新增管理系统
 delete from sys_system where id = 1;
 insert into sys_system(id, code, name, create_time, update_time, create_user, update_user)
-values(1, 'xy_system', '兴元权限系统', now(), now(), 1, 1);
+values(1, 'xy_system', '兴元管理系统', now(), now(), 1, 1);
 
 -- 新增角色
 delete from sys_role where id = 1;
@@ -26,26 +26,26 @@ values(1, null, 1, 'authorize', '权限管理', 1, null, null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
 values(2, 1, 1, 'menu', '菜单管理', 1, null, null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(3, 2, 1, 'menu_data', '菜单列表', 2, null, null, now(), now());
+values(3, 2, 1, 'menu_data', '菜单列表', 2, '/sys-menu/menu', null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(4, 3, 1, 'menu_add', '添加菜单', 3, null, null, now(), now());
+values(4, 3, 1, 'menu_add', '添加菜单', 3, '/sys-menu/save', null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(5, 3, 1, 'menu_del', '删除菜单', 3, null, null, now(), now());
+values(5, 3, 1, 'menu_del', '删除菜单', 3, '/sys-menu/del', null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(6, 3, 1, 'menu_edit', '编辑菜单', 3, null, null, now(), now());
+values(6, 3, 1, 'menu_edit', '编辑菜单', 3, '/sys-menu/update', null, now(), now());
 
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
 values(7, 1, 1, 'role', '角色管理', 1, null, null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(8, 7, 1, 'role_data', '角色列表', 2, null, null, now(), now());
+values(8, 7, 1, 'role_data', '角色列表', 2, '/sysRole/page', null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(9, 8, 1, 'role_add', '添加角色', 3, null, null, now(), now());
+values(9, 8, 1, 'role_add', '添加角色', 3, '/sysRole/saveOrUpdate', null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(10, 8, 1, 'role_add', '删除角色', 3, null, null, now(), now());
+values(10, 8, 1, 'role_add', '删除角色', 3, '/sysRole/*', null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(11, 8, 1, 'role_menu', '分配菜单', 3, null, null, now(), now());
+values(11, 8, 1, 'role_menu', '分配菜单', 3, '/sysRole/saveRoleMenus', null, now(), now());
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
-values(12, 8, 1, 'role_edit', '编辑角色', 3, null, null, now(), now());
+values(12, 8, 1, 'role_edit', '编辑角色', 3, '/sysRole/saveOrUpdate', null, now(), now());
 
 insert into sys_menu(id, pater_id, sys_id, code, name, type, interface_uri, web_json, create_time, update_time)
 values(13, 1, 1, 'system', '系统管理', 1, null, null, now(), now());