【7.0.2】迁移登录日志模块

kernel-d-auth/auth-sdk/pom.xml

@@ -24,6 +24,14 @@
             <version>7.0.2</version>
         </dependency>
 
+        <!--日志记录模块的api-->
+        <!--记录登录日志用-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>log-api</artifactId>
+            <version>7.0.2</version>
+        </dependency>
+
         <!--资源模块的api-->
         <!--权限校验等功能，需要用到资源模块的接口-->
         <dependency>

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;

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接口

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;
+
 }

kernel-d-log/log-business-login-log/pom.xml

@@ -6,21 +6,21 @@
 
     <parent>
         <groupId>cn.stylefeng.roses</groupId>
-        <artifactId>kernel-s-system</artifactId>
+        <artifactId>kernel-d-log</artifactId>
         <version>7.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>system-business-login-log</artifactId>
+    <artifactId>log-business-login-log</artifactId>
 
     <packaging>jar</packaging>
 
     <dependencies>
 
-        <!--系统管理的api-->
+        <!--日志管理的api-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>system-api</artifactId>
+            <artifactId>log-api</artifactId>
             <version>7.0.2</version>
         </dependency>
 

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;

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;
 
 /**

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;

kernel-d-log/pom.xml

@@ -17,6 +17,7 @@
 
     <modules>
         <module>log-api</module>
+        <module>log-business-login-log</module>
         <module>log-business-manage</module>
         <module>log-business-requestapi</module>
         <module>log-sdk-db</module>

kernel-s-system/pom.xml

@@ -24,7 +24,6 @@
         <module>system-business-role</module>
         <module>system-business-menu</module>
         <module>system-business-notice</module>
-        <module>system-business-login-log</module>
         <module>system-spring-boot-starter</module>
     </modules>
 

kernel-s-system/system-spring-boot-starter/pom.xml

@@ -75,7 +75,7 @@
         <!--登录日志的业务-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>system-business-login-log</artifactId>
+            <artifactId>log-business-login-log</artifactId>
             <version>7.0.2</version>
         </dependency>