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

# Conflicts:
#	gateway/ag-basic/src/main/resources/application.yml

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/methlog/BaseLoginLogDao.java

@@ -1,9 +1,9 @@
package com.yihu.jw.gateway.methlog;
import com.yihu.jw.entity.base.login.BaseLoginLogDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/methlog/BaseMethodLogDao.java

@@ -1,7 +1,7 @@
package com.yihu.jw.gateway.methlog;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2020/2/19.

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/methlog/WlyyHospitalSysDictDao.java

@@ -3,7 +3,6 @@ package com.yihu.jw.gateway.methlog;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface WlyyHospitalSysDictDao extends JpaRepository<WlyyHospitalSysDictDO, String>, JpaSpecificationExecutor<WlyyHospitalSysDictDO> {
}

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

@@ -7,7 +7,7 @@ server:
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    driver-class-name: com.mysql.cj.jdbc.Driver
    max-active: 100
    max-idle: 100 #最大空闲连接
    min-idle: 10 #最小空闲连接
@@ -136,7 +136,7 @@ security:
#spring:
#  profiles: jwdev
#  datasource:
#    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    url: jdbc:mysql://172.26.0.114/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    username: root
#    password: jkzlehr
#  redis:
@@ -148,33 +148,35 @@ security:
#
---
spring:
  config:
    activate:
      on-profile: jwtest
  datasource:
     url: jdbc:mysql://172.26.0.104/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: jkzlehr
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379
  config:
    activate:
      on-profile: jwtest # Redis server port.
    port: 6379 # Redis server port.
---
spring:
  config:
    activate:
      on-profile: iottest
  datasource:
     url: jdbc:mysql://172.26.0.104/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://172.26.0.104/iot-base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: jkzlehr
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379
  config:
    activate:
      on-profile: iottest # Redis server port.
    port: 6379 # Redis server port.
---
spring:
  profiles: iotyanshi
  config:
    activate:
      on-profile: iotyanshi
  datasource:
     url: jdbc:mysql://172.26.0.195/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://172.26.0.195/iot-base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: jkzlehr
  redis:
@@ -184,7 +186,7 @@ spring:
#spring:
#  profiles: jwprod
#  datasource:
#    url: jdbc:mysql://172.16.1.42/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    url: jdbc:mysql://172.16.1.42/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    username: im
#    password: 2oEq3Kf7
#  redis:
@@ -197,7 +199,7 @@ spring:
#spring:
#  profiles: jwOracleProd
#  datasource:
#    url: jdbc:mysql://172.16.1.42/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    url: jdbc:mysql://172.16.1.42/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    username: im
#    password: 2oEq3Kf7
#  redis:
@@ -212,7 +214,7 @@ spring:
#spring:
#  profiles: xzprod_in
#  datasource:
#    url: jdbc:mysql://192.168.103.155:7306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    url: jdbc:mysql://192.168.103.155:7306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    username: jkzl
#    password: jkzl@2020
#  redis:
@@ -225,7 +227,7 @@ spring:
#spring:
#  profiles: xzprod
#  datasource:
#    url: jdbc:mysql://172.16.100.240:7306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    url: jdbc:mysql://172.16.100.240:7306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
#    username: jkzl
#    password: jkzl@2020
#  redis:
@@ -235,220 +237,193 @@ spring:
---
## 卫计委配置
spring:
  config:
    activate:
      on-profile: xmjwprod
  datasource:
    url: jdbc:mysql://59.61.92.90:9409/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://59.61.92.90:9409/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
  redis:
    host: 59.61.92.90 # Redis server host.
    port: 9054  # Redis server port.
    password: jkzlehr
  config:
    activate:
      on-profile: xmjwprod
---
spring:
  config:
    activate:
      on-profile: iotprod
  datasource:
     url: jdbc:mysql://10.90.32.3:20002/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://10.90.32.3:20002/iot-base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy_new
     password: '@TaVAj%LEK@vB2J4&y9sk@TaVAj%LEK'
  redis:
     host: 59.61.92.90 # Redis server host.
     port: 9054  # Redis server port.
     password: o!a1#B74&m
  config:
    activate:
      on-profile: iotprod
