完善日志

authentication/src/main/resources/application-prod.yml

@@ -17,7 +17,6 @@ spring:
       - nacos:mysql
       - nacos:redisson
       - nacos:minio
-      - nacos:logback
 config:
   sso: 0
 

authentication/src/main/resources/logback-spring.xml

@@ -1,43 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-<!--    <appender name="GELF" class="de.siegmar.logbackgelf.GelfUdpAppender">-->
-<!--        &lt;!&ndash; Graylog server 的主机名或 IP 地址 &ndash;&gt;-->
-<!--        <graylogHost>192.168.0.250</graylogHost>-->
-<!--        &lt;!&ndash; Graylog 服务器端口，通常为 12201（UDP）或 12202（TCP） &ndash;&gt;-->
-<!--        <graylogPort>12201</graylogPort>-->
-<!--        &lt;!&ndash; 可选项：指定协议，默认使用 UDP &ndash;&gt;-->
-<!--        <transport>UDP</transport>-->
-<!--        &lt;!&ndash; 发送日志时是否压缩 &ndash;&gt;-->
-<!--        <compress>true</compress>-->
-<!--        &lt;!&ndash; 是否在 GELF 消息中加入时间戳 &ndash;&gt;-->
-<!--        <includeTimestamp>true</includeTimestamp>-->
-<!--        &lt;!&ndash; 日志内容最大字节数 &ndash;&gt;-->
-<!--        <maxMessageSize>32768</maxMessageSize>-->
-<!--        &lt;!&ndash; 设置自定义字段 &ndash;&gt;-->
-<!--        <additionalFields>-->
-<!--        </additionalFields>-->
-<!--    </appender>-->
-
-    <!-- 排除启动日志 -->
-<!--    <logger name="org.springframework.boot" level="WARN" additivity="false">-->
-<!--        <appender-ref ref="STDOUT"/>-->
-<!--    </logger>-->
-
-<!--    <logger name="org.springframework.context" level="WARN" additivity="false">-->
-<!--        <appender-ref ref="STDOUT"/>-->
-<!--    </logger>-->
-
-    <!-- 控制台输出日志，非必须，可以根据需要选择性启用 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.layout.TTLLLayout">
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg  %X{traceId} %X{spanId}%n</pattern>
-        </layout>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg traceId=%X{traceId}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
+        <graylogHost>172.24.144.227</graylogHost>
+        <graylogPort>12201</graylogPort>
+        <includeMdcData>true</includeMdcData>
+        <extractStackTrace>true</extractStackTrace>
     </appender>
 
-    <!-- 输出到控制台 -->
     <root level="INFO">
-<!--        <appender-ref ref="GELF"/>-->
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="GRAYLOG"/>
     </root>
+
 </configuration>

commons/src/main/java/com/jzg/commons/config/OpenTelemetryConfig.java

@@ -0,0 +1,44 @@
+package com.jzg.commons.config;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
+import io.opentelemetry.api.common.Attributes;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class OpenTelemetryConfig {
+
+    @Value("${spring.application.name}")
+    private String serviceName;
+
+    @Bean
+    public OpenTelemetry openTelemetry() {
+        Resource resource = Resource.getDefault()
+                .merge(Resource.create(Attributes.builder()
+                        .put("service.name", serviceName)
+                        .build()));
+
+        // Trace exporter
+        OtlpGrpcSpanExporter spanExporter = OtlpGrpcSpanExporter.builder()
+//                .setEndpoint("http://192.168.5.250:4317")
+                .setEndpoint("http://172.24.144.227:4317")
+                .build();
+
+        // Tracer provider
+        SdkTracerProvider tracerProvider = SdkTracerProvider.builder()
+                .addSpanProcessor(BatchSpanProcessor.builder(spanExporter).build())
+                .setResource(resource)
+                .build();
+
+        // 注册 Trace
+        return OpenTelemetrySdk.builder()
+                .setTracerProvider(tracerProvider)
+                .buildAndRegisterGlobal();
+    }
+}

gateway/src/main/resources/application-prod.yml

@@ -22,7 +22,6 @@ spring:
         group: DEFAULT_GROUP
       discovery:
         namespace: f9ca025f-b5df-47a9-b3f6-15bcbad3ebd3
-
     gateway:
       routes:
         - id: auth_route
