From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..d88b8cb 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,7 +10,9 @@
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;
@@ -40,12 +42,14 @@
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";
+
+ hwSendSms.sendSms(phoneCode, phone);
// 判断redis中是否存在手机验证码
Object phoneCodeRedis = redisTemplate.opsForValue().get(RedisConstants.PHONE_CODE + phone);
if (phoneCodeRedis == null) {
--
Gitblit v1.7.1