Merge branch 'dev' of chenweida/wlyy2.0 into dev

server/svr-yihu-admin-server/src/main/resources/application.yml

@@ -6,11 +6,7 @@ spring:
    name: svr-yihu-admin-server
  data:
    elasticsearch:
      cluster-name: jkzl #es集群的名字
      cluster-nodes: 172.19.103.68:9300  #多个逗号分割
      cluster-nodes-jest:  http://172.19.103.68:9200 #多个逗号分割
      jest:
      uris: ${spring.data.elasticsearch.cluster-nodes-jest}
        discovery-enabled: false #开启嗅探
        conn-timeout: 60 # 连接时间单位是秒
        read-timeout: 60 # 读取时间单位是秒

svr/svr-base/src/main/resources/application.yml

@@ -40,7 +40,7 @@ yihu:
        http: true #默认true
        sql:
          hibernate: true ##默认false
          springJDBC: true ##默认true
          springJDBC: true ##默认false
      server:
        ip: 192.168.131.102
        port: 8082

web-gateway/src/main/resources/application.yml

@@ -60,7 +60,10 @@ hystrix:
ribbon:
  ReadTimeout: 300000
  ConnectTimeout: 5000
#  restclient:
#    enabled: false
#  okhttp:
#    enabled: true
#zuul 默认会代理所有的微服务  路径 /{appliction.name}/**
#zuul:
@@ -85,16 +88,19 @@ ribbon:
yihu:
  admin:
    client:
      advice:
        sql: false
        sql:
          hibernate: false
          springJDBC: false
        http: true
        zuul:
          pre: true
          post: true
          route: false ##目前有bug先改成false
---
spring: