|
@@ -284,7 +284,7 @@ public class WeChatController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/getAccessToken")
|
|
|
@Log(title = "公众号网页登录", businessType = BusinessType.OTHER)
|
|
|
- public R getAccessToken(@RequestParam String code) {
|
|
|
+ public String getAccessToken(@RequestParam String code) {
|
|
|
|
|
|
// 发送get请求获取 AccessToken
|
|
|
Map<?, ?> result = weChatUtil.getAccessToken(code);
|
|
@@ -321,13 +321,15 @@ public class WeChatController extends BaseController {
|
|
|
// 生成并返回令牌
|
|
|
String token = wxTokenService.createToken(wxUser);
|
|
|
if (token == null || token.isEmpty()) {
|
|
|
- return R.fail("生成令牌失败");
|
|
|
+ return null;
|
|
|
}
|
|
|
wxUser.setToken(token);
|
|
|
// 返回用户信息
|
|
|
// 记录登录信息
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(wxUser.getCOpenid(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
|
|
|
- return R.ok(wxUser);
|
|
|
+// return R.ok(wxUser);
|
|
|
+
|
|
|
+ return "redirect:" + "https://test.baoxianzhanggui.com/fragrance/#/pages/my/wxLogin" + "?openid=" + openid;
|
|
|
}
|
|
|
|
|
|
|