完善

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

@@ -143,29 +143,25 @@ public class WechatController {
 //            return "redirect:" + url;
 //        }
 //    }
-//
-//    @RequestMapping(value = "isOauth", method = RequestMethod.GET)
-//    public String isOauth(HttpServletRequest request, @RequestParam String code, HttpSession session, String redirectUrl) {
-//        // 获取用户的openid和access_token
-//        JsonOauthAccessTokenResponse response = WeChatConnectService.getOauthAccessToken(code);
-//        String openId = response.getOpenid();
-//        UserWechat userWechat = userWeChatService.getByOpenId(openId);
-//        request.getSession(true).setAttribute(WECHAT_OPENID, openId);
-//        if (userWechat == null) {
-//            String state = nextToken();
-//            request.getSession(true).setAttribute(WECHAT_STATE, state);
-//            WECHAT_REDIRECT_URL = WECHAT_REDIRECT_URL.split("redirectUrl")[0].replace("?", "") + "?redirectUrl=" + redirectUrl;
-//            String url = WeChatConnectService.getOauthAuthorizeURL(WECHAT_REDIRECT_URL, state);
-//            log.info("----url3:" + url);
-//            return "redirect:" + url;
-//        }
-//        if (redirectUrl != null && !"".equals(redirectUrl) && !"null".equals(redirectUrl)) {
-//            return "redirect:" + redirectUrl;
-//        } else {
-//            return "redirect:/m/account.htm";
-//        }
-//    }
-//
+
+  @RequestMapping(value = "isOauth", method = RequestMethod.GET)
+    public Boolean isOauth(HttpServletRequest request, @RequestParam String code) {
+        // 获取用户的openid和access_token
+        JsonOauthAccessTokenResponse response = WeChatConnectService.getOauthAccessToken(code);
+        String openId = response.getOpenid();
+        SysUser searchUser = new SysUser();
+        searchUser.setWxOpenId(openId);
+        SysUser sysUser = sysUserService.getModelByModel(searchUser);
+        if (sysUser == null) {
+            String state = nextToken();
+            UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
+            searchUser.setUserId(userInfo.getUserId());
+            sysUserService.modModelByPrimaryKey(searchUser);
+        }
+        return true;
+    }
+
+
 //    /**
 //     * 处理微信跳转过来的授权 授权成功后，保存openid到session，然后跳转到登录页面
 //     *