刘韬 пре 6 година
родитељ
комит
c938c26db4

+ 2 - 2
PacsOnline_Wechat_Patient/pom.xml

@@ -67,12 +67,12 @@
 			<version>4.0.1</version>
 			<scope>provided</scope>
 		</dependency>
-<!-- 		<dependency>
+<!--  		<dependency>
     <groupId>com.jfinal</groupId>
     <artifactId>jetty-server</artifactId>
     <version>2019.3</version>
     <scope>provided</scope>
-</dependency>  -->
+</dependency> -->
 	</dependencies>
 
 	<build>

+ 15 - 5
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WebBridgeController.java

@@ -17,6 +17,9 @@ public class WebBridgeController extends ApiController {
 	}
 	
 	public void examList() {
+		System.out.println(ApiConfigKit.getApiConfig().getAppId());
+		System.out.println(getRequest().getRequestURL().toString());
+
 		this.process(WEB_BASR_URL+"/reportList");
 	}
 
@@ -26,16 +29,23 @@ public class WebBridgeController extends ApiController {
 	
 	private void process(String toUrl) {
 		try {
-//			Object sessionObj = this.getRequest().getSession().getAttribute("pwpSessionObjtest8");
-			Object sessionObj = null;
+			System.out.println(toUrl);
+
+//			System.out.println(getRequest().getRequestURL().toString());
+			Object sessionObj = this.getRequest().getSession().getAttribute("pwpSessionObjtest9");
+//			Object sessionObj = null;
 			WeixinService wService = ServiceFactory.getService(WeixinService.class);
 			if (sessionObj == null) {
 				String code = this.getPara("code");
 				if (code == null) {
-					String url = wService.getCodeUrl(ApiConfigKit.getApiConfig().getAppId(), getRequest().getRequestURL().toString());
+					System.out.println(ApiConfigKit.getApiConfig().getAppId());
+					System.out.println(getRequest().getRequestURL().toString());
+
+					String url = wService.getCodeUrl(ApiConfigKit.getApiConfig().getAppId(), getRequest().getRequestURL().toString() + "?appId=" + ApiConfigKit.getApiConfig().getAppId());
 					this.redirect(url);
 					return;
 				}
+				System.out.println(ApiConfigKit.getApiConfig().getAppId());
 				SnsAccessToken snsAccessToken = wService.getWebAccessToken(ApiConfigKit.getApiConfig().getAppId(), ApiConfigKit.getApiConfig().getAppSecret(), code);
 
 				UserService uService = ServiceFactory.getService(UserService.class);
@@ -47,7 +57,7 @@ public class WebBridgeController extends ApiController {
 				if (user != null && user.getWxIcon().isEmpty()) {                     
 					wService.getWebWeixinUserInfo(snsAccessToken.getAccessToken(), snsAccessToken.getOpenid());
 				}
-				this.getRequest().getSession().setAttribute("pwpSessionObjtest8", user);
+				this.getRequest().getSession().setAttribute("pwpSessionObjtest9", user);
 				String uidStr = toUrl.contains("?") ? "&openid=" : "?openid=";
 				this.redirect(toUrl + uidStr + snsAccessToken.getOpenid());
 			} else {
@@ -65,7 +75,7 @@ public class WebBridgeController extends ApiController {
 
 				}
 				
-				this.getRequest().getSession().setAttribute("pwpSessionObjtest8", users2);
+				this.getRequest().getSession().setAttribute("pwpSessionObjtest9", users2);
 
 				this.redirect(toUrl + uidStr + userWechats.getWxOpenid());
 

+ 2 - 2
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinMsgController.java

@@ -40,7 +40,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 			List<Articles> list = new ArrayList<Articles>();
 			Articles articles1 = new Articles();
 			articles1.setTitle("【演示】点击查看本次影像和报告");
-			articles1.setDescription("欢迎使用中世康恺PacsOnline!\n点击进入查看详情,您可以分享给家属或医生,日后还可以在/“我的报告/”中查看本次影像和报告");
+			articles1.setDescription("欢迎使用中世康恺PacsOnline!\n点击进入查看详情,您可以分享给家属或医生,日后还可以在“我的报告”中查看本次影像和报告");
 			articles1.setPicurl("http://work.pacsonline.cn/static/img/banner.e8ee043.png");
 			articles1.setUrl(toUrlString);
 			list.add(articles1);
@@ -48,7 +48,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 			renderNull();
 			}else if ("233".equalsIgnoreCase(msgContent)) {
 				OutTextMsg outMsgs = new OutTextMsg(inTextMsg);
-				outMsgs.setContent("欢迎关注中世康恺电子胶片平台!\n使用微信或者本公众号内的/“扫一扫”,扫描报告上的二维码,即可查看电子影像和报告");
+				outMsgs.setContent("欢迎关注中世康恺电子胶片平台!\n使用微信或者本公众号内的“扫一扫”,扫描报告上的二维码,即可查看电子影像和报告");
 				render(outMsgs);
 			}
     }