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

ag-basic.yml

@@ -177,7 +177,7 @@ spring:
spring:
  profiles: xmjwlocal
  datasource:
    url: jdbc:mysql://10.95.22.191:3046/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://10.95.22.191:3406/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
  redis:

application.yml

@@ -67,7 +67,7 @@ eureka:
    healthcheck:
      enabled: false #监控检查
    serviceUrl:
      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}

svr-authentication.yml

@@ -222,7 +222,7 @@ testPattern:
spring:
  profiles: xmjwlocal
  datasource:
    url: jdbc:mysql:/10.95.22.191:3046/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql:/10.95.22.191:3406/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
  redis:

svr-internet-hospital.yml

@@ -155,7 +155,9 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
qywx:
  url: 1
  id: 2
---
spring:
  profiles: jwtest
@@ -226,6 +228,9 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
qywx:
  url: 1
  id: 2
---
spring:
  profiles: qytest
@@ -296,6 +301,9 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
qywx:
  url: 1
  id: 2
---
spring:
  profiles: jwprod
@@ -366,7 +374,9 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
qywx:
  url: 1
  id: 2
---
spring:
  profiles: jwOracleTest
@@ -445,7 +455,9 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
qywx:
  url: 1
  id: 2
---
spring:
  profiles: jwOracleProd
@@ -524,6 +536,9 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
qywx:
  url: 1
  id: 2
##==眼科医院 数据库end=======================================================================
@@ -598,7 +613,9 @@ testPattern:
  remote_inner_url: http://172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
qywx:
  url: https://ih.xmheart.com/hlwyy/
  id: xm_xzzx_wx
---
##==厦门卫计委 ===============================================================================
spring:
@@ -670,14 +687,16 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyy/
qywx:
  url: 1
  id: 2
---
##==厦门卫计委 内网===============================================================================
spring:
  profiles: xmjwlocal
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://10.95.22.191:3046/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://10.95.22.191:3406/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
#  elasticsearch:
@@ -740,4 +759,7 @@ es:
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyy/
  url: http://www.xmtyw.cn/wlyy/
qywx:
  url: 2
  id: 1