From 5e1cf8e0e94b42a94c3a3d3ccda5147fe6ce94f0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 09:42:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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