소스 검색

取消zipkin 通过@environment@指定profiles

Signed-off-by: zhangxiaomu <zhangxiaomu@dongkesoft.com>
zhangxiaomu 2 년 전
부모
커밋
8aa12b4b0d
4개의 변경된 파일12개의 추가작업 그리고 26개의 파일을 삭제
  1. 2 0
      pom.xml
  2. 5 9
      src/main/resources/dev/bootstrap.yml
  3. 2 8
      src/main/resources/st/bootstrap.yml
  4. 3 9
      src/main/resources/test/bootstrap.yml

+ 2 - 0
pom.xml

@@ -92,6 +92,8 @@
                 <includes>
                     <include>**/*</include>
                 </includes>
+                <!-- 启用过滤器,过滤器会解析需要过滤的的资源文件,将其中的变量替换成真实的值 -->
+                <filtering>true</filtering>
             </resource>
             <resource> <!--日志配置文件-->
                 <directory>src/main/resources</directory>

+ 5 - 9
src/main/resources/dev/bootstrap.yml

@@ -3,6 +3,8 @@ server:
 spring:
   application:
     name: bpm-server
+  profiles:
+    active: @environment@
   cloud:
     nacos:
       config:
@@ -58,18 +60,13 @@ spring:
     host: s.dev01.dkiboss.com
     port: 14000
     password: dk
-  zipkin:
-    base-url: http://s.dev01.dkiboss.com:9411/
-    discovery-client-enabled: false
-    sleuth:
-      sampler:
-        probability: 1
+
   servlet:
     multipart:
       max-file-size: 10MB
 
 logback:
-  file: D:\data\DK_MES\${spring.application.name}
+  file: D:\data\DK_MES
 
 feign:
   sentinel:
@@ -87,8 +84,7 @@ mybatis-plus:
   type-aliases-package: com.dk.oauth.dto,com.dk.common.infrastructure.handler #类型转换器包名
   mapper-locations: classpath:/mapper/**/*Mapper.xml,com/hegii/scrm/common/mapper/opinfo/*.xml
 
-mybatis:
-  config-location: classpath:mybatis-config.xml
+
 
 swagger:
   enabled: true

+ 2 - 8
src/main/resources/st/bootstrap.yml

@@ -59,12 +59,7 @@ spring:
     host: s.dev01.dkiboss.com
     port: 14000
     password: dk
-  zipkin:
-    base-url: http://s.dev01.dkiboss.com:9411/
-    discovery-client-enabled: false
-    sleuth:
-      sampler:
-        probability: 1
+
   servlet:
     multipart:
       max-file-size: 10MB
@@ -88,8 +83,7 @@ mybatis-plus:
   type-aliases-package: com.dk.oauth.dto,com.dk.common.infrastructure.handler #类型转换器包名
   mapper-locations: classpath:/mapper/**/*Mapper.xml,com/hegii/scrm/common/mapper/opinfo/*.xml
 
-mybatis:
-  config-location: classpath:mybatis-config.xml
+
 
 swagger:
   enabled: true

+ 3 - 9
src/main/resources/test/bootstrap.yml

@@ -3,6 +3,8 @@ server:
 spring:
   application:
     name: bpm-server
+  profiles:
+    active: @environment@
   cloud:
     nacos:
       config:
@@ -59,12 +61,7 @@ spring:
     host: s.dev01.dkiboss.com
     port: 14000
     password: dk
-  zipkin:
-    base-url: http://s.dev01.dkiboss.com:9411/
-    discovery-client-enabled: false
-    sleuth:
-      sampler:
-        probability: 1
+
   servlet:
     multipart:
       max-file-size: 10MB
@@ -88,9 +85,6 @@ mybatis-plus:
   type-aliases-package: com.dk.oauth.dto,com.dk.common.infrastructure.handler #类型转换器包名
   mapper-locations: classpath:/mapper/**/*Mapper.xml,com/hegii/scrm/common/mapper/opinfo/*.xml
 
-mybatis:
-  config-location: classpath:mybatis-config.xml
-
 swagger:
   enabled: true