From 4cffe5990df6e39ba23255ae6b834e35a763835a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 三月 2026 14:11:26 +0800
Subject: [PATCH] 短信更换

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java                                 |    2 +-
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java |    2 +-
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java                |    3 ++-
 UserOKTravel/guns-admin/pom.xml                                                                                              |    6 ++++++
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java                              |   11 +++--------
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java               |    6 +++---
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java                |    3 ++-
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java                                   |    4 ++--
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java  |    2 +-
 9 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index a0a4369..d73f7dc 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -243,7 +243,7 @@
             String templateCode = null;
             // 生成四位数数字验证码
             String code = String.valueOf((int)((Math.random()*9+1)*1000));
-            redisUtil.setStrValue(driver.getPhone(),code);
+            redisUtil.setStrValue(driver.getPhone(),code,5 * 60);
             switch (type){
                 case 1:
                     templateCode = "SMS_333555212";//身份验证
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index f9ed373..f04c225 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -403,7 +403,7 @@
         orderLogistics.setPickUpCode(random);
         this.updateById(orderLogistics);
         //发送短信
-        aLiSendSms.sendSms(orderLogistics.getRecipientPhone(), "SMS_240075144", "{\"code\":\"" + random + "\"}");
+//        aLiSendSms.sendSms(orderLogistics.getRecipientPhone(), "SMS_240075144", "{\"code\":\"" + random + "\"}");
     }
 
     @Override
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index a5fd6a4..49f0fd5 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -266,7 +266,7 @@
         try{
             UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
 
-            String sData = aLiSendSms.sendSms(orderPrivateCar.getPassengersPhone(), "SMS_244480455", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" +carService.selectById(orderPrivateCar.getCarId()) .getCarLicensePlate() + "\",}");
+//            String sData = aLiSendSms.sendSms(orderPrivateCar.getPassengersPhone(), "SMS_244480455", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" +carService.selectById(orderPrivateCar.getCarId()) .getCarLicensePlate() + "\",}");
         }catch (Exception e){
 
         }
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 81e4c4f..80bee3d 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -183,7 +183,8 @@
 //            return ResultUtil.error("");
 //        }
 //        System.out.println(sms);
-        MsgUtil.Send_Post(phone, authCode);
+        String s = aLiSendSms.sendSms(phone, "SMS_333555212", "{\"code\":\""+authCode+"\"}");
+//        MsgUtil.Send_Post(phone, authCode);
         return ResultUtil.success();
     }
 
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 92543e2..9dc3e5a 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -303,8 +303,8 @@
 			UserInfo userInfo = userInfoMapper.selectById(orderTaxi.getUserId());
 //            String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_244480455", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" +carService.selectById(orderTaxi.getCarId()) .getCarLicensePlate() + "\",}");
 			Car car = carService.selectById(driver.getCarId());
-			String s = MsgUtil.SendDriverPost(orderTaxi.getPassengersPhone(), car.getCarLicensePlate(), driver.getName(), driver.getPhone());
-			System.err.println("====电话回调===" + s);
+//			String s = MsgUtil.SendDriverPost(orderTaxi.getPassengersPhone(), car.getCarLicensePlate(), driver.getName(), driver.getPhone());
+//			System.err.println("====电话回调===" + s);
 		} catch (Exception e) {
 			return ResultUtil.error("抢单失败");
 		} finally {
@@ -397,7 +397,7 @@
 //发送短信
 		try {
 			UserInfo userInfo = userInfoMapper.selectById(orderTaxi.getUserId());
-			String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_244480455", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" + carService.selectById(orderTaxi.getCarId()).getCarLicensePlate() + "\",}");
+//			String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_244480455", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" + carService.selectById(orderTaxi.getCarId()).getCarLicensePlate() + "\",}");
 			
 		} catch (Exception e) {
 		
diff --git a/UserOKTravel/guns-admin/pom.xml b/UserOKTravel/guns-admin/pom.xml
index cef8ad1..e32e9db 100644
--- a/UserOKTravel/guns-admin/pom.xml
+++ b/UserOKTravel/guns-admin/pom.xml
@@ -189,6 +189,12 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+        <!--华为云的obs-->
+        <dependency>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>esdk-obs-java</artifactId>
+            <version>3.19.5</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 02e505d..e4dbe57 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -156,7 +156,8 @@
 //        System.out.println(sms);
         System.err.println("222222");
 
-        String s = MsgUtil.Send_Post(phone, authCode);
+        String s = aLiSendSms.sendSms(phone, "SMS_333555212", "{\"code\":\""+authCode+"\"}");
+//        String s = MsgUtil.Send_Post(phone, authCode);
         System.err.println(s);
 
         return ResultUtil.success();
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
index 6a5746a..ab7f718 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
@@ -1,18 +1,13 @@
 package com.stylefeng.guns.modular.system.util;
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.Protocol;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.S3ClientOptions;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.PutObjectResult;
+import com.obs.services.ObsClient;
+import com.obs.services.model.ObjectMetadata;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.UUID;
 
 public class OssUploadUtil {
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 7ca02fb..25b7549 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -121,8 +121,8 @@
         for (OrderTaxi orderTaxi : list) {
             orderTaxi.setState(10);
             if (StringUtils.hasLength(orderTaxi.getPassengersPhone())) {
-                String s = MsgUtil.SendUserCancel(orderTaxi.getPassengersPhone());
-                log.info("取消订单id:" + orderTaxi.getId() + ",短信发送状态:" + s);
+//                String s = MsgUtil.SendUserCancel(orderTaxi.getPassengersPhone());
+//                log.info("取消订单id:" + orderTaxi.getId() + ",短信发送状态:" + s);
             }
             orderTaxiService.updateById(orderTaxi);
         }

--
Gitblit v1.7.1