发送短信或邮件

src/main/java/com/fdkankan/agent/config/AgentConfig.java

@@ -18,4 +18,7 @@ public class AgentConfig {
 
     @Value("${agent.task.auth-exp-msg}")
     private String authExpMsg;
+
+    @Value("${agent.task.auth-exp-day}")
+    private Integer authExpDay;
 }

src/main/java/com/fdkankan/agent/service/impl/AgentAuthorizeModelingServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.common.PageInfo;
 import com.fdkankan.agent.common.util.DateUtils;
+import com.fdkankan.agent.config.AgentConfig;
 import com.fdkankan.agent.entity.AgentAuthorizeModeling;
 import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.entity.IncrementUseType;
@@ -91,11 +92,13 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
     @Autowired
     IMailTemplateService mailTemplateService;
 
+    @Autowired
+    AgentConfig agentConfig;
     @Override
     public void checkExpTime() {
         LambdaQueryWrapper<AgentAuthorizeModeling> wrapper = new LambdaQueryWrapper<>();
         wrapper.isNotNull(AgentAuthorizeModeling::getAuthorizeEndTime);
-        wrapper.eq(AgentAuthorizeModeling::getAuthorizeEndTime,DateUtils.getPlusDay(7));
+        wrapper.eq(AgentAuthorizeModeling::getAuthorizeEndTime,DateUtils.getPlusDay(agentConfig.getAuthExpDay()));
         List<AgentAuthorizeModeling> list = this.list(wrapper);
         HashSet<Integer> agentIds = new HashSet<>();
         for (AgentAuthorizeModeling agentAuthorizeModeling : list) {

src/main/java/com/fdkankan/agent/service/impl/MailTemplateServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.agent.util.SendMailUtils;
 import com.fdkankan.sms.SmsService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -42,11 +43,20 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
 
     @Override
     public void sendAuthExpMail(String userName) {
+        MailTemplate mailTemplate = this.getTemplate(11);
+        if(mailTemplate != null){
+            String msg = mailTemplate.getMsg();
+            if(StringUtils.isNotBlank(msg)){
+                msg = msg.replace("{day}",agentConfig.getAuthExpDay().toString());
+            }
+            mailTemplate.setMsg(msg);
+        }
         try {
+
             if(agentConfig.getActive().contains("eur")){
-                sendMail(userName,this.getTemplate(11),null);
+                sendMail(userName,,null);
             }else {
-                smsService.sendSms(userName, "", agentConfig.getSmsTemplateCode());
+                smsService.sendSms(userName, agentConfig.getAuthExpDay().toString(), agentConfig.getSmsTemplateCode());
             }
         }catch (Exception e){
             log.info("发送邮件或短信失败:{}",userName);