diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/annotation/BusinessLog.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/annotation/ApiLog.java similarity index 98% rename from kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/annotation/BusinessLog.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/annotation/ApiLog.java index e8a6f568d..a6e3a4171 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/annotation/BusinessLog.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/annotation/ApiLog.java @@ -35,7 +35,7 @@ import java.lang.annotation.*; @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface BusinessLog { +public @interface ApiLog { /** * 是否进行日志记录,默认是开启 diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java index 513593c98..5e4775657 100644 --- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java +++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java @@ -28,7 +28,7 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.dsctn.api.pojo.request.DatabaseInfoRequest; import cn.stylefeng.roses.kernel.dsctn.modular.entity.DatabaseInfo; import cn.stylefeng.roses.kernel.dsctn.modular.service.DatabaseInfoService; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -68,7 +68,7 @@ public class DatabaseInfoController { * @since 2020/11/1 22:16 */ @PostResource(name = "新增数据源", path = "/databaseInfo/add") - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Validated(BaseRequest.add.class) DatabaseInfoRequest databaseInfoRequest) { databaseInfoService.add(databaseInfoRequest); return new SuccessResponseData<>(); @@ -81,7 +81,7 @@ public class DatabaseInfoController { * @since 2020/11/1 22:18 */ @PostResource(name = "删除数据源", path = "/databaseInfo/delete") - @BusinessLog + @ApiLog public ResponseData del(@RequestBody @Validated(DatabaseInfoRequest.delete.class) DatabaseInfoRequest databaseInfoRequest) { databaseInfoService.del(databaseInfoRequest); return new SuccessResponseData<>(); @@ -94,7 +94,7 @@ public class DatabaseInfoController { * @since 2020/11/1 22:16 */ @PostResource(name = "编辑数据源", path = "/databaseInfo/edit") - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(DatabaseInfoRequest.edit.class) DatabaseInfoRequest databaseInfoRequest) { databaseInfoService.edit(databaseInfoRequest); return new SuccessResponseData<>(); diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java index 66cde86bf..5fdcc8de4 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java @@ -32,7 +32,7 @@ import cn.stylefeng.roses.kernel.file.api.pojo.request.SysFileInfoRequest; import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse; import cn.stylefeng.roses.kernel.file.modular.entity.SysFileInfo; import cn.stylefeng.roses.kernel.file.modular.service.SysFileInfoService; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -251,7 +251,7 @@ public class SysFileInfoController { * @since 2020/11/29 11:19 */ @PostResource(name = "删除文件信息(真删除文件信息)", path = "/sysFileInfo/deleteReally") - @BusinessLog + @ApiLog public ResponseData deleteReally(@RequestBody @Validated(SysFileInfoRequest.delete.class) SysFileInfoRequest sysFileInfoRequest) { this.sysFileInfoService.deleteReally(sysFileInfoRequest); return new SuccessResponseData<>(); diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/log/loginlog/controller/SysLoginLogController.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/log/loginlog/controller/SysLoginLogController.java index 30af1a8d7..8d55ec055 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/log/loginlog/controller/SysLoginLogController.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/log/loginlog/controller/SysLoginLogController.java @@ -29,7 +29,7 @@ import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogDto; import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.log.loginlog.entity.SysLoginLog; import cn.stylefeng.roses.kernel.log.loginlog.service.SysLoginLogService; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -64,7 +64,7 @@ public class SysLoginLogController { * @since 2021/1/13 17:51 */ @GetResource(name = "清空登录日志", path = "/loginLog/deleteAll") - @BusinessLog + @ApiLog public ResponseData deleteAll() { sysLoginLogService.delAll(); return new SuccessResponseData<>(); diff --git a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java index 3ccfcfd5c..07e2880b7 100644 --- a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java +++ b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java @@ -35,7 +35,7 @@ import cn.stylefeng.roses.kernel.log.api.factory.appender.HttpLogAppender; import cn.stylefeng.roses.kernel.log.api.factory.appender.ParamsLogAppender; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; import cn.stylefeng.roses.kernel.log.requestapi.LogRecordApi; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; @@ -284,10 +284,10 @@ public class RequestApiLogRecordAop implements Ordered { // 获取类上的业务日志开关注解 Class controllerClass = point.getTarget().getClass(); - BusinessLog businessLog = controllerClass.getAnnotation(BusinessLog.class); + ApiLog businessLog = controllerClass.getAnnotation(ApiLog.class); // 获取方法上的业务日志开关注解 - BusinessLog methodBusinessLog = null; + ApiLog methodBusinessLog = null; MethodSignature methodSignature = null; if (!(point.getSignature() instanceof MethodSignature)) { return false; @@ -296,7 +296,7 @@ public class RequestApiLogRecordAop implements Ordered { Object target = point.getTarget(); try { Method currentMethod = target.getClass().getMethod(methodSignature.getName(), methodSignature.getParameterTypes()); - methodBusinessLog = currentMethod.getAnnotation(BusinessLog.class); + methodBusinessLog = currentMethod.getAnnotation(ApiLog.class); } catch (NoSuchMethodException e) { return false; } diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java index 3ea82807a..a671443d4 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java @@ -25,7 +25,7 @@ package cn.stylefeng.roses.kernel.timer.modular.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -67,7 +67,7 @@ public class SysTimersController { * @since 2020/6/30 18:26 */ @PostResource(name = "添加定时任务", path = "/sysTimers/add") - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Valid @Validated(SysTimersParam.add.class) SysTimersParam sysTimersParam) { sysTimersService.add(sysTimersParam); return new SuccessResponseData<>(); @@ -80,7 +80,7 @@ public class SysTimersController { * @since 2020/6/30 18:26 */ @PostResource(name = "删除定时任务", path = "/sysTimers/delete") - @BusinessLog + @ApiLog public ResponseData del(@RequestBody @Validated(SysTimersParam.delete.class) SysTimersParam sysTimersParam) { sysTimersService.del(sysTimersParam); return new SuccessResponseData<>(); @@ -93,7 +93,7 @@ public class SysTimersController { * @since 2020/6/30 18:26 */ @PostResource(name = "编辑定时任务", path = "/sysTimers/edit") - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(SysTimersParam.edit.class) SysTimersParam sysTimersParam) { sysTimersService.edit(sysTimersParam); return new SuccessResponseData<>(); @@ -106,7 +106,7 @@ public class SysTimersController { * @since 2020/7/1 14:34 */ @PostResource(name = "启动定时任务", path = "/sysTimers/start") - @BusinessLog + @ApiLog public ResponseData start(@RequestBody @Validated(SysTimersParam.startTimer.class) SysTimersParam sysTimersParam) { sysTimersService.start(sysTimersParam); return new SuccessResponseData<>(); @@ -119,7 +119,7 @@ public class SysTimersController { * @since 2020/7/1 14:34 */ @PostResource(name = "停止定时任务", path = "/sysTimers/stop") - @BusinessLog + @ApiLog public ResponseData stop(@RequestBody @Validated(SysTimersParam.stopTimer.class) SysTimersParam sysTimersParam) { sysTimersService.stop(sysTimersParam); return new SuccessResponseData<>(); diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerInfoController.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerInfoController.java index 7569f46af..071a546e6 100644 --- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerInfoController.java +++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerInfoController.java @@ -4,7 +4,7 @@ import cn.stylefeng.roses.kernel.customer.api.pojo.CustomerInfo; import cn.stylefeng.roses.kernel.customer.api.pojo.CustomerInfoRequest; import cn.stylefeng.roses.kernel.customer.modular.request.CustomerRequest; import cn.stylefeng.roses.kernel.customer.modular.service.CustomerService; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -49,7 +49,7 @@ public class CustomerInfoController { * @since 2021/6/18 16:29 */ @PostResource(name = "修改个人密码", path = "/customerInfo/updatePassword", requiredPermission = false) - @BusinessLog + @ApiLog public ResponseData updatePassword(@RequestBody @Validated(CustomerInfoRequest.changePassword.class) CustomerInfoRequest customerInfoRequest) { this.customerService.updatePassword(customerInfoRequest); return new SuccessResponseData<>(); @@ -62,7 +62,7 @@ public class CustomerInfoController { * @since 2021/6/18 16:29 */ @PostResource(name = "修改个人头像", path = "/customerInfo/updateAvatar", requiredPermission = false) - @BusinessLog + @ApiLog public ResponseData updateAvatar(@RequestBody @Validated(CustomerInfoRequest.changeAvatar.class) CustomerInfoRequest customerInfoRequest) { this.customerService.updateAvatar(customerInfoRequest); return new SuccessResponseData<>(); @@ -75,7 +75,7 @@ public class CustomerInfoController { * @since 2021/7/20 10:44 */ @PostResource(name = "重置个人秘钥", path = "/customerInfo/resetPersonalSecret", requiredPermission = false) - @BusinessLog + @ApiLog public ResponseData resetPersonalSecret() { String secret = customerService.updateSecret(); return new SuccessResponseData<>(secret); diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerManageController.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerManageController.java index 845202f06..2b41360fa 100644 --- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerManageController.java +++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/controller/CustomerManageController.java @@ -4,7 +4,7 @@ import cn.stylefeng.roses.kernel.customer.modular.entity.Customer; import cn.stylefeng.roses.kernel.customer.modular.request.CustomerRequest; import cn.stylefeng.roses.kernel.customer.modular.service.CustomerService; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -38,7 +38,7 @@ public class CustomerManageController { * @since 2021/06/07 11:40 */ @PostResource(name = "添加", path = "/customer/add") - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Validated(CustomerRequest.add.class) CustomerRequest customerRequest) { customerService.add(customerRequest); return new SuccessResponseData<>(); @@ -51,7 +51,7 @@ public class CustomerManageController { * @since 2021/06/07 11:40 */ @PostResource(name = "删除", path = "/customer/delete") - @BusinessLog + @ApiLog public ResponseData delete(@RequestBody @Validated(CustomerRequest.delete.class) CustomerRequest customerRequest) { customerService.del(customerRequest); return new SuccessResponseData<>(); @@ -64,7 +64,7 @@ public class CustomerManageController { * @since 2021/06/07 11:40 */ @PostResource(name = "编辑", path = "/customer/edit") - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(CustomerRequest.edit.class) CustomerRequest customerRequest) { customerService.edit(customerRequest); return new SuccessResponseData<>(); diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java index 767b3c182..9976de74d 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java @@ -29,7 +29,7 @@ import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; import cn.stylefeng.roses.kernel.dict.modular.pojo.TreeDictInfo; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictRequest; import cn.stylefeng.roses.kernel.dict.modular.service.DictService; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -75,7 +75,7 @@ public class DictController { * @since 2020/10/29 16:35 */ @PostResource(name = "添加字典", path = "/dict/add", requiredPermission = true, requirePermissionCode = DictConstants.ADD_DICT) - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Validated(DictRequest.add.class) DictRequest dictRequest) { this.dictService.add(dictRequest); return new SuccessResponseData<>(); @@ -101,7 +101,7 @@ public class DictController { * @since 2020/10/29 16:35 */ @PostResource(name = "删除字典", path = "/dict/delete", requiredPermission = true, requirePermissionCode = DictConstants.DELETE_DICT) - @BusinessLog + @ApiLog public ResponseData delete(@RequestBody @Validated(DictRequest.delete.class) DictRequest dictRequest) { this.dictService.del(dictRequest); return new SuccessResponseData<>(); @@ -114,7 +114,7 @@ public class DictController { * @since 2020/10/29 16:35 */ @PostResource(name = "修改字典", path = "/dict/edit", requiredPermission = true, requirePermissionCode = DictConstants.EDIT_DICT) - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(DictRequest.edit.class) DictRequest dictRequest) { this.dictService.edit(dictRequest); return new SuccessResponseData<>(); diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java index 5cbe49a46..333e66809 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java @@ -28,7 +28,7 @@ import cn.stylefeng.roses.kernel.dict.api.constants.DictConstants; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest; import cn.stylefeng.roses.kernel.dict.modular.service.DictTypeService; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -62,7 +62,7 @@ public class DictTypeController { * @since 2018/7/25 下午12:36 */ @PostResource(name = "添加字典类型", path = "/dictType/add", requiredPermission = true, requirePermissionCode = DictConstants.ADD_DICT) - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Validated(DictTypeRequest.add.class) DictTypeRequest dictTypeRequest) { this.dictTypeService.add(dictTypeRequest); return new SuccessResponseData<>(); @@ -76,7 +76,7 @@ public class DictTypeController { */ @PostResource(name = "删除字典类型", path = "/dictType/delete", requiredPermission = true, requirePermissionCode = DictConstants.DELETE_DICT) - @BusinessLog + @ApiLog public ResponseData delete(@RequestBody @Validated(DictTypeRequest.delete.class) DictTypeRequest dictTypeRequest) { this.dictTypeService.del(dictTypeRequest); return new SuccessResponseData<>(); @@ -90,7 +90,7 @@ public class DictTypeController { */ @PostResource(name = "修改字典类型", path = "/dictType/edit", requiredPermission = true, requirePermissionCode = DictConstants.EDIT_DICT) - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(DictTypeRequest.edit.class) DictTypeRequest dictTypeRequest) { this.dictTypeService.edit(dictTypeRequest); return new SuccessResponseData<>(); diff --git a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/controller/SysMessageController.java b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/controller/SysMessageController.java index aa02c421f..aa0210017 100644 --- a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/controller/SysMessageController.java +++ b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/controller/SysMessageController.java @@ -31,7 +31,7 @@ import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum; import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageRequest; import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest; import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -69,7 +69,7 @@ public class SysMessageController { * @since 2021/1/8 13:50 */ @PostResource(name = "发送系统消息", path = "/sysMessage/sendMessage") - @BusinessLog + @ApiLog public ResponseData sendMessage(@RequestBody @Validated(MessageSendRequest.add.class) MessageSendRequest messageSendRequest) { messageSendRequest.setMessageSendTime(new Date()); messageApi.sendMessage(messageSendRequest); @@ -83,7 +83,7 @@ public class SysMessageController { * @since 2021/1/8 13:50 */ @PostResource(name = "批量更新系统消息状态", path = "/sysMessage/batchUpdateReadFlag") - @BusinessLog + @ApiLog public ResponseData batchUpdateReadFlag(@RequestBody @Validated(MessageRequest.updateReadFlag.class) MessageRequest messageRequest) { List messageIdList = messageRequest.getMessageIdList(); messageApi.batchReadFlagByMessageIds(StrUtil.join(",", messageIdList), MessageReadFlagEnum.READ); @@ -109,7 +109,7 @@ public class SysMessageController { * @since 2021/1/8 13:50 */ @PostResource(name = "删除系统消息", path = "/sysMessage/delete") - @BusinessLog + @ApiLog public ResponseData delete(@RequestBody @Validated(MessageRequest.delete.class) MessageRequest messageRequest) { messageApi.deleteByMessageId(messageRequest.getMessageId()); return new SuccessResponseData<>(); diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/PersonalInfoController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/PersonalInfoController.java index 9281fe895..5528c4ab2 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/PersonalInfoController.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/PersonalInfoController.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.sys.modular.user.controller; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -48,7 +48,7 @@ public class PersonalInfoController { * @since 2023/6/26 22:24 */ @PostResource(name = "更新个人信息", path = "/personalInfo/updateInfo") - @BusinessLog + @ApiLog public ResponseData updateInfo(@RequestBody @Validated(SysUserRequest.updateInfo.class) SysUserRequest sysUserRequest) { sysUserService.editInfo(sysUserRequest); return new SuccessResponseData<>(); @@ -61,7 +61,7 @@ public class PersonalInfoController { * @since 2023/6/26 22:24 */ @PostResource(name = "修改个人头像", path = "/personalInfo/updateAvatar") - @BusinessLog + @ApiLog public ResponseData updateAvatar(@RequestBody @Validated(SysUserRequest.updateAvatar.class) SysUserRequest sysUserRequest) { sysUserService.editAvatar(sysUserRequest); return new SuccessResponseData<>(); @@ -74,7 +74,7 @@ public class PersonalInfoController { * @since 2023/6/26 22:24 */ @PostResource(name = "修改个人密码", path = "/personalInfo/updatePassword") - @BusinessLog + @ApiLog public ResponseData updatePwd(@RequestBody @Validated(SysUserRequest.updatePwd.class) SysUserRequest sysUserRequest) { sysUserService.editPassword(sysUserRequest); return new SuccessResponseData<>(); diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/controller/SysNoticeController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/controller/SysNoticeController.java index 8c32b1f73..e522ed5ef 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/controller/SysNoticeController.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/controller/SysNoticeController.java @@ -25,7 +25,7 @@ package cn.stylefeng.roses.kernel.sys.modular.notice.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -61,7 +61,7 @@ public class SysNoticeController { * @since 2021/1/9 14:44 */ @PostResource(name = "添加通知管理", path = "/sysNotice/add") - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Validated(SysNoticeRequest.add.class) SysNoticeRequest sysNoticeParam) { sysNoticeService.add(sysNoticeParam); return new SuccessResponseData<>(); @@ -74,7 +74,7 @@ public class SysNoticeController { * @since 2021/1/9 14:54 */ @PostResource(name = "编辑通知管理", path = "/sysNotice/edit") - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(SysNoticeRequest.edit.class) SysNoticeRequest sysNoticeParam) { sysNoticeService.edit(sysNoticeParam); return new SuccessResponseData<>(); @@ -87,7 +87,7 @@ public class SysNoticeController { * @since 2021/1/9 14:54 */ @PostResource(name = "删除通知管理", path = "/sysNotice/delete") - @BusinessLog + @ApiLog public ResponseData delete(@RequestBody @Validated(SysNoticeRequest.delete.class) SysNoticeRequest sysNoticeParam) { sysNoticeService.del(sysNoticeParam); return new SuccessResponseData<>(); diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java index 18e15353a..caf505e53 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeController.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -38,7 +38,7 @@ public class SysThemeController { * @since 2021/12/17 16:43 */ @PostResource(name = "增加系统主题", path = "/sysTheme/add") - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Validated(SysThemeRequest.add.class) SysThemeRequest sysThemeParam) { sysThemeService.add(sysThemeParam); return new SuccessResponseData<>(); @@ -51,7 +51,7 @@ public class SysThemeController { * @since 2021/12/17 16:45 */ @PostResource(name = "删除系统主题", path = "/sysTheme/del") - @BusinessLog + @ApiLog public ResponseData del(@RequestBody @Validated(SysThemeRequest.delete.class) SysThemeRequest sysThemeParam) { sysThemeService.del(sysThemeParam); return new SuccessResponseData<>(); @@ -64,7 +64,7 @@ public class SysThemeController { * @since 2021/12/17 16:50 */ @PostResource(name = "修改系统主题", path = "/sysTheme/edit") - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(SysThemeRequest.edit.class) SysThemeRequest sysThemeParam) { sysThemeService.edit(sysThemeParam); return new SuccessResponseData<>(); @@ -99,7 +99,7 @@ public class SysThemeController { * @since 2021/12/17 17:32 */ @PostResource(name = "修改系统主题启用状态", path = "/sysTheme/updateStatus") - @BusinessLog + @ApiLog public ResponseData updateThemeStatus(@RequestBody @Validated(SysThemeRequest.updateStatus.class) SysThemeRequest sysThemeParam) { sysThemeService.updateThemeStatus(sysThemeParam); return new SuccessResponseData<>(); diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java index 3be49c91c..4f3b42416 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateController.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -40,7 +40,7 @@ public class SysThemeTemplateController { * @since 2021/12/17 14:16 */ @PostResource(name = "增加系统主题模板", path = "/sysThemeTemplate/add") - @BusinessLog + @ApiLog public ResponseData add(@RequestBody @Validated(SysThemeTemplateRequest.add.class) SysThemeTemplateRequest sysThemeTemplateParam) { sysThemeTemplateService.add(sysThemeTemplateParam); return new SuccessResponseData<>(); @@ -53,7 +53,7 @@ public class SysThemeTemplateController { * @since 2021/12/17 14:36 */ @PostResource(name = "编辑系统主题模板", path = "/sysThemeTemplate/edit") - @BusinessLog + @ApiLog public ResponseData edit(@RequestBody @Validated(SysThemeTemplateRequest.edit.class) SysThemeTemplateRequest sysThemeTemplateParam) { sysThemeTemplateService.edit(sysThemeTemplateParam); return new SuccessResponseData<>(); @@ -66,7 +66,7 @@ public class SysThemeTemplateController { * @since 2021/12/17 14:47 */ @PostResource(name = "删除系统主题模板", path = "/sysThemeTemplate/del") - @BusinessLog + @ApiLog public ResponseData del( @RequestBody @Validated(SysThemeTemplateRequest.delete.class) SysThemeTemplateRequest sysThemeTemplateParam) { sysThemeTemplateService.del(sysThemeTemplateParam); @@ -102,7 +102,7 @@ public class SysThemeTemplateController { * @since 2021/12/17 15:09 */ @PostResource(name = "修改系统主题模板状态", path = "/sysThemeTemplate/updateStatus") - @BusinessLog + @ApiLog public ResponseData updateTemplateStatus( @RequestBody @Validated(SysThemeTemplateRequest.updateStatus.class) SysThemeTemplateRequest sysThemeTemplateParam) { sysThemeTemplateService.updateTemplateStatus(sysThemeTemplateParam); diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java index 4cd8899c4..6ab572d67 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateFieldController.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -38,7 +38,7 @@ public class SysThemeTemplateFieldController { * @since 2021/12/17 11:22 */ @PostResource(name = "增加系统主题模板属性", path = "/sysThemeTemplateField/add") - @BusinessLog + @ApiLog public ResponseData add( @RequestBody @Validated(SysThemeTemplateFieldRequest.add.class) SysThemeTemplateFieldRequest sysThemeTemplateFieldParam) { sysThemeTemplateFieldService.add(sysThemeTemplateFieldParam); @@ -52,7 +52,7 @@ public class SysThemeTemplateFieldController { * @since 2021/12/17 11:25 */ @PostResource(name = "删除系统主题模板属性", path = "/sysThemeTemplateField/del") - @BusinessLog + @ApiLog public ResponseData del( @RequestBody @Validated(SysThemeTemplateFieldRequest.delete.class) SysThemeTemplateFieldRequest sysThemeTemplateFieldParam) { sysThemeTemplateFieldService.del(sysThemeTemplateFieldParam); @@ -66,7 +66,7 @@ public class SysThemeTemplateFieldController { * @since 2021/12/17 11:38 */ @PostResource(name = "修改系统模板属性", path = "/sysThemeTemplateField/edit") - @BusinessLog + @ApiLog public ResponseData edit( @RequestBody @Validated(SysThemeTemplateFieldRequest.edit.class) SysThemeTemplateFieldRequest sysThemeTemplateFieldParam) { sysThemeTemplateFieldService.edit(sysThemeTemplateFieldParam); diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java index e1dd6441e..cc52d281d 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/controller/SysThemeTemplateRelController.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.sys.modular.theme.controller; -import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; +import cn.stylefeng.roses.kernel.rule.annotation.ApiLog; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -34,7 +34,7 @@ public class SysThemeTemplateRelController { * @since 2021/12/24 11:17 */ @PostResource(name = "增加系统主题模板属性关系", path = "/sysThemeTemplateRel/add") - @BusinessLog + @ApiLog public ResponseData add( @RequestBody @Validated(SysThemeTemplateRelRequest.add.class) SysThemeTemplateRelRequest sysThemeTemplateParam) { sysThemeTemplateRelService.add(sysThemeTemplateParam); @@ -48,7 +48,7 @@ public class SysThemeTemplateRelController { * @since 2021/12/24 11:23 */ @PostResource(name = "删除系统主题模板属性关系", path = "/sysThemeTemplateRel/del") - @BusinessLog + @ApiLog public ResponseData del(@RequestBody SysThemeTemplateRelRequest sysThemeTemplateRelParam) { sysThemeTemplateRelService.del(sysThemeTemplateRelParam); return new SuccessResponseData<>();