From 610604ea8fbdc1f2b0f54e90a689b9ff449f092c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 六月 2024 15:48:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 36f7bb0..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
@@ -17,9 +17,10 @@
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>
@@ -44,12 +45,20 @@
@Autowired
private HWSendSms hwSendSms;
+
@Override
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);
@@ -80,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