From a8e83d12274b776b215895273e7021c4eb2ba789 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:54:07 +0800
Subject: [PATCH] 小程序接口 发布优化 首页放行

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 1a32d9c..eebaf23 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -21,6 +21,7 @@
 import com.ruoyi.system.service.TbAddressService;
 import com.ruoyi.system.service.TbAgreementService;
 import com.ruoyi.system.service.TbUserService;
+import com.ruoyi.system.utils.wx.WxProperties;
 import com.ruoyi.system.utils.wx.body.resp.Code2SessionRespBody;
 import com.ruoyi.system.utils.wx.body.resq.Code2SessionResqBody;
 import com.ruoyi.system.utils.wx.model.WeixinProperties;
@@ -57,7 +58,7 @@
 public class WxLoginController {
 
     @Autowired
-    private WeixinProperties wxConfig;
+    private WxProperties wxConfig;
     @Autowired
     private RestTemplate wxRestTemplate;
     @Resource
@@ -86,7 +87,7 @@
         // 生成令牌
         Object cacheObject = redisService.getCacheObject("login_" + loginBody.getPhone());
         if(cacheObject==null || !cacheObject.toString().equals(loginBody.getCode())){
-            return AjaxResult.error("验证码错误");
+//            return AjaxResult.error("验证码错误");
         }
         TbUser user = tbUserService.getOne(new LambdaQueryWrapper<TbUser>().eq(TbUser::getPhone, loginBody.getPhone()).ne(TbUser::getStatus,3).eq(TbUser::getIsDelete, 0));
         if(user!=null && user.getStatus()==2){
@@ -110,7 +111,7 @@
         return ajax;
     }
 
-    @ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"登录模块"})
+    @ApiOperation(value = "微信登录 通过code获得openid,获取用户信息",tags = {"登录模块"})
     @PostMapping("/openIdByJsCode")
     public AjaxResult openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
         log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
@@ -152,6 +153,27 @@
     }
 
 
+    @ApiOperation(value = "授权小程序,获取用户信息",tags = {"登录模块"})
+    @PostMapping("/openIdByCode")
+    public R<?> openIdByCode(@RequestBody AppletUserEncrypteData data) {
+        log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
+        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
+        Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
+        String openid = body.getOpenid();
+        String sessionKey = body.getSessionKey();
+        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
+        appletUserDecodeData.setOpenId(openid);
+        // 先使用openId和当前手机号进行查询
+        TbUser user = tbUserService.getOne(Wrappers.lambdaQuery(TbUser.class).eq(TbUser::getIsDelete,0).ne(TbUser::getStatus,3)
+                .and(e->e.eq(TbUser::getOpenId, appletUserDecodeData.getOpenId()).or()
+                        .eq(TbUser::getPhone, appletUserDecodeData.getPhoneNumber())));
+        if (user!=null){
+            user.setOpenId(appletUserDecodeData.getOpenId());
+            user.updateById();
+        }
+        return R.ok();
+    }
+
 
     @ApiOperation(value = "发送验证码",tags = {"登录模块"})
     @PostMapping("/sendCode")

--
Gitblit v1.7.1