From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
index 9dbb793..83cf891 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -82,18 +82,11 @@
log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
String openid = sessionInfo.getOpenid();
String sessionKey = sessionInfo.getSessionKey();
- // 解密用户信息
- WxMaUserInfo wxUserInfo = maService.getUserService().getUserInfo(sessionKey,
- loginRequest.getEncryptedData(), loginRequest.getIv());
- log.info("wxUserInfo信息【{}】", JSONObject.toJSONString(wxUserInfo));
- if (null == wxUserInfo) {
- return R.fail("获取用户信息失败");
+ String unionid = sessionInfo.getUnionid();
+ if (ObjectUtils.isEmpty(unionid)) {
+ unionid = "无";
}
- String unionId = wxUserInfo.getUnionId();
- if (ObjectUtils.isEmpty(unionId)) {
- unionId = "无";
- }
- userService.addOrUpdate(openid, sessionKey, unionId);
+ userService.addOrUpdate(openid, sessionKey, unionid);
return tokenService.loginApplets(openid);
}
--
Gitblit v1.7.1