Merge remote-tracking branch 'origin/master'

pom.xml

@@ -114,11 +114,6 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
-        <!--zipkin-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-        </dependency>
         <!--redis-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -343,6 +338,13 @@
         </dependency>
         <!--poi end-->
 
+        <!-- SkyWalking 对 Logback 的集成 -->
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>apm-toolkit-logback-1.x</artifactId>
+            <version>8.8.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -985,8 +985,9 @@ public class Constant {
     public static final String API_LOG = "/apm/api_log";
     public static final String BASIC_COMMON = "/basic/common";
     public static final String MDM_COMMON = "/mst/common";
-
-
+    public static final String ROLE_DATA = "PR00001";
+    public static final String STD = "STD";
+    public static final String PRO = "PRO";
     /**
      * @author : 洪旭东
      * @desc : 数据种类