From d3bcec43a5e456964b42ce02cd0e022b25b648d3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 09 七月 2020 08:46:54 +0800
Subject: [PATCH] 优化业主绑定

---
 service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java b/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java
index bbf436a25..f6872bb 100644
--- a/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java
+++ b/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java
@@ -4,8 +4,10 @@
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
+import com.java110.core.factory.WechatFactory;
 import com.java110.front.smo.ownerLogin.IOwnerAppLoginSMO;
 import com.java110.utils.constant.CommonConstant;
+import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +45,7 @@
         IPageData pd = PageData.newInstance().builder("", "", "", JSONObject.toJSONString(params),
                 "login", "", "", "", appId
         );
-        ResponseEntity responseEntity = ownerAppLoginSMOImpl.getPageAccessToken(pd);
+        ResponseEntity responseEntity = ownerAppLoginSMOImpl.getPageAccessToken(pd,request);
         request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
         return responseEntity;
     }
@@ -55,10 +57,17 @@
      */
     @RequestMapping(path = "/refreshToken")
     public ResponseEntity<String> refreshToken(@RequestParam String redirectUrl,
+                               @RequestParam String errorUrl,
+                               @RequestParam String loginFlag,
                                HttpServletRequest request,
                                HttpServletResponse response) {
-        return ownerAppLoginSMOImpl.refreshToken(null, redirectUrl, request, response);
+        return ownerAppLoginSMOImpl.refreshToken(null, redirectUrl,errorUrl,loginFlag, request, response);
 
     }
 
+    @RequestMapping(path = "/getWId")
+    public ResponseEntity<String> getWId(@RequestParam String appId){
+        return ResultVo.createResponseEntity(WechatFactory.getWId(appId));
+    }
+
 }

--
Gitblit v1.8.0