feat(可回溯): 重构

增加feign
2023-05-08 19:24:38 +08:00
parent d1a4b55f5d
commit dbaab0484b
22 changed files with 549 additions and 4 deletions
@@ -56,6 +56,17 @@ public class RecallOrderApiServiceImpl implements RecallOrderApiService {
    @Override
    public ResObj<RecallOrderVO> getRecallOrderByOrderId(String orderId) {
        RecallOrderVO recallOrderVO = recallOrderService.queryRecallOrderById(orderId);
+        if (recallOrderVO != null) {
+            LambdaQueryWrapper<RecallRecordEntity> recordQuery = Wrappers.lambdaQuery();
+            recordQuery.eq(RecallRecordEntity::getTraceId, recallOrderVO.getTraceId());
+            recordQuery.orderByAsc(RecallRecordEntity::getCreateTime);
+            List<RecallRecordEntity> recordList = recallRecordService.getBaseMapper().selectList(recordQuery);
+
+            List<String> events = recordList.stream()
+                    .flatMap(entity -> entity.getEvents().stream())
+                    .collect(Collectors.toList());
+            recallOrderVO.setEvents(events);
+        }
        return ResObj.ok(recallOrderVO);
    }

@@ -38,7 +38,8 @@ public class RecallRecordApiServiceImpl implements RecallRecordApiService {
                .map(recallOrderService::queryRecallOrderByOrderId)
                .map(RecallOrderEntity::getTraceId)
                .orElse(UUID.randomUUID().toString().replace("-", ""));
-
+        log.info(traceId);
+        record.setTraceId(traceId);
        boolean isLastEvent = record.isLast();

        RecallOrderEntity order = Optional.ofNullable(orderId)
@@ -0,0 +1 @@
+# nacos
@@ -0,0 +1,2 @@
+server:
+  port: 9235
@@ -0,0 +1,16 @@
+
+#spring:
+#  jackson:
+#    date-format: yyyy-MM-dd HH:mm:ss
+#    time-zone: GMT+8
+
+mybatis-plus:
+  #MyBaits 别名包扫描路径，通过该属性可以给包中的类注册别名
+  configuration:
+    # 打印控制台
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+spring:
+  freemarker:
+    settings:
+      classic_compatible: true
@@ -0,0 +1,17 @@
+spring:
+  profiles: dev
+  application:
+    name: afis-recall
+  cloud:
+    nacos:
+      config:
+        file-extension: yaml
+        server-addr: 192.168.0.141:8848
+        namespace: ns-car-dev
+      discovery:
+        #Nacos服务注册中心地址
+        server-addr: 192.168.0.141:8848
+        namespace: ns-car-dev
+
+  main:
+    allow-bean-definition-overriding: true
@@ -0,0 +1,51 @@
+spring:
+  profiles: native
+  application:
+    name: afis-recall
+  cloud:
+    nacos:
+      config:
+        file-extension: yaml
+        server-addr: 49.7.225.107:8848
+        namespace: native-test
+      discovery:
+        #Nacos服务注册中心地址
+        server-addr: 49.7.225.107:8848
+        namespace: native-test
+  main:
+    allow-bean-definition-overriding: true
+
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://123.56.82.16:3306/afis-agency?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: rocar
+    password: rocar
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    platform: mysql
+    druid:
+      initial-size: 2
+      max-active: 100
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 5
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+          enabled: true
+        config:
+          enabled: true
+        wall:
+          enabled: true
+        encoding:
+          enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        login-username: admin
+        login-password: admin
@@ -0,0 +1,17 @@
+
+spring:
+  profiles: prod
+  application:
+    name: afis-recall
+  cloud:
+    nacos:
+      config:
+        file-extension: yaml
+        server-addr: 192.168.208.47:18848,192.168.208.48:18848
+        namespace: cs-prd
+      discovery:
+        #Nacos服务注册中心地址
+        server-addr: 192.168.208.47:18848,192.168.208.48:18848
+        namespace: cs-prd
+  main:
+    allow-bean-definition-overriding: true
@@ -0,0 +1,16 @@
+spring:
+  profiles: uat
+  application:
+    name: afis-recall
+  cloud:
+    nacos:
+      config:
+        file-extension: yaml
+        server-addr: 192.168.220.31:8848
+        namespace: tfs-cs-uat
+      discovery:
+        #Nacos服务注册中心地址
+        server-addr: 192.168.220.31:8848
+        namespace: tfs-cs-uat
+  main:
+    allow-bean-definition-overriding: true
@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: native
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <springProperty scope="context" name="LOG_HOME" source="application.log.home" defaultValue="/home/log"/>
+    <springProperty scope="context" name="SERVICE_NAME" source="spring.application.name"/>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{trace_id}] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/${SERVICE_NAME}/${SERVICE_NAME}.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>181</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${PID} %X{trace_id} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>10MB</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${LOG_HOME}/${SERVICE_NAME}/${SERVICE_NAME}.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${PID} %X{trace_id} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${LOG_HOME}/${SERVICE_NAME}/${SERVICE_NAME}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>181</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${LOG_HOME}/${SERVICE_NAME}/${SERVICE_NAME}-warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${PID} %X{trace_id} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/${SERVICE_NAME}/${SERVICE_NAME}-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>181</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${LOG_HOME}/${SERVICE_NAME}/${SERVICE_NAME}-error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${PID} %X{trace_id} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/${SERVICE_NAME}/${SERVICE_NAME}-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>181</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+
+    <property name="email_subject" value="【Error】: %logger - %msg"/>
+
+    <logger name="com.wabestway" additivity="false">
+        <level value="debug"/>
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="com.alibaba" additivity="false">
+        <level value="ERROR"/>
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <!-- 在程序的开发测试阶段，可以调整level的级别，常用级别优先级为： -->
+    <!-- TRACE < DEBUG < INFO < WARN < ERROR  -->
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </root>
+</configuration>