Merge branch 'devsu' of suhaiwen/wlyy2.0 into dev

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MultipleCode/MultipleCodeService.java

@@ -42,7 +42,7 @@ public class MultipleCodeService {
    @Autowired
    private BasePatientWechatDao basePatientWechatDao;
    @Value("${wx.id}")
    @Value("${wechat.id}")
    private String wxId;
    @Autowired
@@ -78,7 +78,7 @@ public class MultipleCodeService {
            bizContent.put("address", patientDO.getAddress());
            bizContent.put("mobile_phone", patientDO.getMobile());
            bizContent.put("apply_method", "1");
            bizContent.put("user_sex", "1");
            bizContent.put("user_sex",patientDO.getSex());
            bizContent.put("nation", "01");
            request.setBiz_content(JSONObject.toJSONString(bizContent));
            EhcHandler ehcHandler = new EhcHandler(oauthYlzConfigDO.getUrl()+"ehcweb/gateway.do", oauthYlzConfigDO.getAppId(), oauthYlzConfigDO.getTermId(), oauthYlzConfigDO.getPrivateKey(), oauthYlzConfigDO.getEhcPublicKey());

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

@@ -228,8 +228,6 @@ wlyy:
qywx:
  url: 2
  id: 1
wx:
  id: xm_ykyy_wx # base库中,wx_wechat 的id字段
---
spring:
  profiles: jwprod
@@ -343,7 +341,7 @@ fastDFS:
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
wechat:
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
@@ -423,7 +421,7 @@ fastDFS:
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
wechat:
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP