From 6ed424f89e0bb7f0611b89a2ee947b6e0b1c089b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 30 三月 2023 10:19:17 +0800
Subject: [PATCH] add 增加 邮箱验证码发送接口 add 增加 邮箱登陆接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
index fece942..b853ab4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
@@ -112,6 +112,23 @@
return StpUtil.getTokenValue();
}
+ public String emailLogin(String tenantId, String email, String emailCode) {
+ // 鏍￠獙绉熸埛
+ checkTenant(tenantId);
+ // 閫氳繃鎵嬫満鍙锋煡鎵剧敤鎴�
+ SysUserVo user = loadUserByEmail(tenantId, email);
+
+ checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode));
+ // 姝ゅ鍙牴鎹櫥褰曠敤鎴风殑鏁版嵁涓嶅悓 鑷鍒涘缓 loginUser
+ LoginUser loginUser = buildLoginUser(user);
+ // 鐢熸垚token
+ LoginHelper.loginByDevice(loginUser, DeviceType.APP);
+
+ recordLogininfor(loginUser.getTenantId(), user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+ recordLoginInfo(user.getUserId());
+ return StpUtil.getTokenValue();
+ }
+
public String xcxLogin(String xcxCode) {
// xcxCode 涓� 灏忕▼搴忚皟鐢� wx.login 鎺堟潈鍚庤幏鍙�
@@ -185,6 +202,18 @@
}
/**
+ * 鏍￠獙閭楠岃瘉鐮�
+ */
+ private boolean validateEmailCode(String tenantId, String email, String emailCode) {
+ String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email);
+ if (StringUtils.isBlank(code)) {
+ recordLogininfor(tenantId, email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+ throw new CaptchaExpireException();
+ }
+ return code.equals(emailCode);
+ }
+
+ /**
* 鏍￠獙楠岃瘉鐮�
*
* @param username 鐢ㄦ埛鍚�
@@ -241,6 +270,24 @@
return userMapper.selectUserByPhonenumber(phonenumber);
}
+ private SysUserVo loadUserByEmail(String tenantId, String email) {
+ SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getPhonenumber, SysUser::getStatus)
+ .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
+ .eq(SysUser::getEmail, email));
+ if (ObjectUtil.isNull(user)) {
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", email);
+ throw new UserException("user.not.exists", email);
+ } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", email);
+ throw new UserException("user.blocked", email);
+ }
+ if (TenantHelper.isEnable()) {
+ return userMapper.selectTenantUserByEmail(email, tenantId);
+ }
+ return userMapper.selectUserByEmail(email);
+ }
+
private SysUserVo loadUserByOpenid(String openid) {
// 浣跨敤 openid 鏌ヨ缁戝畾鐢ㄦ埛 濡傛湭缁戝畾鐢ㄦ埛 鍒欐牴鎹笟鍔¤嚜琛屽鐞� 渚嬪 鍒涘缓榛樿鐢ㄦ埛
// todo 鑷瀹炵幇 userService.selectUserByOpenid(openid);
--
Gitblit v1.9.3