diff --git a/auh-api/Dockerfile b/auh-api/Dockerfile index 3673ff8..f686446 100644 --- a/auh-api/Dockerfile +++ b/auh-api/Dockerfile @@ -1,5 +1,5 @@ FROM openjdk:24-ea-17-jdk-oraclelinux9 -MAINTAINER server +LABEL maintainer="server" #系统编码 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 diff --git a/auh-api/pom.xml b/auh-api/pom.xml index dd7be85..fe3bf83 100644 --- a/auh-api/pom.xml +++ b/auh-api/pom.xml @@ -31,11 +31,21 @@ org.springframework.boot spring-boot-maven-plugin + + + + + + + org.apache.maven.plugins maven-surefire-plugin + 3.5.2 - true + + -javaagent:"${settings.localRepository}/org/mockito/mockito-core/5.14.2/mockito-core-5.14.2.jar" + diff --git a/auh-api/src/main/java/cn/bunny/services/controller/IndexController.java b/auh-api/src/main/java/cn/bunny/services/controller/IndexController.java index 6ddfddc..9327088 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/IndexController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/IndexController.java @@ -24,7 +24,7 @@ public class IndexController { } @Operation(summary = "生成验证码", description = "生成验证码") - @GetMapping("public/checkCode") + @GetMapping("public/check-code") public ResponseEntity checkCode() { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.IMAGE_JPEG); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java index 94f294f..92cffc9 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java @@ -22,7 +22,7 @@ public class ConfigurationController { private ConfigurationService configurationService; @Operation(summary = "获取web配置文件", description = "读取web配置文件并返回给前端") - @GetMapping("public/webConfig") + @GetMapping("public/web-config") public WebConfiguration webConfig() { return configurationService.webConfig(); } diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index 09d9db6..815aa4c 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -32,7 +32,7 @@ import java.util.Map; @Tag(name = "邮件模板", description = "邮件模板相关接口") @PermissionTag(permission = "emailTemplate:*") @RestController -@RequestMapping("api/emailTemplate") +@RequestMapping("api/email-template") public class EmailTemplateController { @Resource diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java index 1e8a781..be88799 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java @@ -32,7 +32,7 @@ import java.util.Map; @Tag(name = "邮箱用户配置", description = "邮箱用户发送配置相关接口") @PermissionTag(permission = "emailUsers:*") @RestController -@RequestMapping("api/emailUsers") +@RequestMapping("api/email-users") public class EmailUsersController { @Resource diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java index b168ff4..b34d9cc 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java @@ -27,7 +27,7 @@ import java.util.List; @Tag(name = "多语言类型", description = "多语言类型相关接口") @PermissionTag(permission = "i18n:*") @RestController -@RequestMapping("api/i18nType") +@RequestMapping("api/i18n-type") public class I18nTypeController { @Resource diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index 629f25b..a867532 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -31,7 +31,7 @@ import java.util.List; @Tag(name = "菜单图标", description = "菜单图标相关接口") @PermissionTag(permission = "menuIcon:*") @RestController -@RequestMapping("api/menuIcon") +@RequestMapping("api/menu-icon") public class MenuIconController { @Resource diff --git a/auh-api/src/main/java/cn/bunny/services/controller/file/FilesController.java b/auh-api/src/main/java/cn/bunny/services/controller/file/FilesController.java index 70ac50a..b8ce1a6 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/file/FilesController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/file/FilesController.java @@ -87,7 +87,7 @@ public class FilesController { } @Operation(summary = "获取所有文件存储基础路径", description = "获取所有文件存储基础路径") - @GetMapping("private/getAllFilesStoragePath") + @GetMapping("private/file-storage-paths") public Result> getAllFilesStoragePath() { Map typeMap = FileStorageConstant.typeMap; List list = typeMap.keySet().stream().toList(); @@ -96,14 +96,14 @@ public class FilesController { } @Operation(summary = "上传文件", description = "上传文件") - @PostMapping("private/upload") + @PostMapping("private/file") public Result upload(FileUploadDto dto) { FileInfoVo vo = filesService.upload(dto); return Result.success(vo, ResultCodeEnum.SUCCESS_UPLOAD); } @Operation(summary = "上传图片文件", description = "上传图片文件") - @PostMapping("private/uploadImage") + @PostMapping("private/image") public Result uploadImage(FileUploadDto dto) { FileInfoVo vo = filesService.uploadFileByThumbnail(dto); return Result.success(vo, ResultCodeEnum.SUCCESS_UPLOAD); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java b/auh-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java index c361884..4b801d9 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java @@ -29,7 +29,7 @@ import java.util.List; @Tag(name = "文件分片信息表,仅在手动分片上传时使用", description = "文件分片信息表,仅在手动分片上传时使用相关接口") @PermissionTag(permission = "filesParDetail:*") @RestController -@RequestMapping("/api/filesParDetail") +@RequestMapping("/api/files-par-detail") public class FilesParDetailController { @Resource diff --git a/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java index 7fdcb5e..978bdce 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java @@ -28,7 +28,7 @@ import java.util.List; @Tag(name = "任务调度执行日志", description = "调度任务执行日志相关接口") @PermissionTag(permission = "scheduleExecuteLog:*") @RestController -@RequestMapping("api/scheduleExecuteLog") +@RequestMapping("api/schedule-execute-log") public class ScheduleExecuteLogController { @Resource diff --git a/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java index f1611fc..0c25774 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java @@ -29,7 +29,7 @@ import java.util.List; @Tag(name = "用户登录日志", description = "用户登录日志相关接口") @PermissionTag(permission = "userLoginLog:*") @RestController -@RequestMapping("api/userLoginLog") +@RequestMapping("api/user-login-log") public class UserLoginLogController { @Resource diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java index 043755c..4d4c949 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -75,15 +75,15 @@ public class MessageController { } @Operation(summary = "根据消息id查询消息详情", description = "根据消息id查询消息详情") - @GetMapping("private/getMessageDetailById") - public Result getMessageDetailById(Long id) { + @GetMapping("private/message/{id}") + public Result getMessageDetailById(@PathVariable Long id) { MessageDetailVo vo = messageService.getMessageDetailById(id); return Result.success(vo); } @Operation(summary = "根据消息id获取接收人信息", description = "根据消息id获取接收人信息") - @GetMapping("private/getReceivedUserinfoByMessageId") - public Result> getReceivedUserinfoByMessageId(Long messageId) { + @GetMapping("private/messages/{message-id}/recipients") + public Result> getReceivedUserinfoByMessageId(Long messageId, @PathVariable("message-id") String parameter) { List voList = messageService.getReceivedUserinfoByMessageId(messageId); return Result.success(voList); } diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index 7f84b5a..a053d83 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -32,7 +32,7 @@ import java.util.List; @Tag(name = "消息接收(用户消息)", description = "消息接收(用户消息)相关接口") @PermissionTag(permission = "messageReceived:*") @RestController -@RequestMapping("/api/messageReceived") +@RequestMapping("/api/message-received") public class MessageReceivedController { @Resource @@ -82,14 +82,14 @@ public class MessageReceivedController { } @Operation(summary = "用户将消息标为已读", description = "用户将消息标为已读") - @PutMapping("private/markAsRead") + @PutMapping("private/user/messages/read-status") public Result markAsReadByUser(@Valid @RequestBody List ids) { messageReceivedService.markAsReadByUser(ids); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "用户删除消息", description = "用户删除消息") - @DeleteMapping("private/deleteMessage") + @DeleteMapping("private/user/messages") public Result deleteMessageByUser(@RequestBody List ids) { messageReceivedService.deleteMessageByUser(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index acf4d2e..39b63bb 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -76,7 +76,7 @@ public class MessageTypeController { } @Operation(summary = "所有消息列表", description = "获取所有消息列表") - @GetMapping("private/getMessageList") + @GetMapping("private/messages") public Result> getMessageList() { List voList = messageTypeService.getMessageList(); return Result.success(voList); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index 284e904..c4835b0 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -31,7 +31,7 @@ import java.util.List; @Tag(name = "任务调度分组", description = "任务调度分组相关接口") @PermissionTag(permission = "schedulersGroup:*") @RestController -@RequestMapping("api/schedulersGroup") +@RequestMapping("api/schedulers-group") public class SchedulersGroupController { @Resource @@ -77,7 +77,7 @@ public class SchedulersGroupController { @Operation(summary = "获取所有任务调度分组", description = "获取所有任务调度分组") @PermissionTag(permission = "schedulersGroup:query") - @GetMapping("getSchedulersGroupList") + @GetMapping("scheduler-groups") public Result> getSchedulersGroupList() { List voList = schedulersGroupService.getSchedulersGroupList(); return Result.success(voList); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java index 6cefc8e..fc2336d 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java @@ -76,7 +76,7 @@ public class DeptController { } @Operation(summary = "获取所有部门", description = "获取所有部门") - @GetMapping("private/getDeptList") + @GetMapping("private/departments") public Result> getDeptPage() { List voList = deptService.getDeptPage(); return Result.success(voList); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java index 5ccf7d9..85d971a 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java @@ -96,14 +96,14 @@ public class PermissionController { } @Operation(summary = "获取所有权限", description = "获取所有权限") - @GetMapping("private/getPermissionList") + @GetMapping("private/permissions") public Result> getPermissionList() { List voList = permissionService.getPermissionList(); return Result.success(voList); } @Operation(summary = "获取系统API信息列表", description = "系统接口API信息列表") - @GetMapping("private/getSystemApiInfoList") + @GetMapping("private/system/apis") public Result> getSystemApiInfoList() { List list = ControllerApiPermissionScanner.scanControllerInfo(); return Result.success(list); @@ -111,7 +111,7 @@ public class PermissionController { @Operation(summary = "批量修改权限父级", description = "批量修改权限父级") @PermissionTag(permission = "permission::update") - @PatchMapping("update/permissionListByParentId") + @PatchMapping("update/permissions/parent") public Result updatePermissionListByParentId(@RequestBody @Valid PermissionUpdateBatchByParentIdDto dto) { permissionService.updatePermissionListByParentId(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); @@ -119,7 +119,7 @@ public class PermissionController { @Operation(summary = "批量修改权", description = "批量修改权") @PermissionTag(permission = "permission::update") - @PatchMapping("update/permissionBatch") + @PatchMapping("update/permissions/batch") public Result updatePermissionBatch(@RequestBody List list) { permissionService.updatePermissionBatch(list); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java index 8a76390..5a62c63 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java @@ -30,8 +30,8 @@ public class RolePermissionController { private RolePermissionService rolePermissionService; @Operation(summary = "根据角色id获取权限内容", description = "根据角色id获取权限内容") - @GetMapping("private/getPermissionListByRoleId") - public Result> getPermissionListByRoleId(Long id) { + @GetMapping("private/permissions/{id}") + public Result> getPermissionListByRoleId(@PathVariable Long id) { List voList = rolePermissionService.getPermissionListByRoleId(id); return Result.success(voList); } diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java index c958891..43899c2 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java @@ -35,7 +35,7 @@ public class RouterController { @Operation(summary = "获取用户菜单", description = "获取用户菜单") @PermissionTag(permission = "router:query") - @GetMapping("private/routerAsync") + @GetMapping("private/router-async") public Result> routerAsync() { List voList = routerService.routerAsync(); return Result.success(voList); @@ -43,7 +43,7 @@ public class RouterController { @Operation(summary = "查询管理路由菜单", description = "查询管理菜单列表") @PermissionTag(permission = "router:query") - @GetMapping("routerList") + @GetMapping("routers") public Result> routerList() { List voPageResult = routerService.routerList(); return Result.success(voPageResult); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java index a299bc0..07df859 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java @@ -21,22 +21,22 @@ import java.util.List; @Tag(name = "路由菜单和角色", description = "路由和角色相关接口") @PermissionTag(permission = "routerRole:*") @RestController -@RequestMapping("api/routerRole") +@RequestMapping("api/router-role") public class RouterRoleController { @Resource private RouterRoleService routerRoleService; @Operation(summary = "根据菜单id获取所有角色", description = "根据菜单id获取所有角色") - @GetMapping("private/getRoleListByRouterId") - public Result> getRoleListByRouterId(Long routerId) { + @GetMapping("private/roles/{routerId}") + public Result> getRoleListByRouterId(@PathVariable Long routerId) { List roleListByRouterId = routerRoleService.getRoleListByRouterId(routerId); return Result.success(roleListByRouterId); } @Operation(summary = "清除选中菜单所有角色", description = "清除选中菜单所有角色") @PermissionTag(permission = "routerRole:delete") - @DeleteMapping("clearRouterRole") + @DeleteMapping("/batch") public Result clearRouterRole(@RequestBody List routerIds) { routerRoleService.clearRouterRole(routerIds); return Result.success(); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java index c97f450..187babd 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -74,14 +74,14 @@ public class UserController { } @Operation(summary = "根据用户id查询用户", description = "根据用户ID获取用户信息,不包含Redis中的信息") - @GetMapping("private/getUserinfoById") - public Result getUserinfoById(Long id) { + @GetMapping("private/users/{id}") + public Result getUserinfoById(@PathVariable Long id) { UserVo vo = userService.getUserinfoById(id); return Result.success(vo); } @Operation(summary = "根据关键字查询用户", description = "根据用户名查询用户列表") - @GetMapping("private/getUserListByKeyword") + @GetMapping("private/users/search") public Result> getUserListByKeyword(String keyword) { List voList = userService.getUserListByKeyword(keyword); return Result.success(voList); @@ -89,15 +89,15 @@ public class UserController { @Operation(summary = "强制退出用户", description = "强制退出") @PermissionTag(permission = "user:update") - @PutMapping("forcedOffline") - public Result forcedOfflineByAdmin(@RequestBody Long id) { + @PutMapping("{id}/force-logout") + public Result forcedOfflineByAdmin(@PathVariable Long id) { userService.forcedOfflineByAdmin(id); return Result.success(); } @Operation(summary = "已登录用户", description = "查询缓存中已登录用户") @PermissionTag(permission = "user:query") - @GetMapping("getCacheUserPage/{page}/{limit}") + @GetMapping("/users/logged-in/{page}/{limit}") public Result> getCacheUserPage( @Parameter(name = "page", description = "当前页", required = true) @PathVariable("page") Integer page, diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java index 1314b2f..af9e061 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java @@ -33,7 +33,7 @@ public class UserLoginController { } @Operation(summary = "普通用户登录发送邮件验证码", description = "登录发送邮件验证码") - @PostMapping("public/sendLoginEmail") + @PostMapping("public/email-code") public Result sendLoginEmail(String email) { if (!StringUtils.hasText(email)) throw new AuthCustomerException(ResultCodeEnum.REQUEST_IS_EMPTY); @@ -42,7 +42,7 @@ public class UserLoginController { } @Operation(summary = "普通用户登录刷新token", description = "刷新用户token") - @PostMapping("private/refreshToken") + @PostMapping("private/refresh-token") public Result refreshToken(@Valid @RequestBody RefreshTokenDto dto) { RefreshTokenVo vo = userLoginService.refreshToken(dto); return Result.success(vo); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java index 338c4f1..e1dffd3 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java @@ -22,15 +22,15 @@ import java.util.List; @Tag(name = "用户和角色", description = "用户和角色相关接口") @PermissionTag(permission = "userRole:*") @RestController -@RequestMapping("api/userRole") +@RequestMapping("api/user-role") public class UserRoleController { @Resource private UserRoleService userRoleService; @Operation(summary = "根据用户id获取角色列", description = "根据用户id获取角色列") - @GetMapping("private/getRoleListByUserId") - public Result> getRoleListByUserId(Long userId) { + @GetMapping("private/roles/{userId}") + public Result> getRoleListByUserId(@PathVariable Long userId) { List roleVoList = userRoleService.getRoleListByUserId(userId); return Result.success(roleVoList); } diff --git a/auh-api/src/main/resources/application-dev.yml b/auh-api/src/main/resources/application-dev.yml index aa8102f..72cea5e 100644 --- a/auh-api/src/main/resources/application-dev.yml +++ b/auh-api/src/main/resources/application-dev.yml @@ -38,6 +38,7 @@ dromara: # 访问路径,使用本地在SpringSecurity中要配置权限,如果是和我一样就不用修改了,如果不是api开头,上线需要配置nginx path-patterns: /api/local-file/** storage-path: D:/Temp # 存储路径 + # storage-path: ~/bunny-admin/temp # 存储路径 base-path: "" # 基础路径 minio: endpointUrl: "http://192.168.3.137:9000" # 连接地址 diff --git a/auh-api/src/main/resources/application-test.yml b/auh-api/src/main/resources/application-test.yml index 97aa268..9b15958 100644 --- a/auh-api/src/main/resources/application-test.yml +++ b/auh-api/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ server: port: 8000 -#mybatis-plus: +# mybatis-plus: # configuration: # map-underscore-to-camel-case: true # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 @@ -54,12 +54,4 @@ bunny: host: 192.168.3.98 port: 6379 database: 0 - password: "123456" - - minio: - endpointUrl: "http://192.168.3.98:9000" - accessKey: bunny - secretKey: "02120212" - bucket-name: auth-admin - - backPath: "/www/root/backup" \ No newline at end of file + password: "123456" \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java b/service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java index 37d3f6c..e4cc66b 100644 --- a/service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java +++ b/service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java @@ -260,23 +260,14 @@ public class ControllerApiPermissionScanner extends AbstractAnnotationScanner { return false; } - // 登录路径特殊处理 - if (path.equals("login")) { - return true; - } - // 检查用户认证路径 for (String userAuth : WebSecurityConfig.userAuths) { - if (path.contains(userAuth)) { - return true; - } + if (path.contains(userAuth)) return true; } // 检查不需要权限的注解路径 for (String annotation : WebSecurityConfig.annotations) { - if (PATH_MATCHER.match(annotation, path) || PATH_MATCHER.match(annotation, "/" + path)) { - return true; - } + if (PATH_MATCHER.match(annotation, path) || PATH_MATCHER.match(annotation, "/" + path)) return true; } return false; diff --git a/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java b/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java index 894d225..99fc8c3 100644 --- a/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java +++ b/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java @@ -52,7 +52,6 @@ public class PermissionCheckService { } // 根据角色列表查询权限信息 - // List permissionList = permissionMapper.selectListByUserId(userId); List permissionList = authorizationCacheService.getPermissionsByUser(userId, username); // 判断是否与请求路径匹配 @@ -61,9 +60,7 @@ public class PermissionCheckService { .filter(permission -> { String method = permission.getRequestMethod(); if (StringUtils.hasText(method)) { - - return method.equalsIgnoreCase(requestMethod) - || requestURI.contains("*"); + return method.equalsIgnoreCase(requestMethod) || requestURI.contains("*"); } return false; }) diff --git a/service/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java index 27aecad..c24900f 100644 --- a/service/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java @@ -108,6 +108,14 @@ public class FilesServiceImpl extends ServiceImpl implements throw new AuthCustomerException(ResultCodeEnum.FILE_NOT_EXIST); } + // 更新数据 + dto.setFilepath(files.getFilepath()); + BeanUtils.copyProperties(dto, files); + updateById(files); + + // 文件存在上傳文件并更新 + if (file == null) return; + // 删除原来文件 boolean delete = fileStorageService.delete(files.getUrl()); if (!delete) { @@ -123,6 +131,7 @@ public class FilesServiceImpl extends ServiceImpl implements // 如果有缩略图的话 .setSaveThFilename(files.getThFilename()) .upload(); + } /**