opt;

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/constant/SmsEnum.java

@@ -6,7 +6,21 @@ public class SmsEnum {
      * 短信签名
      */
     public enum ADSignName {
-        摩登天空,正在现场,新血计划,摩登小家伙,五百里Live;
+        M01("摩登天空"),
+        M02("正在现场"),
+        M03("新血计划"),
+        M04("摩登小家伙"),
+        M05("五百里Live")
+        ;
+        private final String val;
+
+        ADSignName(String val) {
+            this.val = val;
+        }
+
+        public String getVal() {
+            return val;
+        }
     }
 
     /**

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -5,13 +5,11 @@ import com.aliyuncs.dypnsapi.model.v20170525.GetMobileRequest;
 import com.aliyuncs.dypnsapi.model.v20170525.GetMobileResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
-import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.common.sms.constant.SmsEnum;
 import com.liquidnet.common.sms.processor.SmsProcessor;
 import com.liquidnet.commons.lang.constant.LnsEnum;
@@ -25,7 +23,6 @@ import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.base.SmsMessage;
 import com.liquidnet.service.base.UserPathDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -176,7 +173,7 @@ public class AdamLoginController {
 //            rabbitTemplate.convertAndSend(MQConst.EX_LNS_SMS_SENDER, MQConst.RK_SMS_CODE, smsMessage.toJson());
             ObjectNode msgNode = JsonUtils.OM().createObjectNode();
             msgNode.put("code", smsCode);
-            smsProcessor.aliyunDysmsSend(mobile, SmsEnum.ADSignName.正在现场.name(), SmsEnum.ADTemplate.SMS_109535335.name(), msgNode.asText());
+            smsProcessor.aliyunDysmsSend(mobile, SmsEnum.ADSignName.M02.getVal(), SmsEnum.ADTemplate.SMS_109535335.name(), msgNode.asText());
 
             adamRdmService.setSmsCodeByMobile(mobile, smsCode);
             return ResponseDto.success();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -15,8 +15,6 @@ import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -860,7 +858,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 if (null != adTemplate) {
                     rabbitTemplate.convertAndSend(MQConst.EX_LNS_SMS_SENDER, MQConst.RK_SMS_NOTICE,
                             SmsMessage.builder().setPhone(orderTicketData.getUserMobile())
-                                    .setSignName(SmsEnum.ADSignName.正在现场.name())
+                                    .setSignName(SmsEnum.ADSignName.M02.getVal())
                                     .setTemplateCode(adTemplate.name())
                                     .setTemplateParam("name", orderTicketData.getPerformanceTitle())
                                     .setTemplateParam("time", time1 + " " + time2).toJson()