Merge branch 'dev' of wujunjie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/resources/application.yml

@@ -76,7 +76,7 @@ yueren:
doctorAssistant:
  api: http://192.168.131.113:8080
wlyyService:
  api: http://172.19.103.88:10090/wlyy
  api: http://10.95.22.10:8011/wlyy/
---
spring:
@@ -110,7 +110,7 @@ yueren:
doctorAssistant:
  api: http://172.19.103.88:10090/wlyy
wlyyService:
  api: http://172.19.103.88:10090/wlyy
  api: http://ehr.yihu.com/wlyy/
---
spring:
@@ -142,4 +142,4 @@ yueren:
doctorAssistant:
  api: http://www.xmtyw.cn/assistant
wlyyService:
  api: http://172.19.103.88:10090/wlyy
  api: http://www.xmtyw.cn/wlyy/

patient-co/patient-co-doctor-assistant/src/main/resources/application-dev.yml

@@ -26,30 +26,40 @@ im:
  data_base_name: ichat
wechat:
  appId: wxb3827510b2e15012
  appSecret: c5bdedd909ded9c2ee08028487e6f50d
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_aa9cd602b84b
  accId: gh_ffd64560fb21
  message:
   ##处方待处理提醒
      template_prescription_pending: 2MKI4j9rGQoXg6-8KMbR7PrPipzz5Su8QUBqWySno2U
      ##服务状态提醒
      template_consult_notice: fgYiMntj1amEkE8_GLUPmAIyssUAroJrNSHqvydt-PQ
      #居民体征异常提醒
      template_abnormal_signs: G3UNiiqf3T_0E_ULP59iGl4_ecAqAlOAuJReDDlv0_w
      #咨询请求通知
      template_consult_request: O-bJ4Hkd-ehWmCkVaiOJjmYTAbJB6FL8_LJHCLYrTH8
      #签约申请通知
      template_sign_request: T54W9ky7NxO9WGqwwJP1YHlP-Q2LNZiE-QXTE0i9Ep8
      #随访提醒
      template_followup_success:  YmTqucDGmergNWh4D1XkokV6m04H6yTKQv23xdu_vKM
      #处理结果通知
      template_treatment_result:  _AuCuXOKlVrG3ro65q0nXyfZKmLpraSYFiskahajHro
      #咨询回复提醒
      template_consult_reply:  sjnflOikO0WqMp4e338G8I0eFUXd6h8ljwgAlPZj5Tw
      #代办事项提醒
      template_schedule_remind:  sjnflOikO0WqMp4e338G8I0eFUXd6h8ljwgAlPZj5Tw
   ##医生追加建议提醒 --签约邀请
   doctor_invitel_template: TLWrBtNE2kBJaFCdVzDOOnQC8N2TtRY9ZxEzwZXQcR0
   #咨询回复
   template_consult_notice: qSOW0DBxO3qEBm4ucG0Ial0jxsOyD7_f2TFK5e-mQEc
   #签约成功
   template_sign_success: hDWV_sknKlhxhOwR5h68OCXbAhRpcgnx9INrT8BybE8
   #签约失败
   template_sign_failed: ezgttXE7rG4rAboQK2ituG1dKq4PeyCj3LxGJWO_vOA
   #健康指导提醒
   template_health_notice: 128RCfyCHi22jW8PZzo7vabKMsA3SBv5VeHaDPr2Bhw
   #解约提醒
   template_termination:  LrrzHjnIF67ww5uQUvSiv3_pVKJiIK4ZE3fKrvsT0AE
   #预约成功
   template_appoint_success:  Bo2yqNczSU9zkg4wXoouv9tSeefZ6TziggWL3dTXPYE
   #预约取消
   template_appoint_failed:  pErTBTdweIdrNRf_1Oo62YtQC0aHwPvtLaCzw44JzCQ
   #缴费提醒
   template_expenses_remind:  BkTGJ8S18qZ3DfaptAXnZznAk8RJjx9v93og5vyO0bs
   #健康教育
   template_healthy_article: LA7erINJ0CSsG2G_ZCrgsDaX3krhsI4qg_NSHEyL_l4
   #医生变更
   template_doctor_change:  TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
   #问卷调查
   template_doctor_survey:  IjQvzBy0PLeft2kN9mdBhACXPE9I_jyJywJ6B-JRxsY
   #审核结果通知
   template_doctor_audit:  OFyLUeBW3r9trWw-i6pbB1sPSTD4J2recCv_mc-gKxA
   #服务结果通知
   template_doctor_service:  ezr5RlX0nvh7bGU9aVsGDMJbjKDp1uMKP-AGGYXwI5g
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/

patient-co/patient-co-doctor-assistant/src/main/resources/application-devbak.yml

@@ -1,111 +0,0 @@
##开发的配置
spring:
  profiles: dev
  datasource:
    wlyy:
      url: jdbc:mysql://172.19.103.77/wlyy?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
      username: root
      password: 123456
    health:
      url: jdbc:mysql://172.19.103.77/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: root
      password: 123456
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
server:
  server_url: http://weixin.xmtyw.cn/wlyy-dev/
