Merge branch 'master-hutao' into 'master'

短信模板更改为可配模式

See merge request fairylandcloudschool/elearn!5

cloud-system/src/main/java/com/yizhi/system/application/service/impl/SmsSendRecordServiceImpl.java

@@ -4,25 +4,26 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yizhi.application.orm.id.IdGenerator;
+import com.yizhi.application.orm.util.QueryUtil;
 import com.yizhi.core.application.context.ContextHolder;
 import com.yizhi.core.application.context.ContextHolder;
 import com.yizhi.core.application.context.RequestContext;
 import com.yizhi.core.application.context.RequestContext;
 import com.yizhi.core.application.enums.SmsSendBizType;
 import com.yizhi.core.application.enums.SmsSendBizType;
 import com.yizhi.core.application.enums.SmsSendMode;
 import com.yizhi.core.application.enums.SmsSendMode;
 import com.yizhi.core.application.enums.SmsTemplateType;
 import com.yizhi.core.application.enums.SmsTemplateType;
 import com.yizhi.core.application.exception.BizException;
 import com.yizhi.core.application.exception.BizException;
+import com.yizhi.system.application.domain.SmsBatchSend;
+import com.yizhi.system.application.domain.SmsSendRecord;
 import com.yizhi.system.application.mapper.SmsSendRecordMapper;
 import com.yizhi.system.application.mapper.SmsSendRecordMapper;
-import com.yizhi.application.orm.id.IdGenerator;
-import com.yizhi.application.orm.util.QueryUtil;
 import com.yizhi.system.application.service.ISmsBatchSendService;
 import com.yizhi.system.application.service.ISmsBatchSendService;
 import com.yizhi.system.application.service.ISmsSendRecordService;
 import com.yizhi.system.application.service.ISmsSendRecordService;
-import com.yizhi.system.application.domain.SmsBatchSend;
-import com.yizhi.system.application.domain.SmsSendRecord;
 import com.yizhi.system.application.util.SmsUtil;
 import com.yizhi.system.application.util.SmsUtil;
 import com.yizhi.util.application.enums.i18n.Constants;
 import com.yizhi.util.application.enums.i18n.Constants;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -49,7 +50,7 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
     public final static String DEFALAT_SIGN_NAME = "未木云";
     public final static String DEFALAT_SIGN_NAME = "未木云";
     // 默认的短信模板id
     // 默认的短信模板id
     //public final static String DEFALAT_TEMPLATE_CODE = "SMS_152151075";
     //public final static String DEFALAT_TEMPLATE_CODE = "SMS_152151075";
-    public final static String DEFALAT_TEMPLATE_CODE = "SMS_180056909";
+    public  static String DEFALAT_TEMPLATE_CODE;
     // 每分钟最大发送次数
     // 每分钟最大发送次数
     public final static int MAX_SEND_COUNT = 6;
     public final static int MAX_SEND_COUNT = 6;
 
 
@@ -62,6 +63,11 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
     @Autowired
     @Autowired
     private IdGenerator idGenerator;
     private IdGenerator idGenerator;
 
 
+    @Value("${sms.template.code:SMS_180056909}")
+    public void setDefalatTemplateCode(String code){
+        DEFALAT_TEMPLATE_CODE = code;
+    }
+
     /**
     /**
      * 发送短信（可选参数，如果不填使用null）
      * 发送短信（可选参数，如果不填使用null）
      *
      *