From e013e819f7d544c5c8c59e69ce42c3d10e2215e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 15:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/controller/LoginController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/controller/LoginController.java b/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
index a3f06ce..ccb8cbd 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
@@ -51,7 +51,7 @@
private RestTemplate wxRestTemplate;
@ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"})
- @PostMapping("/openIdByJsCode")
+ @PostMapping("openIdByJsCode")
public ApiResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisAutoTemplate);
@@ -63,8 +63,8 @@
}
AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
appletUserDecodeData.setOpenId(openid);
- appUserService.wxLogin(appletUserDecodeData);
- Map<String, Object> tokenInfos = securityUtils.login(null, null, authenticationManager, TAppUser.class, 3);
+ TAppUser appUser = appUserService.wxLogin(appletUserDecodeData);
+ Map<String, Object> tokenInfos = securityUtils.login(appUser.getOpenId(), appUser, authenticationManager, TAppUser.class, 3);
return ApiResult.success(tokenInfos);
}
--
Gitblit v1.7.1