From 67298fe97a55ea90d7aae1eafc06c8bc7d43a836 Mon Sep 17 00:00:00 2001
From: lxu75 <liang.xu.4@volvocars.com>
Date: Fri, 13 Dec 2024 11:50:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?AI=E5=88=86=E6=9E=90=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=20add=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap.yml          | 19 +++++
 .../src/main/resources/logback-spring.xml     | 71 +++++++++++++++++++
 .../main/resources/logback-volvo-huawei.xml   | 24 +++++++
 .../src/main/resources/logback.xml            | 48 +++++++++++++
 4 files changed, 162 insertions(+)
 create mode 100644 ai-analytic-center-biz/src/main/resources/bootstrap.yml
 create mode 100644 ai-analytic-center-biz/src/main/resources/logback-spring.xml
 create mode 100644 ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml
 create mode 100644 ai-analytic-center-biz/src/main/resources/logback.xml

diff --git a/ai-analytic-center-biz/src/main/resources/bootstrap.yml b/ai-analytic-center-biz/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..add9764
--- /dev/null
+++ b/ai-analytic-center-biz/src/main/resources/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+  application:
+    name: ai-analytic-center
+  cloud:
+    nacos:
+      discovery:
+        server-addr:
+        namespace:
+      config:
+        server-addr:
+        group:
+        namespace:
+        prefix: ai-analytic-center
+        file-extension: yaml
+        refresh-enabled: true
+# spring.profiles.active: dev
+
+# 多环境，提取环境变量
+# -Dspring.cloud.nacos.config.server-addr=mse-5a9790c0-nacos-ans.mse.aliyuncs.com:8848 -Dspring.cloud.nacos.config.namespace=382ef7f9-0c10-4a83-96ca-e96a1a082fd5 -Dspring.cloud.nacos.config.group=DEFAULT_GROUP
\ No newline at end of file
diff --git a/ai-analytic-center-biz/src/main/resources/logback-spring.xml b/ai-analytic-center-biz/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..ec25c15
--- /dev/null
+++ b/ai-analytic-center-biz/src/main/resources/logback-spring.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds">
+
+    <property resource="bootstrap.yml" />
+    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="v51dk-claim-order-service"/>
+    <!--统一引入apollo中Logback Appender的参数配置-->
+    <springProperty scope="context" name="endPoint" source="spring.log-back.endpoint"/>
+    <springProperty scope="context" name="accessKeyId" source="spring.log-back.accessKeyId"/>
+    <springProperty scope="context" name="accessKeySecret" source="spring.log-back.accessKeySecret"/>
+    <springProperty scope="context" name="project" source="spring.log-back.project"/>
+    <springProperty scope="context" name="logStore" source="spring.log-back.logStore"/>
+
+    <!-- 文件输出格式 -->
+    <property name="PATTERN" value="%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) [${appName}] [%tid] [%level] [%thread] %c#%L | %msg%n" />
+    <!-- Console output -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
+                <Pattern>${PATTERN}</Pattern>
+            </layout>
+        </encoder>
+    </appender>
+
+    <!--阿里云日志服务配置 测试环境-->
+    <!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
+    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
+    <appender name="ALIYUN_DEV" class="com.aliyun.openservices.log.logback.LoghubAppender">
+        <!--必选项-->
+        <!-- 账号及网络配置 -->
+        <endpoint>${endPoint}</endpoint>
+        <accessKeyId>${accessKeyId}</accessKeyId>
+        <accessKeySecret>${accessKeySecret}</accessKeySecret>
+
+        <!-- sls 项目配置 -->
+        <project>${project}</project>
+        <logStore>${logStore}</logStore>
+        <!--必选项 (end)-->
+
+        <!-- 可选项 -->
+        <topic>${appName}-log</topic>
+
+        <!-- 可选项 详见 '参数说明'-->
+        <totalSizeInBytes>104857600</totalSizeInBytes>
+        <maxBlockMs>0</maxBlockMs>
+        <ioThreadCount>8</ioThreadCount>
+        <batchSizeThresholdInBytes>524288</batchSizeThresholdInBytes>
+        <batchCountThreshold>4096</batchCountThreshold>
+        <lingerMs>2000</lingerMs>
+        <retries>10</retries>
+        <baseRetryBackoffMs>100</baseRetryBackoffMs>
+        <maxRetryBackoffMs>50000</maxRetryBackoffMs>
+
+        <!-- 可选项 通过配置 encoder 的 pattern 自定义 log 的格式 -->
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
+                <Pattern>${PATTERN}</Pattern>
+            </layout>
+        </encoder>
+
+        <!-- 可选项 设置 time 字段呈现的格式 -->
+        <timeFormat>yyyy-MM-dd'T'HH:mmZ</timeFormat>
+        <!-- 可选项 设置 time 字段呈现的时区 -->
+        <timeZone>Asia/Shanghai</timeZone>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="ALIYUN_DEV" />
+    </root>
+</configuration>
diff --git a/ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml b/ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml
new file mode 100644
index 0000000..b09cd1f
--- /dev/null
+++ b/ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds">
+    <!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
+    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
+
+    <property resource="bootstrap.yml"/>
+    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="app-default-center"/>
+
+    <!-- 文件输出格式 -->
+    <property name="PATTERN"
+              value="%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) | [${appName}] | gtraceid: %X{apm-gtraceid} | traceid: %X{apm-traceid} | spanId: %X{apm-spanid} | [%level] | [%thread] %c#%L | %msg%n"/>
+    <!-- Console output -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
+        <encoder >
+            <pattern>%red(%d{yyyy-MM-dd HH:mm:ss.SSS}) | [${appName}] | gtraceid: %X{apm-gtraceid} | traceid: %X{apm-traceid} | spanId: %X{apm-spanid} | %-5level | %blue(${PID:-}) --- [%t] %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
diff --git a/ai-analytic-center-biz/src/main/resources/logback.xml b/ai-analytic-center-biz/src/main/resources/logback.xml
new file mode 100644
index 0000000..0f9feb1
--- /dev/null
+++ b/ai-analytic-center-biz/src/main/resources/logback.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="true" scanPeriod="1 seconds">
+
+    <contextName>logback</contextName>
+    <!--    <property name="log.path" value="im-chat-service/data-chat.log"/>-->
+    <!-- 配置文件中配置日志路径以及日志等级 -->
+    <springProperty scope="context" name="logging.path" source="logging.file.path"/>
+    <springProperty scope="context" name="logging.profile" source="spring.profiles.active"/>
+    <springProperty scope="context" name="logging.name" source="spring.application.name"/>
+
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logging.path}/${logging.name}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logging.path}.%d{yyyy-MM-dd}.zip</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <!-- 保存时间 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
+            <FileNamePattern>
+                ${logging.path}/${logging.name}.%d{yyyy-MM-dd}.%i.log
+            </FileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>7</maxHistory>
+            <!--每个文件最多10MB，保留7天的历史记录，但最多500MB-->
+            <totalSizeCap>500MB</totalSizeCap>
+            <!--重启清理日志文件-->
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
+        </rollingPolicy>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file"/>
+    </root>
+
+</configuration>
\ No newline at end of file

