From 472fc1b5980db8cd69c77a5c1bcb8aded3d3b3a6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 十一月 2024 19:05:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/CodeController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 3a24689..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;
@@ -48,8 +49,13 @@
}
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,-1,-1,phone,"验证码："+code+"，用于更换手机号。请勿转发。");
return AjaxResult.success(result);
@@ -67,8 +73,13 @@
{
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,-1,-1,phone,"验证码："+code+"，用于申请建桩。请勿转发。");
return AjaxResult.success(result);
--
Gitblit v1.7.1