【7.2.5】移除日志的wrapper

kernel-d-log/log-api/pom.xml

@@ -43,6 +43,14 @@
             <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-->

kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java

@@ -25,6 +25,8 @@
 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 lombok.Data;
 
 import java.util.Date;
@@ -100,6 +102,7 @@ public class LogRecordDTO {
      * 如果是http请求，并且用户已经登录，可以带这项
      */
     @ChineseDescription("客户端请求的用户id")
+    @SimpleFieldFormat(processClass = UserFormatProcess.class)
     private Long userId;
 
     /**

kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/controller/LogManagerController.java

@@ -29,14 +29,12 @@ import cn.stylefeng.roses.kernel.log.api.LogManagerApi;
 import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest;
 import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO;
 import cn.stylefeng.roses.kernel.log.db.service.SysLogService;
-import cn.stylefeng.roses.kernel.log.manage.wrapper.LogInfoWrapper;
 import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog;
 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.scanner.api.annotation.PostResource;
-import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -84,7 +82,6 @@ public class LogManagerController {
      * @date 2021/1/8 17:36
      */
     @GetResource(name = "查询日志列表", path = "/logManager/page")
-    @Wrapper(LogInfoWrapper.class)
     public ResponseData<PageResult<LogRecordDTO>> page(LogManagerRequest logManagerRequest) {
         return new SuccessResponseData<>(logManagerApi.findPage(logManagerRequest));
     }
@@ -109,7 +106,6 @@ public class LogManagerController {
      * @date 2021/1/11 17:36
      */
     @GetResource(name = "查看日志详情", path = "/logManager/detail")
-    @Wrapper(LogInfoWrapper.class)
     public ResponseData<LogRecordDTO> detail(@Validated(LogManagerRequest.detail.class) LogManagerRequest logManagerRequest) {
         return new SuccessResponseData<>(logManagerApi.detail(logManagerRequest));
     }

kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/wrapper/LogInfoWrapper.java

@@ -1,58 +0,0 @@
-/*
- * Copyright [2020-2030] [https://www.stylefeng.cn]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Guns源码头部的版权声明。
- * 3.请保留源码和相关描述文件的项目出处，作者声明等。
- * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns
- * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns
- * 6.若您的项目无法满足以上几点，可申请商业授权
- */
-package cn.stylefeng.roses.kernel.log.manage.wrapper;
-
-import cn.hutool.extra.spring.SpringUtil;
-import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO;
-import cn.stylefeng.roses.kernel.system.api.UserServiceApi;
-import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO;
-import cn.stylefeng.roses.kernel.wrapper.api.BaseWrapper;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 日志结果进行包装
- *
- * @author fengshuonan
- * @date 2021/2/28 10:59
- */
-public class LogInfoWrapper implements BaseWrapper<LogRecordDTO> {
-
-    @Override
-    public Map<String, Object> doWrap(LogRecordDTO beWrappedModel) {
-
-        if (beWrappedModel.getUserId() == null) {
-            return new HashMap<>();
-        }
-        UserServiceApi userServiceApi = SpringUtil.getBean(UserServiceApi.class);
-        SysUserDTO sysUserDTO = userServiceApi.getUserInfoByUserId(beWrappedModel.getUserId());
-
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("realName", sysUserDTO.getRealName());
-        return map;
-    }
-
-}