From 62b05e48354f9701e9357762d31d8efed31291c8 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 17 Mar 2021 16:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.2=E3=80=91=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-d-auth/auth-sdk/pom.xml | 8 ++++++++ .../stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java | 2 +- .../roses/kernel/log}/api/LoginLogServiceApi.java | 5 +++-- .../kernel/log}/api/pojo/loginlog/SysLoginLogRequest.java | 3 ++- .../log-business-login-log}/README.md | 0 .../log-business-login-log}/pom.xml | 8 ++++---- .../modular/loginlog/constants/LoginLogConstant.java | 0 .../loginlog/controller/SysLoginLogController.java | 2 +- .../system/modular/loginlog/entity/SysLoginLog.java | 0 .../system/modular/loginlog/mapper/SysLoginLogMapper.java | 0 .../modular/loginlog/mapper/mapping/SysLoginLogMapper.xml | 0 .../modular/loginlog/service/SysLoginLogService.java | 2 +- .../loginlog/service/impl/SysLoginLogServiceImpl.java | 4 ++-- .../modular/loginlog/wrapper/SysLoginLogWrapper.java | 0 kernel-d-log/pom.xml | 1 + kernel-s-system/pom.xml | 1 - kernel-s-system/system-spring-boot-starter/pom.xml | 2 +- 17 files changed, 24 insertions(+), 14 deletions(-) rename {kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system => kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log}/api/LoginLogServiceApi.java (89%) rename {kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system => kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log}/api/pojo/loginlog/SysLoginLogRequest.java (94%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/README.md (100%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/pom.xml (91%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java (100%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java (96%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java (100%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java (100%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml (100%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java (93%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java (97%) rename {kernel-s-system/system-business-login-log => kernel-d-log/log-business-login-log}/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java (100%) diff --git a/kernel-d-auth/auth-sdk/pom.xml b/kernel-d-auth/auth-sdk/pom.xml index 748d5d27e..77870e1b4 100644 --- a/kernel-d-auth/auth-sdk/pom.xml +++ b/kernel-d-auth/auth-sdk/pom.xml @@ -24,6 +24,14 @@ 7.0.2 + + + + cn.stylefeng.roses + log-api + 7.0.2 + + diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java index 5a9374fa6..c3197d746 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java @@ -16,10 +16,10 @@ import cn.stylefeng.roses.kernel.jwt.api.context.JwtContext; import cn.stylefeng.roses.kernel.jwt.api.exception.JwtException; import cn.stylefeng.roses.kernel.jwt.api.exception.enums.JwtExceptionEnum; import cn.stylefeng.roses.kernel.jwt.api.pojo.payload.DefaultJwtPayload; +import cn.stylefeng.roses.kernel.log.api.LoginLogServiceApi; import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; import cn.stylefeng.roses.kernel.security.api.CaptchaApi; -import cn.stylefeng.roses.kernel.system.api.LoginLogServiceApi; import cn.stylefeng.roses.kernel.system.api.UserServiceApi; import cn.stylefeng.roses.kernel.system.api.enums.UserStatusEnum; import cn.stylefeng.roses.kernel.system.api.expander.SystemConfigExpander; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/LoginLogServiceApi.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LoginLogServiceApi.java similarity index 89% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/LoginLogServiceApi.java rename to kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LoginLogServiceApi.java index 5d5d7f9fa..fbb264b79 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/LoginLogServiceApi.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LoginLogServiceApi.java @@ -1,6 +1,7 @@ -package cn.stylefeng.roses.kernel.system.api; +package cn.stylefeng.roses.kernel.log.api; -import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; + +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; /** * 登录日志api接口 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/loginlog/SysLoginLogRequest.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogRequest.java similarity index 94% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/loginlog/SysLoginLogRequest.java rename to kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogRequest.java index 3e1e16cc8..8ac630256 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/loginlog/SysLoginLogRequest.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.api.pojo.loginlog; +package cn.stylefeng.roses.kernel.log.api.pojo.loginlog; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; @@ -62,4 +62,5 @@ public class SysLoginLogRequest extends BaseRequest { * 结束时间 */ private String endTime; + } diff --git a/kernel-s-system/system-business-login-log/README.md b/kernel-d-log/log-business-login-log/README.md similarity index 100% rename from kernel-s-system/system-business-login-log/README.md rename to kernel-d-log/log-business-login-log/README.md diff --git a/kernel-s-system/system-business-login-log/pom.xml b/kernel-d-log/log-business-login-log/pom.xml similarity index 91% rename from kernel-s-system/system-business-login-log/pom.xml rename to kernel-d-log/log-business-login-log/pom.xml index 4f0d72f7d..1af619557 100644 --- a/kernel-s-system/system-business-login-log/pom.xml +++ b/kernel-d-log/log-business-login-log/pom.xml @@ -6,21 +6,21 @@ cn.stylefeng.roses - kernel-s-system + kernel-d-log 7.0.2 ../pom.xml - system-business-login-log + log-business-login-log jar - + cn.stylefeng.roses - system-api + log-api 7.0.2 diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java similarity index 100% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java similarity index 96% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java index 1f8c13ae0..ff023d81a 100644 --- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java @@ -1,10 +1,10 @@ package cn.stylefeng.roses.kernel.system.modular.loginlog.controller; +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; 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; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; -import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.system.modular.loginlog.service.SysLoginLogService; import cn.stylefeng.roses.kernel.system.modular.loginlog.wrapper.SysLoginLogWrapper; import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper; diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java similarity index 100% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java similarity index 100% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml similarity index 100% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java similarity index 93% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java index e90df7785..e888e3471 100644 --- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.loginlog.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; -import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java similarity index 97% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java index 3d89714de..cc6bbd8ee 100644 --- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java @@ -6,15 +6,15 @@ import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.log.api.LoginLogServiceApi; +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; -import cn.stylefeng.roses.kernel.system.api.LoginLogServiceApi; import cn.stylefeng.roses.kernel.system.api.exception.enums.log.LogExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.loginlog.constants.LoginLogConstant; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; import cn.stylefeng.roses.kernel.system.modular.loginlog.mapper.SysLoginLogMapper; import cn.stylefeng.roses.kernel.system.modular.loginlog.service.SysLoginLogService; -import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java similarity index 100% rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java rename to kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java diff --git a/kernel-d-log/pom.xml b/kernel-d-log/pom.xml index e98bfb75b..cb500acb4 100644 --- a/kernel-d-log/pom.xml +++ b/kernel-d-log/pom.xml @@ -17,6 +17,7 @@ log-api + log-business-login-log log-business-manage log-business-requestapi log-sdk-db diff --git a/kernel-s-system/pom.xml b/kernel-s-system/pom.xml index 8d3dc5852..7ef30df69 100644 --- a/kernel-s-system/pom.xml +++ b/kernel-s-system/pom.xml @@ -24,7 +24,6 @@ system-business-role system-business-menu system-business-notice - system-business-login-log system-spring-boot-starter diff --git a/kernel-s-system/system-spring-boot-starter/pom.xml b/kernel-s-system/system-spring-boot-starter/pom.xml index 31664f93c..02dd12a07 100644 --- a/kernel-s-system/system-spring-boot-starter/pom.xml +++ b/kernel-s-system/system-spring-boot-starter/pom.xml @@ -75,7 +75,7 @@ cn.stylefeng.roses - system-business-login-log + log-business-login-log 7.0.2