---
spring:
  config:
    activate:
      on-profile: iotprodIn
  datasource:
    url: jdbc:mysql://10.95.22.143:3306/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://10.95.22.143:3306/iot-base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy_new
    password: '@TaVAj%LEK@vB2J4&y9sk@TaVAj%LEK'
  redis:
    host: 10.95.22.142 # Redis server host.
    port: 6380  # Redis server port.
    password: o!a1#B74&m
  config:
    activate:
      on-profile: iotprodIn
---
spring:
  config:
    activate:
      on-profile: jwystest
  datasource:
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://172.26.0.104/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  redis:
    host: 172.26.0.190 # Redis server host.
    port: 6379
  config:
    activate:
      on-profile: jwystest # Redis server port.
    port: 6379 # Redis server port.
---
spring:
  config:
    activate:
      on-profile: tnJwprod
  datasource:
     url: jdbc:mysql://10.9.1.247:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://10.9.1.247:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: qY#j2n5O
  redis:
     host: 10.9.1.247 # Redis server host.
     port: 6380  # Redis server port.
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: tnJwprod
---
spring:
  config:
    activate:
      on-profile: hzprod
  datasource:
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: '0XxS3W*!cRj'
  redis:
    host: 10.18.43.40 # Redis server host.
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: hzprod
---
spring:
  config:
    activate:
      on-profile: wjwProd
  datasource:
     url: jdbc:mysql://127.0.0.1:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://127.0.0.1:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: 0XxS3W*!cRj
  redis:
     host: 127.0.0.1 # Redis server host.
     port: 6380  # Redis server port.
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: wjwProd
---
spring:
  config:
    activate:
      on-profile: dsyy
  datasource:
     url: jdbc:mysql://127.0.0.1:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://127.0.0.1:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: 2oEq3Kf7@zjxl
  redis:
    host: 127.0.0.1 # Redis server host.
    port: 6380
  config:
    activate:
      on-profile: dsyy # Redis server port.
    port: 6380 # Redis server port.
---
spring:
  config:
    activate:
      on-profile: hcyyProd
  datasource:
     url: jdbc:mysql://192.168.120.103:6001/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://192.168.120.103:6001/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: 2oEq3Kf7@zjxl
  redis:
    host: 192.168.120.103 # Redis server host.
    port: 6007 # Redis server port.
    password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: hcyyProd
---
spring:
  config:
    activate:
      on-profile: jwZnyg
  datasource:
     url: jdbc:mysql://172.26.0.222:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://172.26.0.222:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: jkzlehr
  redis:
    host: 172.26.0.222 # Redis server host.
    port: 6379 # Redis server port.
    password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: jwZnyg
---
spring:
  config:
    activate:
      on-profile: jwZnygProd
  datasource:
     url: jdbc:mysql://59.61.92.90:9409/medicine?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://59.61.92.90:9409/medicine?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: qY#j2n5O
  redis:
     host: 59.61.92.90
     port: 9054
     password: jkzlehr
  config:
    activate:
      on-profile: jwZnygProd
---
spring:
  config:
    activate:
      on-profile: ZjxlProd
  datasource:
    url: jdbc:mysql://172.26.0.13:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://172.26.0.13:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379
  config:
    activate:
      on-profile: ZjxlProd # Redis server port.
    port: 6379 # Redis server port.
---
spring:
  config:
    activate:
      on-profile: jwZnygProdIn
  datasource:
     url: jdbc:mysql://10.95.22.191:3406/medicine?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://10.95.22.191:3406/medicine?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: qY#j2n5O
  redis:
     host: 10.95.22.142
     port: 6380
     password: jkzlehr
  config:
    activate:
      on-profile: jwZnygProdIn
---
spring:
  datasource:
     url: jdbc:mysql://10.172.0.61:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: 4D^tK%!4
  redis:
     host: 10.172.0.61
     port: 6379
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: mlwProd
---
spring:
  datasource:
     url: jdbc:mysql://10.172.0.61:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://10.172.0.61:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: 4D^tK%!4
  redis:
     host: 10.172.0.61
     port: 6379
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: mlwProd
---
spring:
  datasource:
     url: jdbc:mysql://172.26.0.114:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: 4D^tK%!4
  redis:
     host: 172.26.0.253
     port: 6390
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: mlwTest
     password: Kb6wKDQP1W4