From 64e17420efe7a56fd5d3fa0f4f9a96ffa21b9131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Thu, 7 Nov 2024 12:44:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(login):=20=E4=BC=98=E5=8C=96=E7=9F=AD?=
=?UTF-8?q?=E4=BF=A1=E5=8F=91=E9=80=81=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?=
=?UTF-8?q?&=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95=E5=BC=82?=
=?UTF-8?q?=E5=B8=B8=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/handler/MiniAppLoginHandler.java | 105 ++++++++++--------
.../service/impl/SysMessageServiceImpl.java | 2 +-
2 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java
index b29127eba..6d7192c80 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java
@@ -18,6 +18,7 @@
package com.pig4cloud.pigx.admin.handler;
import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -28,6 +29,7 @@ import com.pig4cloud.pigx.admin.mapper.SysSocialDetailsMapper;
import com.pig4cloud.pigx.admin.service.SysUserService;
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
import com.pig4cloud.pigx.common.core.constant.enums.LoginTypeEnum;
+import com.pig4cloud.pigx.common.core.exception.CheckedException;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -43,59 +45,68 @@ import org.springframework.stereotype.Component;
@AllArgsConstructor
public class MiniAppLoginHandler extends AbstractLoginHandler {
- private final SysUserService sysUserService;
+ private final SysUserService sysUserService;
- private final SysSocialDetailsMapper sysSocialDetailsMapper;
+ private final SysSocialDetailsMapper sysSocialDetailsMapper;
- /**
- * 小程序登录传入code
- *
- * 通过code 调用qq 获取唯一标识
- * @param code
- * @return
- */
- @Override
- public String identify(String code) {
- SysSocialDetails condition = new SysSocialDetails();
- condition.setType(LoginTypeEnum.MINI_APP.getType());
- SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
+ /**
+ * 小程序登录传入code
+ *
+ * 通过code 调用qq 获取唯一标识
+ *
+ * @param code
+ * @return
+ */
+ @Override
+ public String identify(String code) {
+ SysSocialDetails condition = new SysSocialDetails();
+ condition.setType(LoginTypeEnum.MINI_APP.getType());
+ SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
- String url = String.format(SecurityConstants.MINI_APP_AUTHORIZATION_CODE_URL, socialDetails.getAppId(),
- socialDetails.getAppSecret(), code);
- String result = HttpUtil.get(url);
- log.debug("微信小程序响应报文:{}", result);
+ String url = String.format(SecurityConstants.MINI_APP_AUTHORIZATION_CODE_URL, socialDetails.getAppId(),
+ socialDetails.getAppSecret(), code);
+ String result = HttpUtil.get(url);
+ log.debug("微信小程序响应报文:{}", result);
+ JSONObject resultJsonObj = JSONUtil.parseObj(result);
- Object obj = JSONUtil.parseObj(result).get("openid");
- return obj.toString();
- }
+ if (resultJsonObj.containsKey("errcode")) {
+ log.error("微信小程序登录失败:{}", result);
+ throw new CheckedException("微信小程序登录失败");
+ }
- /**
- * openId 获取用户信息
- * @param openId
- * @return
- */
- @Override
- public UserInfo info(String openId) {
- SysUser user = sysUserService.getOne(Wrappers.query().lambda().eq(SysUser::getMiniOpenid, openId));
+ Object obj = resultJsonObj.get("openid");
+ return obj.toString();
+ }
- if (user == null) {
- log.info("微信小程序未绑定:{}", openId);
- return null;
- }
- return sysUserService.findUserInfo(user);
- }
+ /**
+ * openId 获取用户信息
+ *
+ * @param openId
+ * @return
+ */
+ @Override
+ public UserInfo info(String openId) {
+ SysUser user = sysUserService.getOne(Wrappers.query().lambda().eq(SysUser::getMiniOpenid, openId));
- /**
- * 绑定逻辑
- * @param user 用户实体
- * @param identify 渠道返回唯一标识
- * @return
- */
- @Override
- public Boolean bind(SysUser user, String identify) {
- user.setMiniOpenid(identify);
- sysUserService.updateById(user);
- return true;
- }
+ if (user == null) {
+ log.info("微信小程序未绑定:{}", openId);
+ return null;
+ }
+ return sysUserService.findUserInfo(user);
+ }
+
+ /**
+ * 绑定逻辑
+ *
+ * @param user 用户实体
+ * @param identify 渠道返回唯一标识
+ * @return
+ */
+ @Override
+ public Boolean bind(SysUser user, String identify) {
+ user.setMiniOpenid(identify);
+ sysUserService.updateById(user);
+ return true;
+ }
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMessageServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMessageServiceImpl.java
index a0cf24937..95fde252e 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMessageServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMessageServiceImpl.java
@@ -268,7 +268,7 @@ public class SysMessageServiceImpl extends ServiceImpl