浏览代码

bugFix 邮件格式不对的问题

xiahan 10 月之前
父节点
当前提交
29fcc1e2ce

+ 3 - 0
bs-common/src/main/java/com/rongwei/safecommon/fegin/CXCommonFeginClient.java

@@ -22,6 +22,9 @@ public interface CXCommonFeginClient {
     @PostMapping("/mail/sendHtmlMail")
     R sendHtmlMail(@RequestBody MailDo Mail);
 
+    @PostMapping("/mail/sendTextMail")
+    R sendTextMail(@RequestBody MailDo Mail);
+
     @PostMapping("ws/socket/push/app")
     R pushToWeb(@RequestParam String cid, @RequestParam(required = false) String message);
 

+ 2 - 3
bs-common/src/main/java/com/rongwei/safecommon/utils/CXCommonUtils.java

@@ -13,7 +13,6 @@ import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.rwcommon.vo.CriteriaQuery;
 import com.rongwei.rwcommon.vo.MailDo;
 import com.rongwei.rwcommon.vo.generalsql.BatchSaveVo;
 import com.rongwei.rwcommon.vo.generalsql.GeneralInsertVo;
@@ -79,8 +78,8 @@ public class CXCommonUtils {
      * 发送邮件
      * @param mailDo
      */
-    public static void sendHtmlMail(MailDo mailDo){
-        commonFeginClient.sendHtmlMail(mailDo);
+    public static void sendTextMail(MailDo mailDo){
+        commonFeginClient.sendTextMail(mailDo);
     }
 
     /**

+ 1 - 4
cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/UrgingService.java

@@ -7,9 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
-import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.ORDEROUTTIME_AUDIT_CONTENT;
-import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.ORDEROUTTIMEAUDIT_TITLE;
-
 /**
  * UrgingService class
  *
@@ -34,7 +31,7 @@ public interface UrgingService {
         mailDo.setCcEmail(new String[]{});
         mailDo.setSubject(title);
         mailDo.setContent(content);
-        CXCommonUtils.sendHtmlMail(mailDo);
+        CXCommonUtils.sendTextMail(mailDo);
     }
 
     /**

+ 1 - 3
cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SpecialEquipmentUrgingServiceImpl.java

@@ -32,9 +32,7 @@ import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.SPECIALEQUIPM
  */
 @Service
 public class SpecialEquipmentUrgingServiceImpl implements UrgingService {
-    public static final String MAIL_CONTENT = "  您好!【%s】提醒您,有如下特种设备即将年检到期,请尽快处理!\n" +
-            " %s " +
-            "  详见安全生产平台,如果无法点击请复制链接到浏览器中:http://192.168.100.78/#/page/lr/9329c07dd31b4b8b95d4decaa021adc3";
+    public static final String MAIL_CONTENT = "  您好!【%s】提醒您,有如下特种设备即将年检到期,请尽快处理!\n    %s  详见安全生产平台,如果无法点击请复制链接到浏览器中:http://192.168.100.78/#/page/lr/9329c07dd31b4b8b95d4decaa021adc3";
     public static final String MAIL_CONTENT_ITEM = "  %d、设备类型:【%s】,设备编号:【%s】,设备名称:【%s】,检验日期:【%tF】";
     public static final List<String> ROLE_CODE_LIST = new ArrayList<String>() {{
         add("code-safe");