调整配置文件，去掉springbootadmin的无用项

btfboy · Oct 20, 2018 · c7edbdf · c7edbdf
1 parent 6df37b0
commit c7edbdf
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 46 deletions.
diff --git a/auth/authentication-server/src/main/resources/application.yml b/auth/authentication-server/src/main/resources/application.yml
@@ -23,11 +23,15 @@ spring:
     username: ${POSTGRES_USERNAME:postgres}
     password: ${POSTGRES_PASSWORD:postgres}
     driver-class-name: org.postgresql.Driver
-  boot:
-    admin:
-      url: http://${BOOT_ADMIN_HOST:localhost}:${BOOT_ADMIN_PORT:8022}
+
   zipkin:
-    baseUrl: http://localhost:8091
+    enabled: true
+    sender:
+      type: rabbit
+  sleuth:
+    sampler:
+      probability: 1.0
+
   security:
     oauth2:
       jwt:
@@ -48,7 +52,3 @@ management:
     web:
       exposure:
         include: '*'
-
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
diff --git a/auth/authentication-server/src/test/resources/application.yml b/auth/authentication-server/src/test/resources/application.yml
@@ -38,7 +38,3 @@ logging:
   path: logs/
   file:
     max-size: 1GB
-
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
diff --git a/auth/authorization-server/src/main/resources/application.yml b/auth/authorization-server/src/main/resources/application.yml
@@ -23,11 +23,15 @@ spring:
     username: ${POSTGRES_USERNAME:postgres}
     password: ${POSTGRES_PASSWORD:postgres}
     driver-class-name: org.postgresql.Driver
-  boot:
-    admin:
-      url: http://${BOOT_ADMIN_HOST:localhost}:${BOOT_ADMIN_PORT:8022}
+
   zipkin:
-    baseUrl: http://localhost:8091
+    enabled: true
+    sender:
+      type: rabbit
+  sleuth:
+    sampler:
+      probability: 1.0
+  #jwt的密钥
   security:
     oauth2:
       jwt:
@@ -50,6 +54,3 @@ management:
       exposure:
         include: '*'
 
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
diff --git a/auth/authorization-server/src/test/resources/application.yml b/auth/authorization-server/src/test/resources/application.yml
@@ -47,6 +47,3 @@ management:
       exposure:
         include: '*'
 
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
diff --git a/center/eureka/src/main/resources/application.yml b/center/eureka/src/main/resources/application.yml
@@ -14,5 +14,5 @@ spring:
   rabbitmq:
     host: ${RABBIT_MQ_HOST:localhost}
     port: ${RABBIT_MQ_PORT:5672}
-    username: guest
-    password: guest
+    username: ${RABBIT_MQ_USERNAME:guest}
+    password: ${RABBIT_MQ_PASSWORD:guest}
diff --git a/demos/consumer-feign/src/test/resources/application.yml b/demos/consumer-feign/src/test/resources/application.yml
@@ -9,11 +9,7 @@ eureka:
 spring:
   application:
     name: feign-consumer
-  boot:
-    admin:
-      url: http://${BOOT_ADMIN_HOST:localhost}:${BOOT_ADMIN_PORT:8022}
-  zipkin:
-    baseUrl: http://localhost:8091
+
   mvc:
     throw-exception-if-no-handler-found: true
   servlet:

diff --git a/demos/producer/src/main/resources/application.yml b/demos/producer/src/main/resources/application.yml
@@ -57,7 +57,3 @@ management:
     web:
       exposure:
         include: '*'
-
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
diff --git a/demos/producer/src/test/resources/application.yml b/demos/producer/src/test/resources/application.yml
@@ -44,9 +44,4 @@ management:
       exposure:
         include: '*'
 
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-
-
 username: test123
diff --git a/gateway/gateway-web/src/main/resources/application.yml b/gateway/gateway-web/src/main/resources/application.yml
@@ -18,11 +18,17 @@ spring:
     host: ${REDIS_HOST:localhost}
     port: ${REDIS_PORT:6379}
     #password: ${REDIS_PASSWORD:}
+
+  zipkin:
+    enabled: true
+    sender:
+      type: rabbit
   sleuth:
     enabled: true
     http:
       legacy:
         enabled: true
+  #jwt密码
   security:
     oauth2:
       jwt:
@@ -55,7 +61,7 @@ spring:
           args:
             retries: 3
             statuses: BAD_GATEWAY
-
+#网关白名单，无需要签权url
 gate:
   ignore:
     authentication:

diff --git a/gateway/gateway-zuul/src/main/resources/application.yml b/gateway/gateway-zuul/src/main/resources/application.yml
@@ -14,6 +14,11 @@ spring:
     port: ${RABBIT_MQ_PORT:5672}
     username: ${RABBIT_MQ_USERNAME:guest}
     password: ${RABBIT_MQ_PASSWORD:guest}
+
+  zipkin:
+    enabled: true
+    sender:
+      type: rabbit
   sleuth:
     enabled: true
     http:
@@ -41,8 +46,11 @@ feign:
 #      min-request-size: 2048
 
 logging:
+  level:
+    com.springboot.cloud.gateway: debug
   path: logs/
-
+  file:
+    max-size: 1GB
 
 
 

diff --git a/sysadmin/organization/src/main/resources/application.yml b/sysadmin/organization/src/main/resources/application.yml
@@ -26,9 +26,7 @@ spring:
     username: ${POSTGRES_USERNAME:postgres}
     password: ${POSTGRES_PASSWORD:postgres}
     driver-class-name: org.postgresql.Driver
-  boot:
-    admin:
-      url: http://${BOOT_ADMIN_HOST:localhost}:${BOOT_ADMIN_PORT:8022}
+
   zipkin:
     enabled: true
     sender:
@@ -62,6 +60,3 @@ management:
       exposure:
         include: '*'
 
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true