From 02d5b44343f3bd9abb667e50ccf469fed9a0a99a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 20:43:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/controller/LoginController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 a47e425..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);
@@ -64,7 +64,7 @@
AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
appletUserDecodeData.setOpenId(openid);
TAppUser appUser = appUserService.wxLogin(appletUserDecodeData);
- Map<String, Object> tokenInfos = securityUtils.login(openid, appUser, authenticationManager, TAppUser.class, 3);
+ Map<String, Object> tokenInfos = securityUtils.login(appUser.getOpenId(), appUser, authenticationManager, TAppUser.class, 3);
return ApiResult.success(tokenInfos);
}
--
Gitblit v1.7.1