From 0e1004894fd801da35c5815845fc737f384f9a70 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java
index 14b8403..3a24689 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java
@@ -10,14 +10,19 @@
import com.ruoyi.common.core.utils.MsgUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.redis.service.RedisService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
+@RestController
+@RequestMapping("/code")
public class CodeController {
@Autowired
@@ -34,7 +39,7 @@
* @return 结果
*/
@ApiOperation(value = "获取验证码",notes = "获取验证码",tags = {"更换手机号获取验证码"})
- @GetMapping("getCode")
+ @GetMapping("/getCode")
public AjaxResult getCode(@RequestParam("phone") String phone)
{
TAppUser appUser = appUserClient.selectByPhone(phone).getData();
@@ -42,11 +47,30 @@
return AjaxResult.error("该手机号已绑定账号");
}
String code = MsgUtil.createCode();
- redisService.setCacheObject(phone+ Constants.APPLET,code,5L, TimeUnit.MINUTES);
+ redisService.setCacheObject(phone+ Constants.UPDATE_PHONE,code,5L, TimeUnit.MINUTES);
String reqStr = MsgUtil.codeMsg(phone, code);
String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
// 记录短信发送
- chargingPileNotificationService.saveData(1,null,null,phone,"验证码："+code+"，用于更换手机号。请勿转发。");
+ chargingPileNotificationService.saveData(1,-1,-1,phone,"验证码："+code+"，用于更换手机号。请勿转发。");
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 获取验证码
+ *
+ * @param phone 手机号
+ * @return 结果
+ */
+ @ApiOperation(value = "获取验证码",notes = "获取验证码",tags = {"申请建桩获取验证码"})
+ @GetMapping("/getApplyCode")
+ public AjaxResult getApplyCode(@RequestParam("phone") String phone)
+ {
+ String code = MsgUtil.createCode();
+ redisService.setCacheObject(phone+ Constants.APPLY_CHARGING,code,5L, TimeUnit.MINUTES);
+ String reqStr = MsgUtil.applyCodeMsg(phone, code);
+ String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ // 记录短信发送
+ chargingPileNotificationService.saveData(1,-1,-1,phone,"验证码："+code+"，用于申请建桩。请勿转发。");
return AjaxResult.success(result);
}
--
Gitblit v1.7.1