From 8962a6aecb9922a016155af8fa5a09d727c78c70 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 15:45:00 +0800
Subject: [PATCH] 修改

---
 applet/src/main/java/com/jilongda/applet/controller/LoginController.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 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 e379fbf..ccb8cbd 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
@@ -54,17 +54,16 @@
     @PostMapping("openIdByJsCode")
     public ApiResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
         log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
-//        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisAutoTemplate);
-//        Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
-//        String openid = body.getOpenid();
-//        String sessionKey = body.getSessionKey();
-//        if(!StringUtils.hasLength(data.getEncryptedData()) || !StringUtils.hasLength(data.getIv())){
-//            return ApiResult.failed("已拒绝授权",null);
-//        }
-//        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
-//        appletUserDecodeData.setOpenId(openid);
-//        TAppUser appUser = appUserService.wxLogin(appletUserDecodeData);
-        TAppUser appUser = appUserService.getById(1);
+        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisAutoTemplate);
+        Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
+        String openid = body.getOpenid();
+        String sessionKey = body.getSessionKey();
+        if(!StringUtils.hasLength(data.getEncryptedData()) || !StringUtils.hasLength(data.getIv())){
+            return ApiResult.failed("已拒绝授权",null);
+        }
+        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
+        appletUserDecodeData.setOpenId(openid);
+        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