From 5fea5447980beeaff9b9730e03085f5d8a48ff84 Mon Sep 17 00:00:00 2001
From: lxu75 <liang.xu.4@volvocars.com>
Date: Fri, 13 Dec 2024 11:55:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?AI=E5=88=86=E6=9E=90=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=20remove=20=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml     | 71 -------------------
 .../main/resources/logback-volvo-huawei.xml   | 24 -------
 .../src/main/resources/logback.xml            | 48 -------------
 3 files changed, 143 deletions(-)
 delete mode 100644 ai-analytic-center-biz/src/main/resources/logback-spring.xml
 delete mode 100644 ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml
 delete mode 100644 ai-analytic-center-biz/src/main/resources/logback.xml

diff --git a/ai-analytic-center-biz/src/main/resources/logback-spring.xml b/ai-analytic-center-biz/src/main/resources/logback-spring.xml
deleted file mode 100644
index ec25c15..0000000
--- a/ai-analytic-center-biz/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds">
-
-    <property resource="bootstrap.yml" />
-    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="v51dk-claim-order-service"/>
-    <!--统一引入apollo中Logback Appender的参数配置-->
-    <springProperty scope="context" name="endPoint" source="spring.log-back.endpoint"/>
-    <springProperty scope="context" name="accessKeyId" source="spring.log-back.accessKeyId"/>
-    <springProperty scope="context" name="accessKeySecret" source="spring.log-back.accessKeySecret"/>
-    <springProperty scope="context" name="project" source="spring.log-back.project"/>
-    <springProperty scope="context" name="logStore" source="spring.log-back.logStore"/>
-
-    <!-- 文件输出格式 -->
-    <property name="PATTERN" value="%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) [${appName}] [%tid] [%level] [%thread] %c#%L | %msg%n" />
-    <!-- Console output -->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${PATTERN}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!--阿里云日志服务配置 测试环境-->
-    <!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
-    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
-    <appender name="ALIYUN_DEV" class="com.aliyun.openservices.log.logback.LoghubAppender">
-        <!--必选项-->
-        <!-- 账号及网络配置 -->
-        <endpoint>${endPoint}</endpoint>
-        <accessKeyId>${accessKeyId}</accessKeyId>
-        <accessKeySecret>${accessKeySecret}</accessKeySecret>
-
-        <!-- sls 项目配置 -->
-        <project>${project}</project>
-        <logStore>${logStore}</logStore>
-        <!--必选项 (end)-->
-
-        <!-- 可选项 -->
-        <topic>${appName}-log</topic>
-
-        <!-- 可选项 详见 '参数说明'-->
-        <totalSizeInBytes>104857600</totalSizeInBytes>
-        <maxBlockMs>0</maxBlockMs>
-        <ioThreadCount>8</ioThreadCount>
-        <batchSizeThresholdInBytes>524288</batchSizeThresholdInBytes>
-        <batchCountThreshold>4096</batchCountThreshold>
-        <lingerMs>2000</lingerMs>
-        <retries>10</retries>
-        <baseRetryBackoffMs>100</baseRetryBackoffMs>
-        <maxRetryBackoffMs>50000</maxRetryBackoffMs>
-
-        <!-- 可选项 通过配置 encoder 的 pattern 自定义 log 的格式 -->
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${PATTERN}</Pattern>
-            </layout>
-        </encoder>
-
-        <!-- 可选项 设置 time 字段呈现的格式 -->
-        <timeFormat>yyyy-MM-dd'T'HH:mmZ</timeFormat>
-        <!-- 可选项 设置 time 字段呈现的时区 -->
-        <timeZone>Asia/Shanghai</timeZone>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="ALIYUN_DEV" />
-    </root>
-</configuration>
diff --git a/ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml b/ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml
deleted file mode 100644
index b09cd1f..0000000
--- a/ai-analytic-center-biz/src/main/resources/logback-volvo-huawei.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds">
-    <!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
-    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
-
-    <property resource="bootstrap.yml"/>
-    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="app-default-center"/>
-
-    <!-- 文件输出格式 -->
-    <property name="PATTERN"
-              value="%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) | [${appName}] | gtraceid: %X{apm-gtraceid} | traceid: %X{apm-traceid} | spanId: %X{apm-spanid} | [%level] | [%thread] %c#%L | %msg%n"/>
-    <!-- Console output -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
-        <encoder >
-            <pattern>%red(%d{yyyy-MM-dd HH:mm:ss.SSS}) | [${appName}] | gtraceid: %X{apm-gtraceid} | traceid: %X{apm-traceid} | spanId: %X{apm-spanid} | %-5level | %blue(${PID:-}) --- [%t] %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>
diff --git a/ai-analytic-center-biz/src/main/resources/logback.xml b/ai-analytic-center-biz/src/main/resources/logback.xml
deleted file mode 100644
index 0f9feb1..0000000
--- a/ai-analytic-center-biz/src/main/resources/logback.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false" scan="true" scanPeriod="1 seconds">
-
-    <contextName>logback</contextName>
-    <!--    <property name="log.path" value="im-chat-service/data-chat.log"/>-->
-    <!-- 配置文件中配置日志路径以及日志等级 -->
-    <springProperty scope="context" name="logging.path" source="logging.file.path"/>
-    <springProperty scope="context" name="logging.profile" source="spring.profiles.active"/>
-    <springProperty scope="context" name="logging.name" source="spring.application.name"/>
-
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logging.path}/${logging.name}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${logging.path}.%d{yyyy-MM-dd}.zip</fileNamePattern>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <!-- 保存时间 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
-            <FileNamePattern>
-                ${logging.path}/${logging.name}.%d{yyyy-MM-dd}.%i.log
-            </FileNamePattern>
-            <maxFileSize>10MB</maxFileSize>
-            <maxHistory>7</maxHistory>
-            <!--每个文件最多10MB，保留7天的历史记录，但最多500MB-->
-            <totalSizeCap>500MB</totalSizeCap>
-            <!--重启清理日志文件-->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-        <appender-ref ref="file"/>
-    </root>
-
-</configuration>
\ No newline at end of file