调整测试短信节点

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControlPick/OrderCargoControlPickServiceImpl.java

@@ -1245,7 +1245,7 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
         reqDTO.setMobile(consignorPhone);
         reqDTO.setUserId(consignorCustomerId);
         reqDTO.setNodeValue(nodeValue);
-        reqDTO.setIsTransport(SmsIsTransportEnum.SMS_ORDERS_0.getValue());
+        reqDTO.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_0.getValue());
         reqDTO.setTransportId(TransportTypeEnum.OTHER.getValue());
         reqDTO.setIsOrders(SmsIsOrdersEnum.SMS_ORDERS_0.getValue());
         reqDTO.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());
@@ -1265,7 +1265,7 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
         reqDTO.setMobile(consigneePhone);
         reqDTO.setUserId(consigneeCustomerId);
         reqDTO.setNodeValue(nodeValue);
-        reqDTO.setIsTransport(SmsIsTransportEnum.SMS_ORDERS_0.getValue());
+        reqDTO.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_0.getValue());
         reqDTO.setTransportId(TransportTypeEnum.OTHER.getValue());
         reqDTO.setIsOrders(SmsIsOrdersEnum.SMS_ORDERS_0.getValue());
         reqDTO.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -2351,7 +2351,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
             reqDTO.setUserId(consignorCustomerId);
             reqDTO.setMobile(consignorPhone);
             reqDTO.setAreaCode(consignorCountryCode);
-            reqDTO.setIsTransport(SmsIsTransportEnum.SMS_ORDERS_1.getValue());
+            reqDTO.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_1.getValue());
             reqDTO.setTransportId(orderDO.getTransportId());
             reqDTO.setIsOrders(SmsIsOrdersEnum.SMS_ORDERS_0.getValue());
             reqDTO.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());
@@ -2408,7 +2408,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         reqDTO.setUserId(cargoControlCustomerId);
                         reqDTO.setMobile(cargoControlPhone);
                         reqDTO.setAreaCode(cargoControlCode);
-                        reqDTO.setIsTransport(SmsIsTransportEnum.SMS_ORDERS_1.getValue());
+                        reqDTO.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_1.getValue());
                         reqDTO.setTransportId(orderDO.getTransportId());
                         reqDTO.setIsOrders(SmsIsOrdersEnum.SMS_ORDERS_0.getValue());
                         reqDTO.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());
@@ -2455,7 +2455,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                     reqDTO.setUserId(consignorCustomerId);
                     reqDTO.setMobile(consignorPhone);
                     reqDTO.setAreaCode(consignorCountryCode);
-                    reqDTO.setIsTransport(SmsIsTransportEnum.SMS_ORDERS_1.getValue());
+                    reqDTO.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_1.getValue());
                     reqDTO.setTransportId(orderDO.getTransportId());
                     reqDTO.setIsOrders(SmsIsOrdersEnum.SMS_ORDERS_0.getValue());
                     reqDTO.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());
@@ -2497,7 +2497,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                             reqDTO2.setUserId(consigneeCustomerId);
                             reqDTO2.setMobile(consigneePhone);
                             reqDTO2.setAreaCode(consigneeCountryCode);
-                            reqDTO2.setIsTransport(SmsIsTransportEnum.SMS_ORDERS_1.getValue());
+                            reqDTO2.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_1.getValue());
                             reqDTO2.setTransportId(orderDO.getTransportId());
                             reqDTO2.setIsOrders(SmsIsOrdersEnum.SMS_ORDERS_0.getValue());
                             reqDTO2.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1763,7 +1763,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                     reqDTO.setUserId(0L);
                     reqDTO.setMobile(phone);
                     reqDTO.setAreaCode(areaCode);
-                    reqDTO.setIsTransport(SmsIsTransportEnum.SMS_ORDERS_1.getValue());
+                    reqDTO.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_1.getValue());
                     reqDTO.setTransportId(Integer.valueOf(boxDO.getTransportType()));
                     reqDTO.setIsOrders(isOrders);
                     reqDTO.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsIsTransportEnum.java

@@ -12,8 +12,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum SmsIsTransportEnum {
 
-    SMS_ORDERS_0("否", 0),
-    SMS_ORDERS_1("是", 1);
+    SMS_IS_TRANSPORT_0("否", 0),
+    SMS_IS_TRANSPORT_1("是", 1);
 
     private final String name;
 

yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsNodeController.java

@@ -102,9 +102,9 @@ public class SmsNodeController {
         ExcelUtils.write(response, "短信节点.xls", "数据", SmsNodeBackVO.class, datas);
     }
 
-    @GetMapping("/test")
+    @PostMapping("/test")
     @ApiOperation("测试短信节点")
-    public CommonResult<Boolean> test(@Valid SmsNodeTestVO smsNodeTestVO) {
+    public CommonResult<Boolean> test(@Valid @RequestBody SmsNodeTestVO smsNodeTestVO) {
         smsSendService.sendSingleSmsV2(smsNodeTestVO.getMobile(), SecurityFrameworkUtils.getLoginUserId(), UserTypeEnum.ADMIN.getValue(), smsNodeTestVO.getNodeValue(),
                 smsNodeTestVO.getCountryCode(), smsNodeTestVO.getIsOrders(), smsNodeTestVO.getIsTransport(), smsNodeTestVO.getTransportId(),
                 smsNodeTestVO.getMessageType(), smsNodeTestVO.getTemplateParams(), null, smsNodeTestVO.getNodeTemplateSn());

yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/job/sms/SmsReceiveJob.java

@@ -4,9 +4,10 @@ import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.module.system.service.sms.SmsNodeService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 
 /**
  * 短信接收 Job
@@ -18,7 +19,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 public class SmsReceiveJob implements JobHandler {
 
-    @Autowired
+    @Resource
     private SmsNodeService smsNodeService;
     @Override
     public String execute(String time) {