From 1c54aee9ca38f0cfe39463a5c0dbd93c9d3b1471 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 17 Jun 2023 21:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97=E7=9A=84=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel-d-log/log-api/pom.xml                     | 16 +++-------------
 .../kernel/log/api/pojo/record/LogRecordDTO.java |  4 ++--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/kernel-d-log/log-api/pom.xml b/kernel-d-log/log-api/pom.xml
index 80aa12982..76666dd17 100644
--- a/kernel-d-log/log-api/pom.xml
+++ b/kernel-d-log/log-api/pom.xml
@@ -17,14 +17,12 @@
 
     <dependencies>
 
-        <!--auth模块的api-->
-        <!--记录日志时候，有可能需要记录当前登录用户id-->
-        <!--如果不要记录当前登录用户id时就不用本模块，所以optional=true-->
+        <!--sys系统模块-->
+        <!--用来获取userId的包装转化-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>auth-api</artifactId>
+            <artifactId>sys-api</artifactId>
             <version>${roses.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <!--参数校验模块-->
@@ -43,14 +41,6 @@
             <version>${roses.version}</version>
         </dependency>
 
-        <!--system api-->
-        <!--用在json响应用户id的转化-->
-        <dependency>
-            <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>system-api</artifactId>
-            <version>${roses.version}</version>
-        </dependency>
-
         <!--web-->
         <!--LogRecordFactory快速创建http类的日志参数会用到-->
         <!--如果不要记录当前请求的http接口信息，就不用本模块，所以optional=true-->
diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java
index 44a42c0cc..a75b210d4 100644
--- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java
+++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java
@@ -26,7 +26,7 @@ package cn.stylefeng.roses.kernel.log.api.pojo.record;
 
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
-import cn.stylefeng.roses.kernel.system.api.format.UserFormatProcess;
+import cn.stylefeng.roses.kernel.sys.api.format.UserNameFormatProcess;
 import lombok.Data;
 
 import java.util.Date;
@@ -102,7 +102,7 @@ public class LogRecordDTO {
      * 如果是http请求，并且用户已经登录，可以带这项
      */
     @ChineseDescription("客户端请求的用户id")
-    @SimpleFieldFormat(processClass = UserFormatProcess.class)
+    @SimpleFieldFormat(processClass = UserNameFormatProcess.class)
     private Long userId;
 
     /**