From 3fe51b655bb3a5c866bafae9efb27626b7fe0e3a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 10:47:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
index e3444f7..2fcec55 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
@@ -57,11 +57,11 @@
         String openid = body.getOpenid();
         String sessionKey = body.getSessionKey();
         // 用户信息解密 数据验签
-        if (StringUtils.isNotBlank(data.getSignature())) {
-            WxUtils.verifySignature(data.getRawData(), sessionKey, data.getSignature());
-        }
+//        if (StringUtils.isNotBlank(data.getSignature())) {
+//            WxUtils.verifySignature(data.getRawData(), sessionKey, data.getSignature());
+//        }
         AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
         appletUserDecodeData.setOpenId(openid);
-        return AjaxResult.ok(appUserService.login(appletUserDecodeData));
+        return AjaxResult.ok(appUserService.wxLogin(appletUserDecodeData));
     }
 }

--
Gitblit v1.7.1