im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: ichat
wechat:
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  message:
   ##医生追加建议提醒 --签约邀请
   doctor_invitel_template: TLWrBtNE2kBJaFCdVzDOOnQC8N2TtRY9ZxEzwZXQcR0
   #咨询回复
   template_consult_notice: qSOW0DBxO3qEBm4ucG0Ial0jxsOyD7_f2TFK5e-mQEc
   #签约成功
   template_sign_success: hDWV_sknKlhxhOwR5h68OCXbAhRpcgnx9INrT8BybE8
   #签约失败
   template_sign_failed: ezgttXE7rG4rAboQK2ituG1dKq4PeyCj3LxGJWO_vOA
   #健康指导提醒
   template_health_notice: 128RCfyCHi22jW8PZzo7vabKMsA3SBv5VeHaDPr2Bhw
   #解约提醒
   template_termination:  LrrzHjnIF67ww5uQUvSiv3_pVKJiIK4ZE3fKrvsT0AE
   #预约成功
   template_appoint_success:  Bo2yqNczSU9zkg4wXoouv9tSeefZ6TziggWL3dTXPYE
   #预约取消
   template_appoint_failed:  pErTBTdweIdrNRf_1Oo62YtQC0aHwPvtLaCzw44JzCQ
   #缴费提醒
   template_expenses_remind:  BkTGJ8S18qZ3DfaptAXnZznAk8RJjx9v93og5vyO0bs
   #健康教育
   template_healthy_article: LA7erINJ0CSsG2G_ZCrgsDaX3krhsI4qg_NSHEyL_l4
   #医生变更
   template_doctor_change:  TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
   #问卷调查
   template_doctor_survey:  IjQvzBy0PLeft2kN9mdBhACXPE9I_jyJywJ6B-JRxsY
   #审核结果通知
   template_doctor_audit:  OFyLUeBW3r9trWw-i6pbB1sPSTD4J2recCv_mc-gKxA
   #服务结果通知
   template_doctor_service:  ezr5RlX0nvh7bGU9aVsGDMJbjKDp1uMKP-AGGYXwI5g
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276
  yihu_OpenPlatform_secret: OKC8BS1KGXTDE9GPP1EO4VYLUXF8DJ7QUP72H613ZXA
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
message:
  messageServerUrl: http://10.0.1.3:8080/OpenPlatform/cgiBin/1.0/smsgw/smsSendWS/send
  messageAppId: 9000286
  messageSecret: NW63YK778QPRUD2A6K5SNF7LYRQ888BWOVD6R4FG2VF
images:
  path: /var/local/upload/images
  renew_path: /usr/local/apache-tomcat-8.0.26/webapps/wlyy/images/renew.png
  sign_path: /usr/local/apache-tomcat-8.0.26/webapps/wlyy/images/familycontract.png
sign:
  check_upload: http://172.19.103.87:8011/wlyy_service
express:
  sf_url: http://218.17.248.244:11080/bsp-oisp/sfexpressService
#  sf_url: https://bsp-ois.sit.sf-express.com:9443/bsp-ois/sfexpressServic
  sf_code: SDDF
  sf_check_word: ttzlgGyOQu4L
pushMes:
  # 1为推送redis,0为推送消息队列
  method: 0
  # redis队列名称
  redis_prescription_title: redisPrescription
es:
  index:
    HealthEduArticlePatient: health_edu_article_patient_dev
  type:
    HealthEduArticlePatient: health_edu_article_patient_dev
  host: 172.19.103.68
  port: 9200
  tPort: 9300
  clusterName: jkzl
#消息队列
activemq:
  username: admin
  password: admin
  url: tcp://172.19.103.87:61616
  queue:
    healtHarticleQueue: healthArticleChannel_dev  #健康文章推送

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -22,7 +22,7 @@ server:
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: http://ehr.yihu.com/wlyy/
  target_url: /prescription/www.baidu.com
  target_url: home/html/unreadMessageStatistic.html
im:

patient-co/patient-co-wlyy/src/main/resources/application-local.yml

@@ -22,7 +22,7 @@ server:
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: http://10.95.22.10:8011/wlyy/
  target_url: /prescription/www.baidu.com
  target_url: home/html/unreadMessageStatistic.html
im:

patient-co/patient-co-wlyy/src/main/resources/application-localtest.yml

@@ -22,7 +22,7 @@ server:
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: http://ehr.yihu.com/wlyy/
  target_url: /prescription/www.baidu.com
  target_url: home/html/unreadMessageStatistic.html
im:

patient-co/patient-co-wlyy/src/main/resources/application-prod.yml

@@ -21,7 +21,7 @@ server:
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: http://www.xmtyw.cn/assistant/
  target_url: /prescription/www.baidu.com
  target_url: home/html/unreadMessageStatistic.html
im:

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -22,7 +22,7 @@ server:
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: http://ehr.yihu.com/wlyy/
  target_url: /prescription/www.baidu.com
  target_url: home/html/unreadMessageStatistic.html
im:
  im_list_get: http://172.19.103.88:3000/