Merge branch 'feature-butt-joint-2024-08-26' into pre_test

egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiCheckIntoServiceImpl.java

@@ -23,7 +23,7 @@ public class ApiCheckIntoServiceImpl {
 
 
     /**
-     * @description:  撞库接口
+     * @description:  助贷撞库接口
      * @param:
      * @return:
      * @author zhangyy

start/src/main/resources/application.yaml

@@ -1,6 +1,6 @@
 #server
 server:
-  port: 890
+  port: 891
   servlet:
     context-path: /
 #spring
@@ -8,7 +8,7 @@ spring:
   application:
     name: eg-server
   profiles:
-    active: dev
+    active: pre
 #mybatis
 mybatis-plus:
   mapper-locations: classpath*:mapper/**/*.xml

start/src/main/resources/logback-spring-dev.xml

@@ -6,6 +6,13 @@
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
     <!-- 控制台输出 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %level %c.%M:%L %X{traceid} - %msg%n</pattern>
+            <charset class="java.nio.charset.Charset">UTF-8</charset>
+        </encoder>
+    </appender>
+
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

start/src/main/resources/logback-spring-pre.xml

@@ -2,7 +2,7 @@
 <configuration>
     <property name="PROJECT_NAME" value="eg-server"/>
     <!-- 日志存放路径 -->
-    <property name="LOG_HOME"  value="/start/log/"/>
+    <property name="LOG_HOME"  value="./start/log/"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
     <!-- 控制台输出 -->
@@ -15,6 +15,14 @@
         </encoder>
     </appender>
 
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %level %c.%M:%L %X{traceid} - %msg%n</pattern>
+            <charset class="java.nio.charset.Charset">UTF-8</charset>
+        </encoder>
+    </appender>
+
+
     <!-- 按照每天生成日志文件   -->
     <appender name="dailyFile"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">