Merge branch 'srdev' of trick9191/patient-co-management into srdev

common/common-entity/src/main/java/com/yihu/wlyy/entity/wechat/vo/WechatMsgVo.java

@@ -12,7 +12,7 @@ public class WechatMsgVo {
    private String openid;
    //头部
    private String first;
    //微信模板关键字,用“,”分割
    //微信模板关键字,用“_”分割
    private String keywords;
    //微信模板备注
    private String remark;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -51,8 +51,8 @@ public class WeiXinEventProcess {
    public String eventProcess(Map<String, String> message) throws Exception {
        String result = "";
        String event = message.get("Event");
        logger.info("eventType："+event);
        JSONObject rs = new JSONObject(message);
        System.out.println(rs.toString());
        switch (event) {
            case WeiXinMessageUtils.EVENT_TYPE_SCAN: // 扫描二维码事件
                result = scanEventProcess(message);

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

@@ -46,15 +46,15 @@ wechat:
  accId: gh_733f975e0bed
  message:
   #咨询回复
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   template_consult_notice: a3PCZJetJ02MI0Xs5pkZKUNZo6UkdC9xdR4GqEjlsNA
   #健康指导提醒
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   information_change_notice: 8KvqU_TMpZY6hKMJpPc9-uy_wooomFWGXt4cn8pwGtE
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
   feedback_processing_notice: Txaapaw9OeVvzbe_yDdbYhzP0I5mkMcxMxIzNCh2QSE
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276

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

@@ -49,15 +49,15 @@ wechat:
  accId: gh_ffd64560fb21
  message:
   #咨询回复
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   template_consult_notice: a3PCZJetJ02MI0Xs5pkZKUNZo6UkdC9xdR4GqEjlsNA
   #健康指导提醒
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   information_change_notice: 8KvqU_TMpZY6hKMJpPc9-uy_wooomFWGXt4cn8pwGtE
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
   feedback_processing_notice: Txaapaw9OeVvzbe_yDdbYhzP0I5mkMcxMxIzNCh2QSE
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/

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

@@ -21,17 +21,17 @@ spring:
     password: Kb6wKDQP1W4
server:
  server_url: http://srijk.yihu.com/wlyy/
  server_url: http://www.xmtyw.cn/wlyy/
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: http://srijk.yihu.com/assistant/
  api: http://www.xmtyw.cn/assistant/
  target_url: home/html/unreadMessageStatistic.html
wlyy:
  hospital: 3502030400 # 默认医院code
im:
  im_list_get: http://11.1.2.27:3000/
  im_list_get: http://27.155.101.77:3000/
  data_base_name: im
#物联网配置
@@ -46,15 +46,15 @@ wechat:
  accId: gh_733f975e0bed
  message:
   #咨询回复
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   template_consult_notice: a3PCZJetJ02MI0Xs5pkZKUNZo6UkdC9xdR4GqEjlsNA
   #健康指导提醒
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   information_change_notice: 8KvqU_TMpZY6hKMJpPc9-uy_wooomFWGXt4cn8pwGtE
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
   feedback_processing_notice: Txaapaw9OeVvzbe_yDdbYhzP0I5mkMcxMxIzNCh2QSE
yihu:
  yihu_OpenPlatform_url: http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276

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

@@ -46,15 +46,15 @@ wechat:
  accId: gh_733f975e0bed
  message:
   #咨询回复
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   template_consult_notice: a3PCZJetJ02MI0Xs5pkZKUNZo6UkdC9xdR4GqEjlsNA
   #健康指导提醒
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   information_change_notice: 8KvqU_TMpZY6hKMJpPc9-uy_wooomFWGXt4cn8pwGtE
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
   feedback_processing_notice: Txaapaw9OeVvzbe_yDdbYhzP0I5mkMcxMxIzNCh2QSE
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276