刘韬 6 vuotta sitten
vanhempi
commit
8142843eb1

+ 11 - 2
PacsOnline_Wechat_Patient/src/main/java/com/zskk/common/ZskkConfig.java

@@ -119,15 +119,24 @@ public class ZskkConfig extends JFinalConfig {
 		/**
 		 * 多个公众号时,重复调用ApiConfigKit.putApiConfig(ac)依次添加即可,第一个添加的是默认。
 		 */
-		ApiConfigKit.putApiConfig(ac_zskk);
-
 		// 黑龙江省电子胶片平台
+		ApiConfigKit.putApiConfig(ac_zskk);
 		ApiConfig ac_hlj = new ApiConfig();
 		ac_hlj.setToken(PropKit.get("token_hlj"));
 		ac_hlj.setAppId(PropKit.get("appId_hlj"));
 		ac_hlj.setAppSecret(PropKit.get("appSecret_hlj"));
 		ac_hlj.setEncryptMessage(Boolean.FALSE);
 		ApiConfigKit.putApiConfig(ac_hlj);
+		
+		ApiConfigKit.putApiConfig(ac_zskk);
+
+		// guanying
+		ApiConfig ac_zskk2 = new ApiConfig();
+		ac_zskk2.setToken(PropKit.get("token_zskk2"));
+		ac_zskk2.setAppId(PropKit.get("appId_zskk2"));
+		ac_zskk2.setAppSecret(PropKit.get("appSecret_zskk2"));
+		ac_zskk2.setEncryptMessage(Boolean.FALSE);
+		ApiConfigKit.putApiConfig(ac_zskk2);
 
 		// 辽宁省电子胶片平台
 		ApiConfig ac_ln = new ApiConfig();

+ 6 - 5
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinApiController.java

@@ -1,5 +1,6 @@
 package com.zskk.controller;
 
+import com.jfinal.kit.PropKit;
 import com.jfinal.weixin.sdk.api.AccessTokenApi;
 import com.jfinal.weixin.sdk.api.ApiConfigKit;
 import com.jfinal.weixin.sdk.api.ApiResult;
@@ -152,20 +153,20 @@ public class WeixinApiController extends ApiController {
 		Institution institution = Institution.dao.findById(exams.getInstitutionId());
 		String appId;
 		switch (institution.getWxSource()) {
-		case "测试微信":
-			appId = "wx6a54bf0e98ecd2c7";
+		case "中世康恺电子胶片平台":
+			appId = PropKit.get("appId_zskk");
 			break;
 
 		case "黑龙江省电子胶片平台":
-			appId = "wxdeb75f5d7e5a2300";
+			appId = PropKit.get("appId_hlj");
 			break;
 
 		case "辽宁省电子胶片平台":
-			appId = "wx2f0834870403c54e";
+			appId = PropKit.get("appId_ln");
 			break;
 
 		default:
-			appId = "wx6a54bf0e98ecd2c7";
+			appId = PropKit.get("appId_zskk");
 			break;
 		}
 		redirect("http://wechat.pacsonline.cn/wx_patient/api/getQrcode?appId=" + appId + "&reportId=" + reportId);

+ 8 - 0
PacsOnline_Wechat_Patient/src/main/java/com/zskk/service/UserService.java

@@ -30,6 +30,10 @@ public class UserService {
 		user.setWxOpenid(openid);
 		switch (gh) {
 
+		case "PACS_Online":
+			user.setSource("中世康恺电子胶片平台");
+			break;
+			
 		case "gh_728267809f40":
 			user.setSource("测试微信");
 			break;
@@ -64,6 +68,10 @@ public class UserService {
 		user.setWxOpenid(openid);
 		switch (appid) {
 
+		case "wx1f3dc2c37dce641b":
+			user.setSource("中世康恺电子胶片平台");
+			break;
+			
 		case "wx6a54bf0e98ecd2c7":
 			user.setSource("测试微信");
 			break;

+ 7 - 7
PacsOnline_Wechat_Patient/src/main/resources/config.properties

@@ -6,14 +6,14 @@ devMode  = true
 
 
 #Wechat-ZhongShiKangKaiDianZiJiaoPianPingTai
-appId_zskk    = wx6a54bf0e98ecd2c7
-appSecret_zskk= f4b4e2b054d84157565ace97a43275e8
-token_zskk    = zhongshikangkai2019
+appId_zskk2    = wx6a54bf0e98ecd2c7
+appSecret_zskk2= f4b4e2b054d84157565ace97a43275e8
+token_zskk2    = zhongshikangkai2019
 
-#Wechat-ZhongShiKangKaiDianZiJiaoPianPingTai
-#appId_zskk    = wx1f3dc2c37dce641b
-#appSecret_zskk= 013c469bbd9e892a693f3375fdf4537e
-#token_zskk    = zhongshikangkai2019
+Wechat-ZhongShiKangKaiDianZiJiaoPianPingTai
+appId_zskk    = wx1f3dc2c37dce641b
+appSecret_zskk= 013c469bbd9e892a693f3375fdf4537e
+token_zskk    = zhongshikangkai2019
 
 #Wechat-HeiLongJiangShengDianZiJiaoPianPingTai
 appId_hlj    = wxdeb75f5d7e5a2300