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

gateway/ag-basic/pom.xml

@@ -12,7 +12,7 @@
    <artifactId>ag-basic</artifactId>
    <version>${project.parent.version}</version>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <dependencies>
        <!-- 支持Tomcat启动 -->
@@ -136,7 +136,7 @@
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmJdbcDriver18</artifactId>
            <version>8.1.1.193</version>
            <version>${version.dmdb}</version>
        </dependency>
        <dependency>
            <groupId>com.dameng</groupId>
@@ -146,7 +146,6 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
            <version>RELEASE</version>
        </dependency>
    </dependencies>

gateway/ag-basic/src/main/resources/application.yml

@@ -7,7 +7,6 @@ server:
spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    max-active: 100
    max-idle: 100 #最大空闲连接
    min-idle: 10 #最小空闲连接
@@ -415,14 +414,15 @@ spring:
---
spring:
  profiles: native
  profiles: qsyyProd
  datasource:
    url: jdbc:mysql://59.61.92.90:8079/query-base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: xilari
    password: '&}H89@a7&AspSq@'
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236?schema=base
    username: SYSDBA
    password: SYSDBA
  redis:
    host: 59.61.92.90
    port: 9054
    password: o!a1#B74&m
    host: 172.26.0.253
    port: 6390
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: https://www.xmtyw.cn/
  fastdfs_file_url: http://192.168.101.2:80/

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -10,10 +10,6 @@ spring:
#发现服务
eureka:
  client:
    register-with-eureka: false
    fetch-registry: true
    healthcheck:
      enabled: false #监控检查
    serviceUrl:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
  instance:
@@ -34,24 +30,20 @@ spring:
---
spring:
  profiles: jwtest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy-spring.config.label:jwdev}
  main:
    allow-bean-definition-overriding: true
  config:
    activate:
      on-profile: jwtest
---
spring:
  profiles: iottest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.109:1221}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: iottest
  main:
    allow-bean-definition-overriding: true
---
@@ -291,4 +283,12 @@ spring:
      label: ${wlyy-spring.config.label:master}
  config:
    activate:
      on-profile: mlwTest
      on-profile: mlwTest
---
spring:
  profiles: qsyyProd
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.184:1221}
      label: ${wlyy-spring.config.label:master}

server/svr-authentication/pom.xml

@@ -208,7 +208,7 @@
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmJdbcDriver18</artifactId>
            <version>8.1.1.193</version>
            <version>${version.dmdb}</version>
        </dependency>
        <dependency>
            <groupId>com.dameng</groupId>

server/svr-authentication/src/main/resources/application.yml

@@ -835,15 +835,21 @@ kick:
---
spring:
  profiles: native
  profiles: qsyyProd
  datasource:
    url: jdbc:mysql://59.61.92.90:8079/query-base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: xilari
    password: '&}H89@a7&AspSq@'
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236?schema=base
    username: SYSDBA
    password: SYSDBA
  jpa:
    properties:
      hibernate:
        dialect: org.hibernate.dialect.DmDialect
      show_sql: true
  redis:
    host: 59.61.92.90
    port: 9054
    password: o!a1#B74&m
    host: 172.26.0.253 # Redis server host.
    port: 6390 # Redis server port.
    password: Kb6wKDQP1W4
## i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:

server/svr-authentication/src/main/resources/bootstrap.yml

@@ -213,13 +213,11 @@ spring:
---
spring:
  profiles: qsyyProd
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:master}
  config:
    activate:
      on-profile: native
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
---
spring:

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -301,6 +301,21 @@ spring:
spring:
  profiles: mlwTest
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0.config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
---
spring:
  profiles: qsyyProd
  ##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败

svr/svr-base/pom.xml

@@ -235,6 +235,17 @@
            <artifactId>ojdbc6</artifactId>
            <version>${version.oracle}</version>
        </dependency>
        <!--  添加dm8 jdbc jar 包依赖-->
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmJdbcDriver18</artifactId>
            <version>${version.dmdb}</version>
        </dependency>
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmDialect-for-hibernate5.6</artifactId>
            <version>8.1.3.62</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-pool2</artifactId>

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

