From c564930d687e421e4e35d7fcafadc6d11ff23b9c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 十一月 2024 19:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 0eaf607..71006ef 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
@@ -1,5 +1,6 @@
package com.ruoyi.chargingPile.controller;
+import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.model.TChargingPile;
@@ -10,14 +11,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 +40,7 @@
* @return 结果
*/
@ApiOperation(value = "获取验证码",notes = "获取验证码",tags = {"更换手机号获取验证码"})
- @GetMapping("getCode")
+ @GetMapping("/getCode")
public AjaxResult getCode(@RequestParam("phone") String phone)
{
TAppUser appUser = appUserClient.selectByPhone(phone).getData();
@@ -43,10 +49,15 @@
}
String code = MsgUtil.createCode();
redisService.setCacheObject(phone+ Constants.UPDATE_PHONE,code,5L, TimeUnit.MINUTES);
- String reqStr = MsgUtil.codeMsg(phone, code);
- String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(phone);
+ sendMessageDTO.setCode(code);
+ sendMessageDTO.setType(1);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
+// 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);
}
@@ -56,16 +67,21 @@
* @param phone 手机号
* @return 结果
*/
- @ApiOperation(value = "获取验证码",notes = "获取验证码",tags = {"申请建桩"})
- @GetMapping("getApplyCode")
+ @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);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(phone);
+ sendMessageDTO.setCode(code);
+ sendMessageDTO.setType(2);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
+// String reqStr = MsgUtil.applyCodeMsg(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);
}
--
Gitblit v1.7.1