From 233ab439e38d3040d556f3f6d04492be2a3a6c8d Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 18:17:14 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
index 208da90..100363e 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
@@ -10,14 +10,17 @@
import com.ruoyi.study.dto.AppUserQuery;
import com.ruoyi.study.mapper.TUserMapper;
import com.ruoyi.study.service.ITUserService;
+import com.ruoyi.study.utils.HWSendSms;
import com.ruoyi.study.vo.AppUserVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* <p>
@@ -40,12 +43,23 @@
return this.baseMapper.listAll(query);
}
+ @Autowired
+ private HWSendSms hwSendSms;
+
@Override
- public Boolean phoneCode(String phone) {
+ public Boolean phoneCode(String phone) throws Exception {
// 生成随机 6位数字 验证码
String phoneCode = RandomUtil.randomNumbers(6);
- // todo 手机验证码暂时 123456
- phoneCode = "123456";
+ String regex = Constants.PHONE;
+ // 编译正则表达式
+ Pattern pattern = Pattern.compile(regex);
+ // 创建Matcher对象
+ Matcher matcher = pattern.matcher(phone);
+ // 判断是否匹配
+ if (!matcher.matches()) {
+ throw new GlobalException("手机号不合法！");
+ }
+ hwSendSms.sendSms(phoneCode, phone);
// 判断redis中是否存在手机验证码
Object phoneCodeRedis = redisTemplate.opsForValue().get(RedisConstants.PHONE_CODE + phone);
if (phoneCodeRedis == null) {
@@ -75,15 +89,16 @@
@Override
public Boolean isVip() {
- TUser user = lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid())
- .eq(TUser::getDisabled, 0).eq(TUser::getState,1).one();
- // 是否为vip 逻辑
- if (null == user) {
- return false;
- }
- // vip过期时间，字段为空也表示 当前用户不是vip
- Date vipEndTime = user.getVipEndTime();
- return null != vipEndTime && System.currentTimeMillis() <= vipEndTime.getTime();
+// TUser user = lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid())
+// .eq(TUser::getDisabled, 0).eq(TUser::getState,1).one();
+// // 是否为vip 逻辑
+// if (null == user) {
+// return false;
+// }
+// // vip过期时间，字段为空也表示 当前用户不是vip
+// Date vipEndTime = user.getVipEndTime();
+// return null != vipEndTime && System.currentTimeMillis() <= vipEndTime.getTime();
+ return true;
}
}
--
Gitblit v1.7.1