Merge branch 'master' of https://gitee.ltd/pig/pigx

pigx-config/src/main/resources/config/application-dev.yml

@@ -6,11 +6,11 @@ jasypt:
 spring:
   redis:
     password:
-    host: pigx-redis
+    host: ${REDIS-HOST:pigx-redis}
   # zipkin
   zipkin:
     enabled: true
-    base-url: http://pigx-zipkin
+    base-url: http://${ZIPKIN-HOST:pigx-zipkin}
   sleuth:
     web:
       client:
@@ -75,7 +75,7 @@ mybatis-plus:
 
 #swagger公共信息
 swagger:
-  host: pigx-gateway:9999
+  host: ${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999}
   title: PigX Swagger API
   description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架
   version: @project.version@
@@ -93,7 +93,7 @@ swagger:
       - scope: server
         description: server all
     token-url-list:
-      - http://pigx-gateway:9999/auth/oauth/token
+      - http://${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999}/auth/oauth/token
 
 ## spring security 配置
 security:
@@ -105,4 +105,4 @@ security:
         - /v2/api-docs
     resource:
       loadBalanced: true
-      token-info-uri: http://pigx-auth/oauth/check_token
+      token-info-uri: http://${AUTH-HOST:pigx-auth}/oauth/check_token