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

# Conflicts:
#	common/common-entity/sql记录

common/common-entity/sql记录

@@ -1035,12 +1035,12 @@ CREATE TABLE `base_doctor_patient_tmp` (
-- 2021-06-10
alter table base.base_service_package_item add column topic_item varchar(50) default null COMMENT '服务项所属专题(base_system_dict_entry remark字段) security 安防服务专题';
--2021-06-11
-- 2021-06-11
ALTER table base.base_security_monitoring_order add column topic_item varchar(50) default "preventLost" COMMENT '安防工单所属专题 base_system_dict_entry表service_item';
ALTER TABLE base.base_security_monitoring_order ADD INDEX idx_topIt(topic_item);
ALTER table base_capacity_assessment_record add column age tinyint(4) default  COMMENT '年龄';
ALTER table base_capacity_assessment_record add column age tinyint(4) default null  COMMENT '年龄';
ALTER TABLE base.base_doctor_patient_tmp MODIFY COLUMN  doctor_code varchar(50) DEFAULT NULL COMMENT 'type=(1,2,4为医生id) ';
@@ -1049,7 +1049,7 @@ ALTER TABLE base.base_doctor_patient_tmp ADD COLUMN org_code varchar(50) DEFAULT
ALTER TABLE base_security_monitoring_order add column scene_img VARCHAR(1000) default null COMMENT '工单发起时的现场照片';
--2021-06-21
-- 2021-06-21
ALTER table base_patient add column idcard_front varchar(1000) default NULL  COMMENT '身份证正面';
ALTER table base_patient add column idcard_back varchar(1000) default NULL  COMMENT '身份证反面';

svr/svr-cloud-device/src/main/resources/application.yml

@@ -272,12 +272,12 @@ cloudCare:
  url: http://ehr.yihu.com/hlwyy/cloudCare/
---
spring:
  profiles: jwprod
  profiles: hzprod
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.16.1.42:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: im
    password: 2oEq3Kf7
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: '0XxS3W*!cRj'
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 192.0.33.26:9200 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -287,17 +287,17 @@ spring:
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://59.61.92.90:9103
    user: jkzl
    password: jkzlehr
    broker-url: tcp://10.18.43.41:61616
    user: admin
    password: admin
  redis:
    host: 192.0.33.26 # Redis server host.
    port: 6390 # Redis server port.
    host: 10.18.43.40 # Redis server host.
    port: 6379 # Redis server port.
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: https://hlwyy.xmzsh.com/fastdfs/
  fastdfs_file_url: http://10.18.43.40:80/
fast-dfs:
  tracker-server: 192.0.33.26:22122 #服务器地址
  tracker-server: 10.18.43.40:22122 #服务器地址
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP #todo 待配置
@@ -310,33 +310,33 @@ demo:
pay:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  url: https://wx.sh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
wechat:
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  appId: wxd03f873d
  appSecret: 2935b54b53a950a544f2537
  wechat_token: 27eb3bb24f1bb154b08040
  wechat_base_url: http%3a%n%2fwlyy-dev
  accId: gh0fb21
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:
  im_list_get: http://172.26.0.105:3000/
  im_list_get: http://127.0.0.0:3000/
  data_base_name: im_internet_hospital
es:
  pwflag: 1 # 1需要密码，2不需要密码
  index:
    Statistics: hlw_quota_test
    Statistics: hlw_quota_prod
    FollowUp: wlyy_followup
  type:
    Statistics: hlw_quota_test
    Statistics: hlw_quota_prod
    FollowUpContent: wlyy_followup_content
  host:  http://172.26.0.55:9000
  tHost: 172.26.0.55:9300
  host:  http://10.18.43.40:9000
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
@@ -352,19 +352,22 @@ FileTempPath:
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
  remote_inner_url: 172.13/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://www.xest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
  url: https://hlwyhlwyy
  id: zsyy
express:
  sf_url: https://mrds-admin.sf-express.com:443
  sf_url: https://mrds-adpress.com:443
  sf_code: WH000102
  sf_check_word: TGUQASFNAZyjt9112
baiduApi:
  AK: 0vjnCSReegE7A47a941ohjv9a07ONiMC
  url: http://api.map.baidu.com/
cloudCare:
  url: http://127.0.0.1:10301/

svr/svr-statistics-es/src/main/resources/application-prod.yml

@@ -1,24 +1,24 @@
spring:
  profiles: jwprod
  profiles: hzprod
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    primaryReadWrite:
      url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: im
      password: 2oEq3Kf7
      url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: '0XxS3W*!cRj'
    primaryRead:
      url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: im
      password: 2oEq3Kf7
      url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: '0XxS3W*!cRj'
    im: #im库:
      url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: im
      password: 2oEq3Kf7
      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: 192.0.33.26 # Redis server host.
    port: 6390 # Redis server port.
    host: 10.18.43.40 # Redis server host.
    port: 6379 # Redis server port.
    password: Kb6wKDQP1W4
  followupMessage:
@@ -32,15 +32,17 @@ es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_prod
  type: hlw_quota_prod
  host:  http://192.0.33.26:9200
  tHost: 192.0.33.26:9300
  host:  http://10.18.43.40:9000
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wlyy:
  im:
    databaseName: im
    databaseName: im_internet_hospital
quartz:
  name: schedulerFactoryBean_es_prod