Merge branch 'master' of http://192.168.1.220:10080/Amoy2/wlyy2.0.config

application.yml

@@ -34,6 +34,17 @@ eureka:
    leaseRenewalIntervalInSeconds: 30 ##心跳时间 默认30秒 一般不修改
yihu:
  admin:
    client:
      advice:
        http: true
management:
  security:
    enabled: false
endpoints:
  logfile:
    enabled: true

svr-base.yml

@@ -26,17 +26,21 @@ spring:
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy #springJPA使用驼峰式
#  ejb:
#    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy #springJPA使用驼峰式(hibernate4以下使用)
  physical_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy #springJPA使用驼峰式(hibernate5以上使用)
  implicit_naming_strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
yihu:
  admin:
    client:
      advice:
        sql: true
---
spring:
  profiles: jwdev
  datasource:
    url: jdbc:mysql://172.19.103.77/jw2?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  zipkin:
@@ -46,14 +50,20 @@ spring:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.19.103.77/jw2?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
  zipkin:
    base-url: http://192.168.131.173:${server.svr-logServer-port} #日志追踪的地址
@@ -61,7 +71,12 @@ spring:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwprod
@@ -74,4 +89,11 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082

svr-iot.yml

@@ -73,7 +73,11 @@ hadoop:
  user:
    name: root
yihu:
  admin:
    client:
      advice:
        sql: true
---
spring:
@@ -86,6 +90,13 @@ spring:
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwtest
@@ -96,6 +107,13 @@ spring:
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwprod
@@ -105,3 +123,11 @@ spring:
    password: 123456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082

web-gateway.yml

@@ -22,6 +22,11 @@ server:
#  ribbon:
#    listOfService: http://localhost:10020/,http://localhost:10021/
yihu:
  admin:
    client:
      advice:
        sql: false
---
spring:
@@ -32,6 +37,12 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
@@ -42,6 +53,12 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwprod
@@ -51,4 +68,10 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082