@@ -152,3 +151,10 @@ spring:
                   - /partner/rule/**
                   - /partner/**
                   - /purchaseRecord/**
+
+
+  redis:
+    redisson:
+      address: redis://172.24.144.227:6379
+      password: 123456
+      database: 0

gateway/src/main/resources/logback-spring.xml

@@ -0,0 +1,21 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg traceId=%X{traceId}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
+        <graylogHost>172.24.144.227</graylogHost>
+        <graylogPort>12201</graylogPort>
+        <includeMdcData>true</includeMdcData>
+        <extractStackTrace>true</extractStackTrace>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="GRAYLOG"/>
+    </root>
+
+</configuration>

partner/src/main/resources/logback-spring.xml

@@ -1,35 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 定义 Graylog GELF appender -->
-<!--    <appender name="GELF" class="de.siegmar.logbackgelf.GelfUdpAppender">-->
-<!--        &lt;!&ndash; Graylog server 的主机名或 IP 地址 &ndash;&gt;-->
-<!--        <graylogHost>192.168.0.250</graylogHost>-->
-<!--        &lt;!&ndash; Graylog 服务器端口，通常为 12201（UDP）或 12202（TCP） &ndash;&gt;-->
-<!--        <graylogPort>12201</graylogPort>-->
-<!--        &lt;!&ndash; 可选项：指定协议，默认使用 UDP &ndash;&gt;-->
-<!--        <transport>UDP</transport>-->
-<!--        &lt;!&ndash; 发送日志时是否压缩 &ndash;&gt;-->
-<!--        <compress>true</compress>-->
-<!--        &lt;!&ndash; 是否在 GELF 消息中加入时间戳 &ndash;&gt;-->
-<!--        <includeTimestamp>true</includeTimestamp>-->
-<!--        &lt;!&ndash; 日志内容最大字节数 &ndash;&gt;-->
-<!--        <maxMessageSize>32768</maxMessageSize>-->
-<!--        &lt;!&ndash; 设置自定义字段 &ndash;&gt;-->
-<!--        <additionalFields>-->
-<!--        </additionalFields>-->
-<!--    </appender>-->
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg traceId=%X{traceId}%n</pattern>
         </encoder>
     </appender>
 
+    <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
+        <graylogHost>172.24.144.227</graylogHost>
+        <graylogPort>12201</graylogPort>
+        <includeMdcData>true</includeMdcData>
+        <extractStackTrace>true</extractStackTrace>
+    </appender>
 
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="GRAYLOG"/>
     </root>
-<!--    <root name="com.jzg" level="DEBUG">-->
-<!--        <appender-ref ref="GELF"/>-->
-<!--    </root>-->
+
 </configuration>

platform/src/main/resources/application-prod.yml

@@ -17,7 +17,7 @@ spring:
       - nacos:mysql
       - nacos:redisson
       - nacos:minio
-      - nacos:logback
+
 
 
 config:

platform/src/main/resources/logback-spring.xml

@@ -1,35 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 定义 Graylog GELF appender -->
-<!--    <appender name="GELF" class="de.siegmar.logbackgelf.GelfUdpAppender">-->
-<!--        &lt;!&ndash; Graylog server 的主机名或 IP 地址 &ndash;&gt;-->
-<!--        <graylogHost>192.168.0.250</graylogHost>-->
-<!--        &lt;!&ndash; Graylog 服务器端口，通常为 12201（UDP）或 12202（TCP） &ndash;&gt;-->
-<!--        <graylogPort>12201</graylogPort>-->
-<!--        &lt;!&ndash; 可选项：指定协议，默认使用 UDP &ndash;&gt;-->
-<!--        <transport>UDP</transport>-->
-<!--        &lt;!&ndash; 发送日志时是否压缩 &ndash;&gt;-->
-<!--        <compress>true</compress>-->
-<!--        &lt;!&ndash; 是否在 GELF 消息中加入时间戳 &ndash;&gt;-->
-<!--        <includeTimestamp>true</includeTimestamp>-->
-<!--        &lt;!&ndash; 日志内容最大字节数 &ndash;&gt;-->
-<!--        <maxMessageSize>32768</maxMessageSize>-->
-<!--        &lt;!&ndash; 设置自定义字段 &ndash;&gt;-->
-<!--        <additionalFields>-->
-<!--        </additionalFields>-->
-<!--    </appender>-->
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg traceId=%X{traceId}%n</pattern>
         </encoder>
     </appender>
 
+    <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
+        <graylogHost>172.24.144.227</graylogHost>
+        <graylogPort>12201</graylogPort>
+        <includeMdcData>true</includeMdcData>
+        <extractStackTrace>true</extractStackTrace>
+    </appender>
 
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="GRAYLOG"/>
     </root>
-<!--    <root name="com.jzg" level="DEBUG">-->
-<!--        <appender-ref ref="GELF"/>-->
-<!--    </root>-->
+
 </configuration>

tenant/costsorrule/src/main/resources/application-prod.yml

@@ -16,5 +16,4 @@ spring:
       - nacos:redisson
       - nacos:minio
       - nacos:rocketmq
-      - nacos:logback
 

tenant/costsorrule/src/main/resources/logback-spring.xml

@@ -0,0 +1,21 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg traceId=%X{traceId}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
+        <graylogHost>172.24.144.227</graylogHost>
+        <graylogPort>12201</graylogPort>
+        <includeMdcData>true</includeMdcData>
+        <extractStackTrace>true</extractStackTrace>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="GRAYLOG"/>
+    </root>
+
+</configuration>

tenant/insurance/quotation-summary/src/main/resources/application-prod.yaml

@@ -18,7 +18,6 @@ spring:
       - nacos:mongodb
       - nacos:identify
       - nacos:crawler-config
-      - nacos:logback
 
 #百度图片识别API
 baidu:

tenant/insurance/quotation-summary/src/main/resources/logback-spring.xml

@@ -0,0 +1,21 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg traceId=%X{traceId}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
+        <graylogHost>172.24.144.227</graylogHost>
+        <graylogPort>12201</graylogPort>
+        <includeMdcData>true</includeMdcData>
+        <extractStackTrace>true</extractStackTrace>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="GRAYLOG"/>
+    </root>
+
+</configuration>

tenant/organization/src/main/resources/application-prod.yml

@@ -16,7 +16,6 @@ spring:
       - nacos:redisson
       - nacos:minio
       - nacos:rocketmq
-      - nacos:logback
 
 config:
   sso: 1

tenant/organization/src/main/resources/logback-spring.xml

@@ -0,0 +1,21 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg traceId=%X{traceId}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
+        <graylogHost>172.24.144.227</graylogHost>
+        <graylogPort>12201</graylogPort>
+        <includeMdcData>true</includeMdcData>
+        <extractStackTrace>true</extractStackTrace>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="GRAYLOG"/>
+    </root>
+
+</configuration>