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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1093,7 +1093,7 @@ public class FamilyContractService extends BaseService {
            Hospital hos = hospitalDao.findByCode(doc.getHospital());
            String content = sf.getName() + "，您好！祝贺您，成功签约" + sf.getDoctorName() + "医生团队，您已可以享受家庭医生所带来的无微不至的健康保健服务。" +
                    "为了给您提供更好的服务，请尽快完成缴费。您可点击此条消息，跳转缴费页面完成缴费，或进入签约管理，选择待缴费的签约记录进行缴费操作，如需线下缴费，请尽快到" + (hos != null ? hos.getName() : "") + "社区（地址：" +
                    "为了给您提供更好的服务，请尽快完成缴费。您可登录签约居民的微信账号，进入签约管理，选择待缴费的签约记录进行缴费操作，如需线下缴费，请尽快到" + (hos != null ? hos.getName() : "") + "社区（地址：" +
                    (hos != null ? hos.getAddress() : "") + "）缴费。";
            JSONObject json = new JSONObject();
            json.put("first", "签约成功通知");

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/weixin/wxpay/common/Configure.java

@@ -10,9 +10,13 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class Configure {
	/******************************* 易联众统一支付平台 ***********************************************************/
	private String onepayApi = "http://120.42.37.94:1301/onepay-web/";
	private String onepayAppId = "1BGKM1UHM03P7B2CA8C000005626EB0E";
	private String onepayAppSecret = "1BGKM1UHM03I7B2CA8C00000AB682E9A";
//	private String onepayApi = "http://120.42.37.94:1301/onepay-web/";
//	private String onepayAppId = "1BGKM1UHM03P7B2CA8C000005626EB0E";
//	private String onepayAppSecret = "1BGKM1UHM03I7B2CA8C00000AB682E9A";
//			开发环境应用信息
	private String onepayApi = "https://xmhealth.ylzpay.com:8080/";
	private String onepayAppId = "1BLF5SEGN00087165F0A000027362BE5";
	private String onepayAppSecret = "1BLF5SCBO01V3E78A8C00000F3A0FFE7";
	private String bindCardType = "onepay.sicard.bind.info";