@@ -10,7 +10,6 @@ express:
spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    max-active: 50
    max-idle: 50 #最大空闲连接
    min-idle: 10 #最小空闲连接
@@ -1165,13 +1164,20 @@ testPattern:
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: 1
---
spring:
  profiles: native
  profiles: qsyyProd
  datasource:
    url: jdbc:mysql://59.61.92.90:8079/query-base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: xilari
    password: '&}H89@a7&AspSq@'
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: SYSDBA
    password: SYSDBA
  jpa:
    properties:
      hibernate:
        dialect: org.hibernate.dialect.DmDialect
      show_sql: true
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -1185,9 +1191,9 @@ spring:
    user: admin
    password: admin
  redis:
    host: 59.61.92.90
    port: 9054
    password: o!a1#B74&m
    host: 172.26.0.253 # Redis server host.
    port: 6390
    password: Kb6wKDQP1W4 # Redis server port.
#basedb: #base数据基础数据数据源，用于跨库查询
#  name: base

svr/svr-internet-hospital-entrance/pom.xml

@@ -175,7 +175,7 @@
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmJdbcDriver18</artifactId>
            <version>8.1.1.193</version>
            <version>${version.dmdb}</version>
        </dependency>
        <dependency>
            <groupId>com.dameng</groupId>

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -668,7 +668,7 @@ spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:dm://172.26.0.183:5236?schema=base
    username: SYSDBA
    password: SYSDBA
  jpa:

svr/svr-internet-hospital-job/pom.xml

@@ -164,6 +164,17 @@
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
        </dependency>
        <!--  添加dm8 jdbc jar 包依赖-->
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmJdbcDriver18</artifactId>
            <version>${version.dmdb}</version>
        </dependency>
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmDialect-for-hibernate5.6</artifactId>
            <version>8.1.3.62</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>

svr/svr-internet-hospital-job/src/main/resources/application.yml

@@ -631,5 +631,50 @@ express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: JKZL
  sf_check_word: QkeIfIvQdheqIv2cVSgAUnBU29lfNbVk
jobs:
  schedule: 0 */1 * * * ?
---
spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236?schema=base
    username: SYSDBA
    password: SYSDBA
  jpa:
    properties:
      hibernate:
        dialect: org.hibernate.dialect.DmDialect
      show_sql: true
hlwyyEntrance:
  url: http://localhost:10023
demo:
  flag: true
pay:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://172.26.0.153:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: https://www.xmtyw.cn/wlyytest/
wechat:
  id: xm_zjxl_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  ids: xm_zjxl_wx
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: JKZL
  sf_check_word: QkeIfIvQdheqIv2cVSgAUnBU29lfNbVk
jobs:
  schedule: 0 */1 * * * ?

svr/svr-internet-hospital/pom.xml

@@ -275,7 +275,7 @@
        <dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmJdbcDriver18</artifactId>
            <version>8.1.1.193</version>
            <version>${version.dmdb}</version>
        </dependency>
        <dependency>
            <groupId>com.dameng</groupId>

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -1561,7 +1561,7 @@ spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:dm://172.26.0.183:5236?schema=base
    username: SYSDBA
    password: SYSDBA
  jpa:

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -160,4 +160,4 @@ spring:
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.26.0.153:1221}
      label: ${wlyy.spring.config.label:dev}
      label: ${wlyy.spring.config.label:master}

wlyy-parent-pom/pom.xml

@@ -140,6 +140,7 @@
        <version.cat>2.0.0</version.cat>
        <version.feign-okhttp>9.3.1</version.feign-okhttp>
        <version.oracle>11.2.0.3</version.oracle>
        <version.dmdb>8.1.2.192</version.dmdb>
        <version.jpinyin>1.1.8</version.jpinyin>
        <version.jave-ffmpegjave>1.0.4</version.jave-ffmpegjave>
        <version.ylz-onepay>20190425</version.ylz-onepay>