diff --git a/driver/pom.xml b/driver/pom.xml index 9e03c51..607b813 100644 --- a/driver/pom.xml +++ b/driver/pom.xml @@ -86,11 +86,26 @@ springfox-boot-starter 3.0.0 + + org.apache.shiro shiro-spring 1.9.0 + + + cn.dev33 + sa-token-spring-boot-starter + 1.30.0 + + + + cn.dev33 + sa-token-dao-redis-jackson + 1.30.0 + + cn.hutool hutool-all diff --git a/driver/src/main/java/xyz/longicorn/driver/config/SaTokenConfig.java b/driver/src/main/java/xyz/longicorn/driver/config/SaTokenConfig.java new file mode 100644 index 0000000..b96f9a8 --- /dev/null +++ b/driver/src/main/java/xyz/longicorn/driver/config/SaTokenConfig.java @@ -0,0 +1,53 @@ +package xyz.longicorn.driver.config; + +import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.filter.SaFilterErrorStrategy; +import cn.dev33.satoken.filter.SaServletFilter; +import cn.dev33.satoken.router.SaHttpMethod; +import cn.dev33.satoken.router.SaRouter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import xyz.longicorn.driver.dto.ApiResult; + +// 主要处理sa-token的拦截和跨域问题 +@Configuration +public class SaTokenConfig { + @Bean + public SaServletFilter getSaServletFilter() { + return new SaServletFilter() + .addExclude( + "/druid/**", + "/api/user/login", + "/api/user/reg", + "/api/user/forget", + "/api/user/reset", + "/swagger**", + "/swagger-resources/**", + "/v2/api-docs", + "/picture/**" + ) + .addExclude("/**") + .setError(new SaFilterErrorStrategy() { + @Override + public Object run(Throwable e) { + return ApiResult.error(401, e.getMessage()); + } + }) + .setBeforeAuth(obj -> { + // ---------- 设置跨域响应头 ---------- + SaHolder.getResponse() + // 允许指定域访问跨域资源 + .setHeader("Access-Control-Allow-Origin", "*") + // 允许所有请求方式 + .setHeader("Access-Control-Allow-Methods", "*") + + // 允许的header参数 + .setHeader("Access-Control-Allow-Headers", "*"); + + // 如果是预检请求，则立即返回到前端 + SaRouter.match(SaHttpMethod.OPTIONS) + .free(r -> System.out.println("--------OPTIONS预检请求，不做处理")) + .back(); + }); + } +} diff --git a/driver/src/main/java/xyz/longicorn/driver/config/WebConfig.java b/driver/src/main/java/xyz/longicorn/driver/config/WebConfig.java index 5d5a811..da4f612 100644 --- a/driver/src/main/java/xyz/longicorn/driver/config/WebConfig.java +++ b/driver/src/main/java/xyz/longicorn/driver/config/WebConfig.java @@ -1,5 +1,11 @@ package xyz.longicorn.driver.config; +import cn.dev33.satoken.context.model.SaRequest; +import cn.dev33.satoken.context.model.SaResponse; +import cn.dev33.satoken.interceptor.SaRouteInterceptor; +import cn.dev33.satoken.router.SaRouteFunction; +import cn.dev33.satoken.router.SaRouter; +import cn.dev33.satoken.stp.StpUtil; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -11,6 +17,42 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { + // 简单的登录拦截 +// registry.addInterceptor(new SaRouteInterceptor()) +// .addPathPatterns("/**") // 要拦截的路由地址 +// .excludePathPatterns( +// "/druid/**", +// "/api/user/login", +// "/api/user/reg", +// "/api/user/forget", +// "/api/user/reset", +// "/swagger**", +// "/swagger-resources/**", +// "/v2/api-docs", +// "/picture/**" +// ); + // 复杂的权限、登录拦截 +// registry.addInterceptor(new SaRouteInterceptor(new SaRouteFunction() { +// @Override +// public void run(SaRequest req, SaResponse res, Object handler) { +// // 登录认证 -- 拦截所有路由，并排除/user/doLogin 用于开放登录 +// SaRouter.match("/**", "/user/doLogin", r -> StpUtil.checkLogin()); +// +// // 角色认证 -- 拦截以 admin 开头的路由，必须具备 admin 角色或者 super-admin 角色才可以通过认证 +// SaRouter.match("/admin/**", r -> StpUtil.checkRoleOr("admin", "super-admin")); +// +// // 权限认证 -- 不同模块认证不同权限 +// SaRouter.match("/user/**", r -> StpUtil.checkPermission("user")); +// SaRouter.match("/admin/**", r -> StpUtil.checkPermission("admin")); +// +// // 甚至你可以随意的写一个打印语句 +// SaRouter.match("/**", r -> System.out.println("----啦啦啦----")); +// +// // 连缀写法 +// SaRouter.match("/**").check(r -> System.out.println("----啦啦啦----")); +// } +// })) +// .addPathPatterns("/**"); } @Override diff --git a/driver/src/main/java/xyz/longicorn/driver/controller/FolderController.java b/driver/src/main/java/xyz/longicorn/driver/controller/FolderController.java index 0b17e4b..171c861 100644 --- a/driver/src/main/java/xyz/longicorn/driver/controller/FolderController.java +++ b/driver/src/main/java/xyz/longicorn/driver/controller/FolderController.java @@ -1,5 +1,6 @@ package xyz.longicorn.driver.controller; +import cn.dev33.satoken.stp.StpUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -9,6 +10,7 @@ import xyz.longicorn.driver.dto.ApiResult; import xyz.longicorn.driver.dto.FileItem; import xyz.longicorn.driver.dto.FolderDto; import xyz.longicorn.driver.pojo.FolderInfo; +import xyz.longicorn.driver.pojo.UserInfo; import xyz.longicorn.driver.service.FolderService; import javax.annotation.Resource; @@ -26,8 +28,10 @@ public class FolderController { //接口文档的名称 @ApiOperation(value = "查询目录信息", notes = "查询相应目录下的所有文件(夹)信息", httpMethod = "GET") public ApiResult listFolder(@RequestParam(required = false, defaultValue = "/") String folderPath) { + UserInfo info = StpUtil.getSession().get("user", new UserInfo().setId(0)); + return ApiResult.success( - folderService.listFolder(1, folderPath) + folderService.listFolder(StpUtil.getLoginId(0), folderPath) ); } diff --git a/driver/src/main/java/xyz/longicorn/driver/controller/UserController.java b/driver/src/main/java/xyz/longicorn/driver/controller/UserController.java index 6dbcc3d..e2cac56 100644 --- a/driver/src/main/java/xyz/longicorn/driver/controller/UserController.java +++ b/driver/src/main/java/xyz/longicorn/driver/controller/UserController.java @@ -27,7 +27,7 @@ public class UserController { @SneakyThrows @PostMapping("/login") public ApiResult login(@Validated @RequestBody LoginModel model) { - Thread.sleep(5); + Thread.sleep(3); final LoginUser user = userService.login(model.getUsername(), model.getPassword()); return ApiResult.success(user); diff --git a/driver/src/main/java/xyz/longicorn/driver/pojo/UserInfo.java b/driver/src/main/java/xyz/longicorn/driver/pojo/UserInfo.java index 9189552..9919f14 100644 --- a/driver/src/main/java/xyz/longicorn/driver/pojo/UserInfo.java +++ b/driver/src/main/java/xyz/longicorn/driver/pojo/UserInfo.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; @Data @@ -15,7 +16,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Accessors(chain = true) -public class UserInfo { +public class UserInfo implements Serializable { private Integer id; private String nickname; diff --git a/driver/src/main/java/xyz/longicorn/driver/service/UserService.java b/driver/src/main/java/xyz/longicorn/driver/service/UserService.java index 858e3d5..fdff890 100644 --- a/driver/src/main/java/xyz/longicorn/driver/service/UserService.java +++ b/driver/src/main/java/xyz/longicorn/driver/service/UserService.java @@ -1,5 +1,6 @@ package xyz.longicorn.driver.service; +import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -44,9 +45,12 @@ public class UserService extends ServiceImpl { // 将登录数据保存到redis 用户后续判断 LoginUser user = new LoginUser(); user.setAccount(account); + StpUtil.login(userInfo.getId()); // 使用用户编号在sa-token 完成登录 + StpUtil.getSession().set("user",userInfo); // 生成接口需要的token - user.setToken(IdUtil.fastSimpleUUID()); // 可以使用jwt生成token - loginUserDao.save(user); // 保存用户登录信息到redis +// user.setToken(IdUtil.fastSimpleUUID()); // 可以使用jwt生成token + user.setToken(StpUtil.getTokenValue()); +// loginUserDao.save(user); // 保存用户登录信息到redis user.setUserInfo(userInfo); return user; } diff --git a/driver/src/main/java/xyz/longicorn/driver/shiro/ShiroConfig.java b/driver/src/main/java/xyz/longicorn/driver/shiro/ShiroConfig.java index 318f871..5d5aa5e 100644 --- a/driver/src/main/java/xyz/longicorn/driver/shiro/ShiroConfig.java +++ b/driver/src/main/java/xyz/longicorn/driver/shiro/ShiroConfig.java @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -@Configuration public class ShiroConfig { @Resource private LoginUserDao loginUserDao; diff --git a/driver/src/main/resources/application.yml b/driver/src/main/resources/application.yml index aae476e..38b28bc 100644 --- a/driver/src/main/resources/application.yml +++ b/driver/src/main/resources/application.yml @@ -71,3 +71,5 @@ mybatis-plus: # 实体类所在的包 type-aliases-package: xyz.longicorn.driver.pojo type-enums-package: xyz.longicorn.driver.pojo.enums +sa-token: + token-name: Authorization \ No newline at end of file diff --git a/web/src/components/FileIcon.vue b/web/src/components/FileIcon.vue index 5cd62f0..347d1fb 100644 --- a/web/src/components/FileIcon.vue +++ b/web/src/components/FileIcon.vue @@ -1,7 +1,7 @@