modify project name & devops config

Dockerfile

@@ -1,3 +1,3 @@
 FROM harbor.axzo.cn/images_base/jdk1.8-fc:v1
-COPY axzo-log-server/target/axzo-log-server.jar ./xlog.jar
+COPY axzo-log-server/target/axzo-log-server.jar ./axzo-log-server.jar
 ENTRYPOINT  [{ENTRYPOINT}]

axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java

@@ -18,7 +18,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
  * @description: TODO
  * @date: 2022/9/16
  */
-@FeignClient(name = "xlog", url = "http://xlog:8080", fallbackFactory = XLogApiFallback.class)
+@FeignClient(name = "log-plat", url = "http://log-plat:8080", fallbackFactory = XLogApiFallback.class)
 public interface XLogApi {
 
     @PostMapping(value = "/api/operateLog/create", consumes = APPLICATION_JSON_VALUE)

axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java

@@ -1,5 +1,6 @@
 package cn.axzo.log.platform.server.controller.api;
 
+import cn.axzo.log.platform.server.dto.OperateLogQueryDetailRespDTO;
 import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO;
 import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO;
 import cn.axzo.log.platform.server.dto.OperateLogReqDTO;
@@ -39,7 +40,8 @@ public class OperateLogController {
 
     @RequestMapping(value = "/operateLog/create", method = RequestMethod.POST)
     @ApiOperation(value = "操作日志创建")
-    public CommonResponse<Boolean> operateLogCreate(@RequestBody @Valid OperateLogReqDTO req, BindingResult bindingResult) {
+    public CommonResponse<Boolean> operateLogCreate(@RequestBody @Valid OperateLogReqDTO req,
+                                                    BindingResult bindingResult) {
         //参数缺失等返回
         if (bindingResult.hasErrors()) {
             return CommonResponse.fail(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -60,17 +62,30 @@ public class OperateLogController {
         if (bindingResult.hasErrors()) {
             return CommonResponse.fail(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        //时间跨度校验
+        //时间跨度校验。
         if (DateUtil.betweenDay(req.getStartTime(), req.getEndTime(), true) > 7) {
             logger.error("start and end date interval greater than 7.");
             return CommonResponse.fail("the time span is greater than 7");
         }
         try {
-            CommonPageResponse<OperateLogQueryRespDTO> resp = operateLogService.queryForPageFromEs(req);
+            CommonPageResponse<OperateLogQueryRespDTO> resp = operateLogService.queryForPage(req);
             return CommonResponse.success(resp);
         } catch (Exception e) {
             logger.error("query operate logs failed,", e);
             return CommonResponse.fail(e.getMessage());
         }
     }
+
+
+    @RequestMapping(value = "/operateLog/queryDetail", method = RequestMethod.GET)
+    @ApiOperation(value = "操作日志详情查询")
+    public CommonResponse<OperateLogQueryDetailRespDTO> operateLogDetail(Long id) {
+        try {
+            OperateLogQueryDetailRespDTO detail = operateLogService.queryOperateLogDetail(id);
+            return CommonResponse.success(detail);
+        } catch (Exception e) {
+            return CommonResponse.fail(e.getMessage());
+        }
+
+    }
 }

axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryDetailRespDTO.java

@@ -0,0 +1,10 @@
+package cn.axzo.log.platform.server.dto;
+
+/***
+ * @author: pepsi
+ * @description: 操作日志详情返回
+ * @date: 2022/10/8
+ */
+public class OperateLogQueryDetailRespDTO {
+    
+}

axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java

@@ -14,6 +14,12 @@ import java.util.Date;
 @Data
 public class OperateLogQueryRespDTO {
 
+    /**
+     * 记录ID
+     */
+    @ApiModelProperty(value = "ID", position = 0)
+    private int id;
+
     /**
      * 操作人
      */

axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Setter
 @ToString
 @EqualsAndHashCode(callSuper = true)
-@TableName("unified_log_record")
+@TableName("log_record")
 public class OperateLogRecordEntity extends BaseEntity<OperateLogRecordEntity> {
     /**
      * 调用方服务名

axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java

@@ -1,5 +1,6 @@
 package cn.axzo.log.platform.server.service;
 
+import cn.axzo.log.platform.server.dto.OperateLogQueryDetailRespDTO;
 import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO;
 import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO;
 import cn.axzo.log.platform.server.dto.OperateLogReqDTO;
@@ -24,7 +25,7 @@ public interface OperateLogService {
      * @param req
      * @return
      */
-    CommonPageResponse<OperateLogQueryRespDTO> queryForPage(OperateLogQueryReqDTO req);
+    CommonPageResponse<OperateLogQueryRespDTO> queryForPage(OperateLogQueryReqDTO req) throws Exception;
 
     /**
      * query from es
@@ -34,4 +35,12 @@ public interface OperateLogService {
      * @throws Exception
      */
     CommonPageResponse<OperateLogQueryRespDTO> queryForPageFromEs(OperateLogQueryReqDTO req) throws Exception;
+
+    /**
+     * 查询每个日志的详情
+     *
+     * @param id
+     * @return
+     */
+    OperateLogQueryDetailRespDTO queryOperateLogDetail(Long id);
 }

axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java

@@ -8,6 +8,7 @@ import cn.axzo.basics.organizational.api.OrganizationalUnitApi;
 import cn.axzo.basics.organizational.api.vo.response.OrganizationalUnitVO;
 import cn.axzo.basics.profiles.api.UserProfileServiceApi;
 import cn.axzo.basics.profiles.dto.basic.IdentityProfileDto;
+import cn.axzo.log.platform.server.dto.OperateLogQueryDetailRespDTO;
 import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO;
 import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO;
 import cn.axzo.log.platform.server.dto.OperateLogReqDTO;
@@ -110,9 +111,8 @@ public class OperateLogServiceImpl extends BaseEsService implements OperateLogSe
     }
 
     private OperateLogRecordEntity fieldFill(OperateLogReqDTO req) {
-        //补充 termimnal identityType featureName
+        //补充 termimnal identityType featureName.
         OperateLogRecordEntity unifiedLogRecord = operateLogConverter.toEntity(req);
-
         // 通过接口调用，获取用户手机姓名
         IdentityProfileDto identityProfile = qryIdentityProfile(req.getIdentityId(), req.getIdentityType());
         if (identityProfile != null && identityProfile.getPersonProfile() != null) {
@@ -128,8 +128,11 @@ public class OperateLogServiceImpl extends BaseEsService implements OperateLogSe
     }
 
     @Override
-    public CommonPageResponse<OperateLogQueryRespDTO> queryForPage(OperateLogQueryReqDTO req) {
+    public CommonPageResponse<OperateLogQueryRespDTO> queryForPage(OperateLogQueryReqDTO req) throws Exception {
-        //todo 转 entity 对象
+        //这里做个区分。时从ES查询获取还是从DB获取.
+        if (esStorageFlag) {
+            return queryForPageFromEs(req);
+        }
         IPage<OperateLogRecordEntity> page = operateLogRepository.pageLogRecord(req);
         //为空则返回空
         List<OperateLogRecordEntity> recordList = page.getRecords();
@@ -172,6 +175,12 @@ public class OperateLogServiceImpl extends BaseEsService implements OperateLogSe
         return CommonPageResponse.list(req.getPage(), req.getPageSize(), hits.getTotalHits().value, respList);
     }
 
+    @Override
+    public OperateLogQueryDetailRespDTO queryOperateLogDetail(Long id) {
+        //todo
+        return null;
+    }
+
     /***
      * 获取2个时间段之间的索引。startTime + 7 < endTime 即可。
      * @param startDate

axzo-log-server/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: xlog
+    name: axzo-log-plat
   cloud:
     nacos:
       config:

axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java

@@ -73,7 +73,7 @@ public class OperateLogServiceTest extends XlogApplicationTestBase {
     }
 
     @Test
-    public void testPageQuery() {
+    public void testPageQuery() throws Exception {
         OperateLogQueryReqDTO req = new OperateLogQueryReqDTO();
         req.setPage(1L);
         req.setPageSize(3L);