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 b5abb4f..b5758e5 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 @@ -1,9 +1,9 @@ package cn.bunny.services.controller.configuration; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.configuration.dto.WebConfigurationDto; import cn.bunny.services.domain.system.configuration.entity.WebConfiguration; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.configuration.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -11,7 +11,7 @@ import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; -@Tag(name = "web配置", description = "web配置相关接口") +@Tag(name = "web配置文件", description = "web配置相关接口") @RestController @RequestMapping("/api/config") public class ConfigurationController { @@ -19,7 +19,7 @@ public class ConfigurationController { @Resource private ConfigurationService configurationService; - @Operation(summary = "用户前端配置文件", description = "读取web配置文件并返回给前端") + @Operation(summary = "获取web配置文件", description = "读取web配置文件并返回给前端") @GetMapping("public/webConfig") 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 bcbfa22..76cc90f 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 @@ -36,7 +36,7 @@ public class EmailTemplateController { @Resource private EmailTemplateService emailTemplateService; - @Operation(summary = "分页查询", description = "分页查询邮件模板", tags = "emailTemplate::query") + @Operation(summary = "分页查询邮件模板", description = "分页查询邮件模板", tags = "emailTemplate::query") @GetMapping("{page}/{limit}") public Result> getEmailTemplatePage( @Parameter(name = "page", description = "当前页", required = true) @@ -49,21 +49,21 @@ public class EmailTemplateController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加邮件模板", tags = "emailTemplate::add") + @Operation(summary = "添加邮件模板", description = "添加邮件模板", tags = "emailTemplate::add") @PostMapping() public Result addEmailTemplate(@Valid @RequestBody EmailTemplateAddDto dto) { emailTemplateService.addEmailTemplate(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新邮件模板", tags = "emailTemplate::update") + @Operation(summary = "更新邮件模板", description = "更新邮件模板", tags = "emailTemplate::update") @PutMapping() public Result updateEmailTemplate(@Valid @RequestBody EmailTemplateUpdateDto dto) { emailTemplateService.updateEmailTemplate(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除邮件模板", tags = "emailTemplate::delete") + @Operation(summary = "删除邮件模板", description = "删除邮件模板", tags = "emailTemplate::delete") @DeleteMapping() public Result deleteEmailTemplate(@RequestBody List ids) { emailTemplateService.deleteEmailTemplate(ids); 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 2f3d338..7cdb4d9 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 @@ -1,13 +1,13 @@ package cn.bunny.services.controller.configuration; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.email.dto.EmailUsersAddDto; import cn.bunny.services.domain.system.email.dto.EmailUsersDto; import cn.bunny.services.domain.system.email.dto.EmailUsersUpdateDto; import cn.bunny.services.domain.system.email.entity.EmailUsers; import cn.bunny.services.domain.system.email.vo.EmailUsersVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -28,7 +28,7 @@ import java.util.Map; * @author Bunny * @since 2024-10-10 15:19:22 */ -@Tag(name = "邮箱用户发送配置", description = "邮箱用户发送配置相关接口") +@Tag(name = "邮箱用户配置", description = "邮箱用户发送配置相关接口") @RestController @RequestMapping("api/emailUsers") public class EmailUsersController { @@ -36,7 +36,7 @@ public class EmailUsersController { @Resource private EmailUsersService emailUsersService; - @Operation(summary = "分页查询", description = "分页查询邮箱用户发送配置", tags = "emailUsers::query") + @Operation(summary = "分页查询邮箱用户配置", description = "分页查询邮箱用户配置", tags = "emailUsers::query") @GetMapping("{page}/{limit}") public Result> getEmailUserPage( @Parameter(name = "page", description = "当前页", required = true) @@ -49,28 +49,28 @@ public class EmailUsersController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加邮箱用户发送配置", tags = "emailUsers::add") + @Operation(summary = "添加邮箱用户配置", description = "添加邮箱用户配置", tags = "emailUsers::add") @PostMapping() public Result addEmailUsers(@Valid @RequestBody EmailUsersAddDto dto) { emailUsersService.addEmailUsers(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新邮箱用户发送配置", tags = "emailUsers::update") + @Operation(summary = "更新邮箱用户配置", description = "更新邮箱用户配置", tags = "emailUsers::update") @PutMapping() public Result updateEmailUsers(@Valid @RequestBody EmailUsersUpdateDto dto) { emailUsersService.updateEmailUsers(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除邮箱用户", tags = "emailUsers::delete") + @Operation(summary = "删除邮箱用户配置", description = "删除邮箱用户配置", tags = "emailUsers::delete") @DeleteMapping() public Result deleteEmailUsers(@RequestBody List ids) { emailUsersService.deleteEmailUsers(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } - @Operation(summary = "全部邮件用户配置", description = "获取全部邮件用户配置", tags = "emailUsers::query") + @Operation(summary = "全部邮箱用户配置", description = "获取全部邮箱用户配置", tags = "emailUsers::query") @GetMapping("private") public Result>> getEmailUserList() { List> list = emailUsersService.getAllMailboxConfigurationUsers(); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index 767e4db..6467b0a 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -1,14 +1,14 @@ package cn.bunny.services.controller.configuration; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.i18n.dto.I18nAddDto; import cn.bunny.services.domain.system.i18n.dto.I18nDto; import cn.bunny.services.domain.system.i18n.dto.I18nUpdateByFileDto; import cn.bunny.services.domain.system.i18n.dto.I18nUpdateDto; import cn.bunny.services.domain.system.i18n.entity.I18n; import cn.bunny.services.domain.system.i18n.vo.I18nVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -30,7 +30,7 @@ import java.util.Map; * @author Bunny * @since 2024-09-28 */ -@Tag(name = "i18n多语言", description = "i18n多语言相关接口") +@Tag(name = "多语言", description = "i18n多语言相关接口") @RestController @RequestMapping("api/i18n") public class I18nController { @@ -38,7 +38,7 @@ public class I18nController { @Resource private I18nService i18nService; - @Operation(summary = "分页查询", description = "分页查询多语言", tags = "i18n::query") + @Operation(summary = "分页查询多语言", description = "分页查询多语言", tags = "i18n::query") @GetMapping("{page}/{limit}") public Result> getI18nPage( @Parameter(name = "page", description = "当前页", required = true) @@ -51,28 +51,28 @@ public class I18nController { return Result.success(vo); } - @Operation(summary = "更新", description = "更新多语言", tags = "i18n::update") + @Operation(summary = "更新多语言", description = "更新多语言", tags = "i18n::update") @PutMapping() public Result updateI18n(@Valid @RequestBody I18nUpdateDto dto) { i18nService.updateI18n(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "添加", description = "添加多语言", tags = "i18n::add") + @Operation(summary = "添加多语言", description = "添加多语言", tags = "i18n::add") @PostMapping() public Result addI18n(@Valid @RequestBody I18nAddDto dto) { i18nService.addI18n(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "删除", description = "删除多语言", tags = "i18n::delete") + @Operation(summary = "删除多语言", description = "删除多语言", tags = "i18n::delete") @DeleteMapping() public Result deleteI18n(@RequestBody List ids) { i18nService.deleteI18n(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } - @Operation(summary = "获取多语言内容", description = "获取多语言内容", tags = "i18n::query") + @Operation(summary = "web获取全部多语言", description = "web获取全部多语言", tags = "i18n::query") @GetMapping("public") public Result> getI18nMap() { Map vo = i18nService.getI18nMap(); 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 a422b0d..caa9a3b 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 @@ -1,11 +1,11 @@ package cn.bunny.services.controller.configuration; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.i18n.dto.I18nTypeAddDto; import cn.bunny.services.domain.system.i18n.dto.I18nTypeDto; import cn.bunny.services.domain.system.i18n.dto.I18nTypeUpdateDto; import cn.bunny.services.domain.system.i18n.vo.I18nTypeVo; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.configuration.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -23,7 +23,7 @@ import java.util.List; * @author Bunny * @since 2024-09-28 */ -@Tag(name = "i18n多语言类型", description = "i18n多语言类型相关接口") +@Tag(name = "多语言类型", description = "多语言类型相关接口") @RestController @RequestMapping("api/i18nType") public class I18nTypeController { @@ -31,21 +31,21 @@ public class I18nTypeController { @Resource private I18nTypeService i18nTypeService; - @Operation(summary = "添加", description = "添加多语言类型", tags = "i18nType::query") + @Operation(summary = "添加多语言类型", description = "添加多语言类型", tags = "i18nType::query") @PostMapping() public Result addI18nType(@Valid @RequestBody I18nTypeAddDto dto) { i18nTypeService.addI18nType(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新多语言类型", tags = "i18nType::update") + @Operation(summary = "更新多语言类型", description = "更新多语言类型", tags = "i18nType::update") @PutMapping() public Result updateI18nType(@Valid @RequestBody I18nTypeUpdateDto dto) { i18nTypeService.updateI18nType(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除多语言类型", tags = "i18nType::delete") + @Operation(summary = "删除多语言类型", description = "删除多语言类型", tags = "i18nType::delete") @DeleteMapping() public Result deleteI18nType(@RequestBody List ids) { i18nTypeService.deleteI18nType(ids); 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 d3468d4..0f8f807 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 @@ -1,13 +1,13 @@ package cn.bunny.services.controller.configuration; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.menuIcon.dto.MenuIconAddDto; import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto; import cn.bunny.services.domain.system.menuIcon.dto.MenuIconUpdateDto; import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon; import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -35,7 +35,7 @@ public class MenuIconController { @Resource private MenuIconService menuIconService; - @Operation(summary = "分页查询", description = "分页查询系统菜单图标", tags = "menuIcon::query") + @Operation(summary = "分页查询菜单图标", description = "分页查询系统菜单图标", tags = "menuIcon::query") @GetMapping("{page}/{limit}") public Result> getMenuIconPage( @Parameter(name = "page", description = "当前页", required = true) @@ -48,21 +48,21 @@ public class MenuIconController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加系统菜单图标", tags = "menuIcon::add") + @Operation(summary = "添加菜单图标", description = "添加系统菜单图标", tags = "menuIcon::add") @PostMapping() public Result addMenuIcon(@Valid @RequestBody MenuIconAddDto dto) { menuIconService.addMenuIcon(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新系统菜单图标", tags = "menuIcon::update") + @Operation(summary = "更新菜单图标", description = "更新系统菜单图标", tags = "menuIcon::update") @PutMapping() public Result updateMenuIcon(@Valid @RequestBody MenuIconUpdateDto dto) { menuIconService.updateMenuIcon(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除系统菜单图标", tags = "menuIcon::delete") + @Operation(summary = "删除菜单图标", description = "删除系统菜单图标", tags = "menuIcon::delete") @DeleteMapping() public Result deleteMenuIcon(@RequestBody List ids) { menuIconService.deleteMenuIcon(ids); 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 67937e8..f1cd18b 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 @@ -1,11 +1,11 @@ package cn.bunny.services.controller.log; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto; import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.log.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -32,7 +32,7 @@ public class ScheduleExecuteLogController { @Resource private ScheduleExecuteLogService scheduleExecuteLogService; - @Operation(summary = "分页查询", description = "分页查询调度任务执行日志", tags = "scheduleExecuteLog::query") + @Operation(summary = "分页查询任务调度执行日志", description = "分页查询调度任务执行日志", tags = "scheduleExecuteLog::query") @GetMapping("{page}/{limit}") public Result> getScheduleExecuteLogPage( @Parameter(name = "page", description = "当前页", required = true) @@ -45,7 +45,7 @@ public class ScheduleExecuteLogController { return Result.success(pageResult); } - @Operation(summary = "删除", description = "删除调度任务执行日志", tags = "scheduleExecuteLog::delete") + @Operation(summary = "删除任务调度执行日志", description = "删除调度任务执行日志", tags = "scheduleExecuteLog::delete") @DeleteMapping() public Result deleteScheduleExecuteLog(@RequestBody List ids) { scheduleExecuteLogService.deleteScheduleExecuteLog(ids); 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 2b3a8ab..d92561e 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 @@ -1,12 +1,12 @@ package cn.bunny.services.controller.log; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.log.dto.UserLoginLogDto; import cn.bunny.services.domain.system.log.entity.UserLoginLog; import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo; import cn.bunny.services.domain.system.log.vo.UserLoginLogVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.log.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -19,13 +19,13 @@ import java.util.List; /** *

- * 用户登录日志表 前端控制器 + * 用户登录日志 前端控制器 *

* * @author Bunny * @since 2024-10-19 01:01:01 */ -@Tag(name = "系统用户登录日志", description = "用户登录日志相关接口") +@Tag(name = "用户登录日志", description = "用户登录日志相关接口") @RestController @RequestMapping("api/userLoginLog") public class UserLoginLogController { @@ -33,7 +33,7 @@ public class UserLoginLogController { @Resource private UserLoginLogService userLoginLogService; - @Operation(summary = "分页查询", description = "分页查询用户登录日志", tags = "userLoginLog::query") + @Operation(summary = "分页查询用户登录日志", description = "分页查询用户登录日志", tags = "userLoginLog::query") @GetMapping("{page}/{limit}") public Result> getUserLoginLogPage( @Parameter(name = "page", description = "当前页", required = true) @PathVariable("page") Integer page, @@ -44,14 +44,14 @@ public class UserLoginLogController { return Result.success(pageResult); } - @Operation(summary = "删除", description = "删除用户登录日志", tags = "userLoginLog::delete") + @Operation(summary = "删除用户登录日志", description = "删除用户登录日志", tags = "userLoginLog::delete") @DeleteMapping() public Result deleteUserLoginLog(@RequestBody List ids) { userLoginLogService.deleteUserLoginLog(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } - @Operation(summary = "分页查询本地用户登录日志", description = "分页查询本地用户登录日志", tags = "userLoginLog::query") + @Operation(summary = "分页查询当前用户登录日志", description = "分页查询本地用户登录日志", tags = "userLoginLog::query") @GetMapping("private/{page}/{limit}") public Result> getUserLoginLogPageByUser( @Parameter(name = "page", description = "当前页", required = true) @PathVariable("page") Integer page, 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 a24b431..3db05a3 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 @@ -1,5 +1,8 @@ package cn.bunny.services.controller.message; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.message.dto.MessageAddDto; import cn.bunny.services.domain.system.message.dto.MessageDto; import cn.bunny.services.domain.system.message.dto.MessageUpdateDto; @@ -7,9 +10,6 @@ import cn.bunny.services.domain.system.message.entity.Message; import cn.bunny.services.domain.system.message.vo.MessageDetailVo; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo; import cn.bunny.services.domain.system.message.vo.MessageVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.message.MessageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -37,7 +37,7 @@ public class MessageController { @Resource private MessageService messageService; - @Operation(summary = "分页查询", description = "分页查询发送消息", tags = "message::query") + @Operation(summary = "分页查询系统消息", description = "分页查询发送消息", tags = "message::query") @GetMapping("{page}/{limit}") public Result> getMessagePage( @Parameter(name = "page", description = "当前页", required = true) @@ -50,21 +50,21 @@ public class MessageController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加系统消息", tags = "message::add") + @Operation(summary = "添加系统消息", description = "添加系统消息", tags = "message::add") @PostMapping() public Result addMessage(@Valid @RequestBody MessageAddDto dto) { messageService.addMessage(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新系统消息", tags = "message::update") + @Operation(summary = "更系统消息", description = "更新系统消息", tags = "message::update") @PutMapping() public Result updateMessage(@Valid @RequestBody MessageUpdateDto dto) { messageService.updateMessage(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除系统消息", tags = "message::delete") + @Operation(summary = "删除系统消息", description = "删除系统消息", tags = "message::delete") @DeleteMapping() public Result deleteMessage(@RequestBody List ids) { messageService.deleteMessage(ids); 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 1e95714..fa64e71 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 @@ -1,14 +1,14 @@ package cn.bunny.services.controller.message; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.message.dto.MessageReceivedDto; import cn.bunny.services.domain.system.message.dto.MessageReceivedUpdateDto; import cn.bunny.services.domain.system.message.dto.MessageUserDto; import cn.bunny.services.domain.system.message.entity.Message; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; import cn.bunny.services.domain.system.message.vo.MessageUserVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.message.MessageReceivedService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -36,7 +36,7 @@ public class MessageReceivedController { @Resource private MessageReceivedService messageReceivedService; - @Operation(summary = "分页查询", description = "管理员分页查询用户消息", tags = "messageReceived::query") + @Operation(summary = "分页查询消息接收", description = "管理员分页查询用户消息", tags = "messageReceived::query") @GetMapping("{page}/{limit}") public Result> getMessageReceivedPage( @Parameter(name = "page", description = "当前页", required = true) @@ -49,21 +49,21 @@ public class MessageReceivedController { return Result.success(pageResult); } - @Operation(summary = "更新", description = "管理员将用户消息标为已读", tags = "messageReceived::update") + @Operation(summary = "更新消息接收", description = "管理员将用户消息标为已读", tags = "messageReceived::update") @PutMapping() public Result updateMarkMessageReceived(@Valid @RequestBody MessageReceivedUpdateDto dto) { messageReceivedService.updateMarkMessageReceived(dto); return Result.success(); } - @Operation(summary = "删除", description = "管理删除用户消息", tags = "messageReceived::delete") + @Operation(summary = "删除消息接收", description = "管理删除用户消息", tags = "messageReceived::delete") @DeleteMapping() public Result deleteMessageReceived(@RequestBody List ids) { messageReceivedService.deleteMessageReceived(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } - @Operation(summary = "分页查询用户消息", description = "分页查询用户消息", tags = "messageReceived::query") + @Operation(summary = "分页查询消息接收", description = "分页查询用户消息", tags = "messageReceived::query") @GetMapping("private/{page}/{limit}") public Result> getMessagePageByUser( @Parameter(name = "page", description = "当前页", required = true) 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 f4c93c5..d262053 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 @@ -1,13 +1,13 @@ package cn.bunny.services.controller.message; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.message.dto.MessageTypeAddDto; import cn.bunny.services.domain.system.message.dto.MessageTypeDto; import cn.bunny.services.domain.system.message.dto.MessageTypeUpdateDto; import cn.bunny.services.domain.system.message.entity.MessageType; import cn.bunny.services.domain.system.message.vo.MessageTypeVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -27,7 +27,7 @@ import java.util.List; * @author Bunny * @since 2024-10-30 13:19:33 */ -@Tag(name = "系统消息类型", description = "系统消息类型相关接口") +@Tag(name = "消息类型", description = "系统消息类型相关接口") @RestController @RequestMapping("api/messageType") public class MessageTypeController { @@ -35,7 +35,7 @@ public class MessageTypeController { @Resource private MessageTypeService messageTypeService; - @Operation(summary = "分页查询", description = "分页查询系统消息类型", tags = "messageType::query") + @Operation(summary = "分页查询消息类型", description = "分页查询系统消息类型", tags = "messageType::query") @GetMapping("{page}/{limit}") public Result> getMessageTypePage( @Parameter(name = "page", description = "当前页", required = true) @@ -48,21 +48,21 @@ public class MessageTypeController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加系统消息类型", tags = "messageType::add") + @Operation(summary = "添加消息类型", description = "添加系统消息类型", tags = "messageType::add") @PostMapping() public Result addMessageType(@Valid @RequestBody MessageTypeAddDto dto) { messageTypeService.addMessageType(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新系统消息类型", tags = "messageType::update") + @Operation(summary = "更新消息类型", description = "更新系统消息类型", tags = "messageType::update") @PutMapping() public Result updateMessageType(@Valid @RequestBody MessageTypeUpdateDto dto) { messageTypeService.updateMessageType(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除系统消息类型", tags = "messageType::delete") + @Operation(summary = "删除消息类型", description = "删除系统消息类型", tags = "messageType::delete") @DeleteMapping() public Result deleteMessageType(@RequestBody List ids) { messageTypeService.deleteMessageType(ids); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index 060faa0..aa438ce 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -1,9 +1,9 @@ package cn.bunny.services.controller.schedule; import cn.bunny.services.aop.scanner.QuartzSchedulersScanner; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.system.quartz.dto.SchedulersAddDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersUpdateDto; @@ -37,7 +37,7 @@ public class SchedulersController { @Resource private SchedulersService schedulersService; - @Operation(summary = "分页查询", description = "分页查询任务执行", tags = "schedulers::query") + @Operation(summary = "分页查询任务调度", description = "分页查询任务执行", tags = "schedulers::query") @GetMapping("{page}/{limit}") public Result> getSchedulersPage( @Parameter(name = "page", description = "当前页", required = true) @@ -50,35 +50,35 @@ public class SchedulersController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加任务", tags = "schedulers::add") + @Operation(summary = "添加任务调度", description = "添加任务", tags = "schedulers::add") @PostMapping() public Result addSchedulers(@Valid @RequestBody SchedulersAddDto dto) { schedulersService.addSchedulers(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新任务", tags = "schedulers::update") + @Operation(summary = "更新任务调度", description = "更新任务", tags = "schedulers::update") @PutMapping() public Result updateSchedulers(@Valid @RequestBody SchedulersUpdateDto dto) { schedulersService.updateSchedulers(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "暂停任务", description = "暂停任务", tags = "schedulers::update") + @Operation(summary = "暂停任务调度", description = "暂停任务", tags = "schedulers::update") @PutMapping("pause") public Result pause(@RequestBody SchedulersUpdateDto dto) { schedulersService.pauseScheduler(dto); return Result.success(); } - @Operation(summary = "恢复任务", description = "恢复任务", tags = "schedulers::update") + @Operation(summary = "恢复任务调度", description = "恢复任务", tags = "schedulers::update") @PutMapping("resume") public Result resume(@RequestBody SchedulersUpdateDto dto) { schedulersService.resumeScheduler(dto); return Result.success(); } - @Operation(summary = "删除", description = "删除任务", tags = "schedulers::delete") + @Operation(summary = "删除任务调度", description = "删除任务", tags = "schedulers::delete") @DeleteMapping() public Result deleteSchedulers(@RequestBody SchedulersUpdateDto dto) { schedulersService.deleteSchedulers(dto); 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 f76ac88..cd23f29 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 @@ -1,13 +1,13 @@ package cn.bunny.services.controller.schedule; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupAddDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupUpdateDto; import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup; import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -35,7 +35,7 @@ public class SchedulersGroupController { @Resource private SchedulersGroupService schedulersGroupService; - @Operation(summary = "分页查询", description = "分页查询任务调度分组", tags = "schedulersGroup::query") + @Operation(summary = "分页查询任务调度分组", description = "分页查询任务调度分组", tags = "schedulersGroup::query") @GetMapping("{page}/{limit}") public Result> getSchedulersGroupPage( @Parameter(name = "page", description = "当前页", required = true) @@ -48,21 +48,21 @@ public class SchedulersGroupController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加任务调度分组", tags = "schedulersGroup::add") + @Operation(summary = "添加任务调度分组", description = "添加任务调度分组", tags = "schedulersGroup::add") @PostMapping() public Result addSchedulersGroup(@Valid @RequestBody SchedulersGroupAddDto dto) { schedulersGroupService.addSchedulersGroup(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新任务调度分组", tags = "schedulersGroup::update") + @Operation(summary = "更新任务调度分组", description = "更新任务调度分组", tags = "schedulersGroup::update") @PutMapping() public Result updateSchedulersGroup(@Valid @RequestBody SchedulersGroupUpdateDto dto) { schedulersGroupService.updateSchedulersGroup(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除任务调度分组", tags = "schedulersGroup::delete") + @Operation(summary = "删除任务调度分组", description = "删除任务调度分组", tags = "schedulersGroup::delete") @DeleteMapping() public Result deleteSchedulersGroup(@RequestBody List ids) { schedulersGroupService.deleteSchedulersGroup(ids); 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 7ed5acf..7fd180c 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 @@ -1,13 +1,13 @@ package cn.bunny.services.controller.system; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.system.dto.dept.DeptAddDto; import cn.bunny.services.domain.system.system.dto.dept.DeptDto; import cn.bunny.services.domain.system.system.dto.dept.DeptUpdateDto; import cn.bunny.services.domain.system.system.entity.Dept; import cn.bunny.services.domain.system.system.vo.DeptVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -27,7 +27,7 @@ import java.util.List; * @author Bunny * @since 2024-10-04 10:39:08 */ -@Tag(name = "系统部门", description = "部门相关接口") +@Tag(name = "部门", description = "部门相关接口") @RestController @RequestMapping("/api/dept") public class DeptController { diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java index 0a8beb4..064709d 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java @@ -1,6 +1,9 @@ package cn.bunny.services.controller.system; import cn.bunny.services.domain.common.constant.MinioConstant; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.files.dto.FileUploadDto; import cn.bunny.services.domain.system.files.dto.FilesAddDto; import cn.bunny.services.domain.system.files.dto.FilesDto; @@ -8,9 +11,6 @@ import cn.bunny.services.domain.system.files.dto.FilesUpdateDto; import cn.bunny.services.domain.system.files.entity.Files; import cn.bunny.services.domain.system.files.vo.FileInfoVo; import cn.bunny.services.domain.system.files.vo.FilesVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.system.FilesService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -33,7 +33,7 @@ import java.util.Set; * @author Bunny * @since 2024-10-09 16:28:01 */ -@Tag(name = "系统文件", description = "系统文件相关接口") +@Tag(name = "文件", description = "系统文件相关接口") @RestController @RequestMapping("api/files") public class FilesController { @@ -41,7 +41,7 @@ public class FilesController { @Resource private FilesService filesService; - @Operation(summary = "分页查询", description = "分页查询系统文件", tags = "files::query") + @Operation(summary = "分页查询文件", description = "分页查询系统文件", tags = "files::query") @GetMapping("{page}/{limit}") public Result> getFilesPage( @Parameter(name = "page", description = "当前页", required = true) @@ -54,21 +54,21 @@ public class FilesController { return Result.success(pageResult); } - @Operation(summary = "更新", description = "更新系统文件", tags = "files::update") + @Operation(summary = "更新文件", description = "更新系统文件", tags = "files::update") @PutMapping() public Result updateFiles(@Valid FilesUpdateDto dto) { filesService.updateFiles(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "添加", description = "添加系统文件", tags = "files::add") + @Operation(summary = "添加文件", description = "添加系统文件", tags = "files::add") @PostMapping() public Result addFiles(@Valid FilesAddDto dto) { filesService.addFiles(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "删除", description = "删除系统文件", tags = "files::delete") + @Operation(summary = "删除文件", description = "删除系统文件", tags = "files::delete") @DeleteMapping() public Result deleteFiles(@RequestBody List ids) { filesService.deleteFiles(ids); 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 08243fa..1e7c031 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 @@ -32,7 +32,7 @@ import java.util.List; * @author Bunny * @since 2024-10-03 16:00:52 */ -@Tag(name = "系统权限", description = "权限相关接口") +@Tag(name = "权限", description = "权限相关接口") @RestController @RequestMapping("api/permission") public class PermissionController { @@ -40,7 +40,7 @@ public class PermissionController { @Resource private PermissionService permissionService; - @Operation(summary = "分页查询", description = "分页查询权限", tags = {"permission::page", "permission::queryPage"}) + @Operation(summary = "分页查询权限", description = "分页查询权限", tags = {"permission::page", "permission::queryPage"}) @GetMapping("{page}/{limit}") public Result> getPermissionPage( @Parameter(name = "page", description = "当前页", required = true) @@ -53,21 +53,21 @@ public class PermissionController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加权限", tags = "permission::add") + @Operation(summary = "添加权限", description = "添加权限", tags = "permission::add") @PostMapping() public Result addPermission(@Valid @RequestBody PermissionAddDto dto) { permissionService.addPermission(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新权限", tags = "permission::update") + @Operation(summary = "更新权限", description = "更新权限", tags = "permission::update") @PutMapping() public Result updatePermission(@Valid @RequestBody PermissionUpdateDto dto) { permissionService.updatePermission(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除权限", tags = "permission::delete") + @Operation(summary = "删除权限", description = "删除权限", tags = "permission::delete") @DeleteMapping() public Result deletePermission(@RequestBody List ids) { permissionService.deletePermission(ids); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java index 6e51d76..8240b6a 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.system; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.system.dto.role.RoleAddDto; import cn.bunny.services.domain.system.system.dto.role.RoleDto; import cn.bunny.services.domain.system.system.dto.role.RoleUpdateDto; import cn.bunny.services.domain.system.system.entity.Role; import cn.bunny.services.domain.system.system.vo.RoleVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.system.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -29,7 +29,7 @@ import java.util.List; * @author Bunny * @since 2024-10-03 14:26:24 */ -@Tag(name = "系统角色", description = "角色相关接口") +@Tag(name = "角色", description = "角色相关接口") @RestController @RequestMapping("api/role") public class RoleController { @@ -50,21 +50,21 @@ public class RoleController { return Result.success(pageResult); } - @Operation(summary = "添加", description = "添加角色", tags = "role::add") + @Operation(summary = "添加角色", description = "添加角色", tags = "role::add") @PostMapping() public Result addRole(@Valid @RequestBody RoleAddDto dto) { roleService.addRole(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新角色", tags = "role::update") + @Operation(summary = "更新角色", description = "更新角色", tags = "role::update") @PutMapping() public Result updateRole(@Valid @RequestBody RoleUpdateDto dto) { roleService.updateRole(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除角色", tags = "role::delete") + @Operation(summary = "删除角色", description = "删除角色", tags = "role::delete") @DeleteMapping() public Result deleteRole(@RequestBody List ids) { roleService.deleteRole(ids); 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 e9647e1..313656c 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 @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; -import cn.bunny.services.domain.system.system.dto.AssignPowersToRoleDto; import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.system.system.dto.AssignPowersToRoleDto; import cn.bunny.services.service.system.RolePermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -19,7 +19,7 @@ import java.util.List; * @author Bunny * @since 2024-09-26 */ -@Tag(name = "系统角色和权限", description = "角色和权限相关接口") +@Tag(name = "角色和权限", description = "角色和权限相关接口") @RestController @RequestMapping("api/rolePermission") public class RolePermissionController { 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 ce7afcc..ccccbcd 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 @@ -1,11 +1,11 @@ package cn.bunny.services.controller.system; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.domain.system.system.dto.router.RouterAddDto; import cn.bunny.services.domain.system.system.dto.router.RouterUpdateDto; import cn.bunny.services.domain.system.system.vo.router.RouterManageVo; import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.service.system.RouterService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -23,7 +23,7 @@ import java.util.List; * @author Bunny * @since 2024-09-26 */ -@Tag(name = "系统路由", description = "系统路由相关接口") +@Tag(name = "路由菜单", description = "系统路由相关接口") @RestController @RequestMapping("api/router") public class RouterController { @@ -38,28 +38,28 @@ public class RouterController { return Result.success(voList); } - @Operation(summary = "查询管理菜单列表", description = "查询管理菜单列表", tags = "router::query") + @Operation(summary = "查询管理路由菜单", description = "查询管理菜单列表", tags = "router::query") @GetMapping("routerList") public Result> routerList() { List voPageResult = routerService.routerList(); return Result.success(voPageResult); } - @Operation(summary = "添加", description = "添加路由菜单", tags = "router::add") + @Operation(summary = "添加路由菜单", description = "添加路由菜单", tags = "router::add") @PostMapping() public Result addRouter(@Valid @RequestBody RouterAddDto dto) { routerService.addRouter(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新", description = "更新路由菜单", tags = "router::update") + @Operation(summary = "更新路由菜单", description = "更新路由菜单", tags = "router::update") @PutMapping() public Result updateRouter(@Valid @RequestBody RouterUpdateDto dto) { routerService.updateRouter(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除", description = "删除路由菜单", tags = "router::delete") + @Operation(summary = "删除路由菜单", description = "删除路由菜单", tags = "router::delete") @DeleteMapping() public Result deletedRouterByIds(@RequestBody List ids) { routerService.deletedRouterByIds(ids); 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 e80ca8d..9248bd1 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 @@ -17,7 +17,7 @@ import java.util.List; * @author Bunny * @since 2024-09-26 */ -@Tag(name = "路由和角色", description = "路由和角色相关接口") +@Tag(name = "路由菜单和角色", description = "路由和角色相关接口") @RestController @RequestMapping("api/routerRole") public class RouterRoleController { 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 d673096..bb5c738 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 @@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; -@Tag(name = "系统用户", description = "用户信息相关接口") +@Tag(name = "用户", description = "用户信息相关接口") @RestController @RequestMapping("/api/user") public class UserController { @@ -30,7 +30,7 @@ public class UserController { @Resource private UserService userService; - @Operation(summary = "分页查询", description = "分页查询用户信息", tags = "user::query") + @Operation(summary = "分页查询用户", description = "分页查询用户信息", tags = "user::query") @GetMapping("{page}/{limit}") public Result> getUserPageByAdmin( @Parameter(name = "page", description = "当前页", required = true) @@ -67,14 +67,14 @@ public class UserController { return Result.success(ResultCodeEnum.DELETE_SUCCESS); } - @Operation(summary = "根据用户id查询", description = "根据用户ID获取用户信息,不包含Redis中的信息", tags = "user::query") + @Operation(summary = "根据用户id查询用户", description = "根据用户ID获取用户信息,不包含Redis中的信息", tags = "user::query") @GetMapping("private/getUserinfoById") public Result getUserinfoById(Long id) { UserVo vo = userService.getUserinfoById(id); return Result.success(vo); } - @Operation(summary = "根据用户名查询用户列表", description = "根据用户名查询用户列表", tags = "user::query") + @Operation(summary = "根据关键字查询用户", description = "根据用户名查询用户列表", tags = "user::query") @GetMapping("private/getUserListByKeyword") public Result> getUserListByKeyword(String keyword) { List voList = userService.getUserListByKeyword(keyword); 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 0013dbc..1314b2f 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 @@ -1,9 +1,9 @@ package cn.bunny.services.controller.system; import cn.bunny.services.context.BaseContext; +import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.LoginVo; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.system.system.dto.user.AdminUserUpdateByLocalUserDto; import cn.bunny.services.domain.system.system.dto.user.LoginDto; import cn.bunny.services.domain.system.system.dto.user.RefreshTokenDto; @@ -17,7 +17,7 @@ import jakarta.validation.Valid; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -@Tag(name = "用户登录", description = "用户登录相关接口") +@Tag(name = "普通用户登录", description = "用户登录相关接口") @RestController @RequestMapping("/api/user") public class UserLoginController { @@ -25,14 +25,14 @@ public class UserLoginController { @Resource private UserLoginService userLoginService; - @Operation(summary = "用户登录", description = "前端用户登录") + @Operation(summary = "普通用户登录", description = "前端用户登录") @PostMapping("login") public Result login(@Valid @RequestBody LoginDto loginDto) { LoginVo loginVo = userLoginService.login(loginDto); return Result.success(loginVo); } - @Operation(summary = "登录发送邮件验证码", description = "登录发送邮件验证码") + @Operation(summary = "普通用户登录发送邮件验证码", description = "登录发送邮件验证码") @PostMapping("public/sendLoginEmail") public Result sendLoginEmail(String email) { if (!StringUtils.hasText(email)) throw new AuthCustomerException(ResultCodeEnum.REQUEST_IS_EMPTY); @@ -41,7 +41,7 @@ public class UserLoginController { return Result.success(ResultCodeEnum.EMAIL_CODE_SEND_SUCCESS); } - @Operation(summary = "刷新token", description = "刷新用户token") + @Operation(summary = "普通用户登录刷新token", description = "刷新用户token") @PostMapping("private/refreshToken") public Result refreshToken(@Valid @RequestBody RefreshTokenDto dto) { RefreshTokenVo vo = userLoginService.refreshToken(dto); @@ -55,7 +55,7 @@ public class UserLoginController { return Result.success(vo); } - @Operation(summary = "退出登录", description = "退出登录") + @Operation(summary = "普通用户登录退出登录", description = "退出登录") @PostMapping("private/logout") public Result logout() { userLoginService.logout(); 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 c2f3155..465c975 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 @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; -import cn.bunny.services.domain.system.system.dto.user.AssignRolesToUsersDto; import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.system.system.dto.user.AssignRolesToUsersDto; import cn.bunny.services.service.system.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -18,7 +18,7 @@ import java.util.List; * @author Bunny * @since 2024-09-26 */ -@Tag(name = "系统用户和角色", description = "用户和角色相关接口") +@Tag(name = "用户和角色", description = "用户和角色相关接口") @RestController @RequestMapping("api/userRole") public class UserRoleController { diff --git a/auh-api/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java b/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java similarity index 99% rename from auh-api/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java rename to service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java index 62b6cf6..5fe9d1b 100644 --- a/auh-api/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java +++ b/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java @@ -1,4 +1,4 @@ -package cn.bunny.services.aop; +package cn.bunny.services.aop.aspect; import cn.bunny.services.domain.common.constant.LocalDateTimeConstant; import cn.bunny.services.domain.common.enums.JobEnums;