From cef8d8f42fb59224359882f186eae811569cef09 Mon Sep 17 00:00:00 2001
From: zhaowenyuan <zhaowenyuan@163.com>
Date: Fri, 10 May 2024 16:06:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E9=93=BE=E8=B7=AF=E6=90=9E=E5=AE=9A=202.?=
 =?UTF-8?q?=20sentinel=20=E5=AE=9E=E4=BE=8B=E5=8C=96=E6=9C=89=20bug,=20?=
 =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E4=BC=9A=E4=B8=8D=E4=BC=9A=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E7=86=94=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../annotation/EnableOnnFeignClients.java     |  5 ----
 .../feign/interceptor/MdcInterceptor.java     |  3 +++
 .../java/com/chushang/AuthApplication.java    |  2 ++
 .../src/main/resources/logback-nacos.xml      |  2 +-
 .../src/main/resources/logback-nacos.xml      |  4 ++--
 .../java/com/chushang/oss/OssApplication.java |  6 +----
 .../src/main/resources/logback-nacos.xml      |  2 +-
 .../src/main/resources/application.yml        | 24 +++++++++++++++++++
 .../src/main/resources/bootstrap.yml          | 19 ++++++++-------
 9 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 chushang-visual/chushang-sentinel/src/main/resources/application.yml

diff --git a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java
index 481e107..6a9c090 100644
--- a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java
+++ b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java
@@ -14,11 +14,6 @@ package com.chushang.common.feign.annotation;/*
  * limitations under the License.
  */
 
-import com.chushang.common.feign.interceptor.FeignHeaderInterceptor;
-import com.chushang.common.feign.interceptor.MdcInterceptor;
-import com.chushang.common.feign.registrar.MdcFilterRegistrar;
-import com.chushang.common.feign.registrar.TransferFeginFilterRegistrar;
-import com.chushang.common.feign.registrar.TransferFilterRegistrar;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.cloud.openfeign.ChushangFeignClientsRegistrar;
diff --git a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java
index b0776e9..0b0311c 100644
--- a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java
+++ b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java
@@ -8,13 +8,16 @@ package com.chushang.common.feign.interceptor;
 import com.chushang.common.core.constant.CommonConstants;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 
+@Slf4j
 public class MdcInterceptor implements RequestInterceptor {
     public MdcInterceptor() {
     }
 
     public void apply(RequestTemplate template) {
+        log.info("TRACE_ID : -------- {}",  MDC.get(CommonConstants.TRACE_ID));
         template.header(CommonConstants.TRACE_ID, MDC.get(CommonConstants.TRACE_ID));
         template.header(CommonConstants.SPAN, MDC.get(CommonConstants.SPAN));
     }
diff --git a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java
index 9cb0e57..be53c24 100644
--- a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java
+++ b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java
@@ -2,6 +2,7 @@ package com.chushang;
 
 import com.chushang.common.core.enums.AppStartType;
 import com.chushang.common.feign.annotation.EnableOnnFeignClients;
+import com.chushang.common.feign.annotation.EnableTransferFeign;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -21,6 +22,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @EnableOnnFeignClients
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
 @ServletComponentScan
+@EnableTransferFeign
 public class AuthApplication extends SpringBootServletInitializer
 {
     private final static Logger log = LoggerFactory.getLogger(AuthApplication.class);
diff --git a/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml
index 9515ba1..977c569 100644
--- a/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml
+++ b/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml
@@ -18,7 +18,7 @@
 	<property name="log.env" value="${plumelog.env}"/>
 
 	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-}/%X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{traceId:-} / %X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
 	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
 	<conversionRule conversionWord="wex"
diff --git a/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml
index 9515ba1..6495d04 100644
--- a/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml
+++ b/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml
@@ -18,7 +18,7 @@
 	<property name="log.env" value="${plumelog.env}"/>
 
 	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-}/%X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-} / %X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
 	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
 	<conversionRule conversionWord="wex"
