xiongchao 3 years ago
parent
commit
cab14b8b6f

+ 6 - 5
platform-rest/src/main/java/com/platform/rest/controller/wechat/WechatController.java

@@ -107,15 +107,16 @@ public class WechatController {
     /**
      * 通过点击我的-》设置里面的-》微信授权,跳转到这个方法
      * 这个方法会直接跳转到微信授权页面,然后在页面点击操作后,微信会返回到redirect_uri的方法
-     * 返回跳转的地址,端直接跳转
+     * 返回跳转的地址,端直接跳转
      *
      * @param request
      * @param response
      * @return
      */
     @RequestMapping(value = "redirect", method = RequestMethod.GET)
-    public String redirect(HttpServletRequest request, HttpServletResponse response) {
-        return "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + WeChatConnectService.APPID+ "&redirect_uri=" + WECHAT_REDIRECT_URL + "?response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect";
+    public R redirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        //return R.success("http://www.baidu.com");
+        return R.success("https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + WeChatConnectService.APPID+ "&redirect_uri=" + WECHAT_REDIRECT_URL + "?response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect");
     }
 
     /**
@@ -127,7 +128,7 @@ public class WechatController {
      * @return
      */
     @RequestMapping(value = "oauth", method = RequestMethod.GET)
-    public void oauth(HttpServletRequest request, HttpServletResponse response, @RequestParam String code) throws IOException {
+    public R oauth(HttpServletRequest request, HttpServletResponse response, @RequestParam String code) throws IOException {
         // 获取用户的openid和access_token
         JsonOauthAccessTokenResponse wechatResponse = WeChatConnectService.getOauthAccessToken(code);
         String openId = wechatResponse.getOpenid();
@@ -140,7 +141,7 @@ public class WechatController {
             searchUser.setUserId(userInfo.getUserId());
             sysUserService.modModelByPrimaryKey(searchUser);
         }
-        response.sendRedirect("https://rl.m.litian2017.com/#/pages/setting/wechat-oauth");
+        return R.success("https://rl.m.litian2017.com/#/pages/setting/wechat-oauth");
     }