From 1690e3e4c0d9583c3fdc3b2a1f91626dc980aff2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 25 Apr 2023 11:50:45 +0800
Subject: [PATCH] 新增根据account获取phone查询用户信息，取第一个，登录用户信息查询修改，短信发送响应数据修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
index d28a4f1..ad74e6c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
@@ -7,6 +7,8 @@
import cn.gistack.sm.sms.util.SmsUtils;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.redis.cache.BladeRedis;
@@ -58,12 +60,13 @@
request.setTemplateId(templateId);
// 发送操作
String sendMsg = SmsUtils.sendMsg(request);
+ JSONObject jsonObject = JSON.parseObject(sendMsg);
// 记录发送记录操作
saveSendRecord(request, sendMsg);
// 保存验证码到 redis
saveCodeForRedis(request.getUserNumber(), randNumber);
// 返回发送信息
- return R.data(sendMsg);
+ return R.data(jsonObject);
}
// 返回发送信息
return R.fail(400,"该手机号不存在!");
@@ -78,7 +81,7 @@
// 校验手机号码正确性
if (validator(userNumber)){
// 校验该账户是否已注册，通过手机号查询用户是否存在,tenantId 暂时写死，未登陆情况 tenantId 获取不到
- R<List<User>> list = userClient.userInfoByPhone("000000", userNumber);
+ R<List<User>> list = userClient.userInfoByPhoneOrAccount("000000", userNumber);
if (list.getData().size()>0){
return true;
}
--
Gitblit v1.9.3