@@ -100,7 +100,7 @@
 	<!--	</appender>-->
 
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="info">
+	<root level="debug">
 		<appender-ref ref="console"/>
 		<appender-ref ref="info"/>
 		<appender-ref ref="debug"/>
diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java
index cb90c24..bb29269 100644
--- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java
+++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java
@@ -2,16 +2,12 @@ package com.chushang.oss;
 
 import com.chushang.common.core.enums.AppStartType;
 import com.chushang.common.feign.annotation.EnableOnnFeignClients;
-import com.chushang.common.feign.annotation.EnableTransferFeign;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
-import javax.sql.DataSource;
-
 /**
  * @auther: zhao
  * @date: 2024/4/29 10:50
@@ -19,7 +15,7 @@ import javax.sql.DataSource;
 @EnableDiscoveryClient
 @EnableOnnFeignClients
 @SpringBootApplication
-@EnableTransferFeign
+//@EnableTransferFeign
 public class OssApplication {
 
     private final static Logger log = LoggerFactory.getLogger(OssApplication.class);
diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml
index 9515ba1..977c569 100644
--- a/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml
+++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml
@@ -18,7 +18,7 @@
 	<property name="log.env" value="${plumelog.env}"/>
 
 	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-}/%X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{traceId:-} / %X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
 	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
 	<conversionRule conversionWord="wex"
diff --git a/chushang-visual/chushang-sentinel/src/main/resources/application.yml b/chushang-visual/chushang-sentinel/src/main/resources/application.yml
new file mode 100644
index 0000000..bc69ee0
--- /dev/null
+++ b/chushang-visual/chushang-sentinel/src/main/resources/application.yml
@@ -0,0 +1,24 @@
+#spring settings
+server:
+  servlet:
+    encoding:
+      force: true
+      charset: UTF-8
+      enabled: true
+    session:
+      cookie:
+        name: sentinel_dashboard_cookie
+#  #logging settings
+#logging:
+#  file:
+#    name: ${user.home}/logs/csp/sentinel-dashboard.log
+#  pattern:
+#    file: %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
+#    level: info
+auth:
+  filter:
+    exclude-urls: /,/auth/login,/auth/logout,/registry/machine,/version
+    exclude-url-suffixes: htm,html,js,css,map,ico,ttf,woff,png
+  username: sentinel
+  password: sentinel
+# todo 需要配置mongo 数据源
diff --git a/chushang-visual/chushang-sentinel/src/main/resources/bootstrap.yml b/chushang-visual/chushang-sentinel/src/main/resources/bootstrap.yml
index 8592d45..a99cfa7 100644
--- a/chushang-visual/chushang-sentinel/src/main/resources/bootstrap.yml
+++ b/chushang-visual/chushang-sentinel/src/main/resources/bootstrap.yml
@@ -8,21 +8,24 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      server-addr: ${nacos.host}
+      username: ${nacos.username}
+      password: ${nacos.password}
       discovery:
-        server-addr: ${nacos.host}
+        server-addr: ${spring.cloud.nacos.server-addr}
         namespace: ${nacos.namespace}
         group: ${nacos.group}
+        service: ${spring.application.name}
       config:
+        server-addr: ${spring.cloud.nacos.server-addr}
         namespace: ${spring.cloud.nacos.discovery.namespace}
         group: ${spring.cloud.nacos.discovery.group}
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-        file-extension: yml
+        file-extension: yaml
+        refresh-enabled: true
         shared-configs:
-          - dataId: application-admin-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-            group: COMMON_GROUP
-          - dataId: application-log-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-            group: COMMON_GROUP
-            refresh: true
+          - dataId: application-common.${spring.cloud.nacos.config.file-extension}
+            group: ${nacos.group}
+            refresh: ${spring.cloud.nacos.config.refresh-enabled}
   profiles:
     active: @profiles.active@
 sentinel: