Merge remote-tracking branch 'origin/dev' into dev

ag-zuul.yml

@@ -30,6 +30,10 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8085/
    fastdfs-server:
      path: /file/**
      url: http://172.19.103.52:80/
@@ -47,6 +51,10 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8085/
    fastdfs-server:
      path: /file/**
      url: http://172.19.103.52:80/
@@ -63,6 +71,10 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8085/
    fastdfs-server:
      path: /file/**
      url: http://11.1.2.9:80/
@@ -80,6 +92,10 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8080/
    fastdfs-server:
      path: /file/**
      url: http://10.176.97.5:8888/
@@ -97,6 +113,10 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8080/
    fastdfs-server:
      path: /file/**
      url: http://100.100.1.157:8888/
@@ -114,6 +134,10 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8080/
    fastdfs-server:
      path: /file/**
      url: http://192.168.50.37:8888/

svr-basic.yml

@@ -38,6 +38,7 @@ eip:
jksr-app:
  orgcode: PDY026797
---
spring:
  profiles: dev
@@ -83,7 +84,7 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8085/WSGW/rest
  url: http://172.19.103.73:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
@@ -134,7 +135,7 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8085/WSGW/rest
  url: http://172.19.103.73:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
@@ -186,7 +187,7 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://11.1.2.13:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
@@ -238,7 +239,7 @@ h5:
  handlerId: 50871
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://10.176.97.10:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
@@ -289,7 +290,7 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://100.100.1.162:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
@@ -340,7 +341,7 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://192.168.220.84:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2