Browse Source

fix:邮件发送配置,excel大小控制

chenjianhua 1 month ago
parent
commit
0c355d8d87

+ 1 - 1
service-base/src/main/java/com/simuwang/base/common/util/EmailUtil.java

@@ -351,7 +351,7 @@ public class EmailUtil {
             properties.put("mail.smtp.host", mailboxInfoDTO.getHost());
             properties.put("mail.smtp.auth", true);
             properties.setProperty("mail.smtp.port", mailboxInfoDTO.getPort());
-            properties.put("mail.smtp.ssl.enable", true);
+            properties.put("mail.smtp.ssl.enable", !StringUtil.isEmpty(mailboxInfoDTO.getSsl()));
             properties.put("mail.smtp.ssl.required", false);
             // 根据邮件的会话属性构造一个发送邮件的Session,
             JakartaUserPassAuthenticator authenticator = new JakartaUserPassAuthenticator(mailboxInfoDTO.getAccount(), mailboxInfoDTO.getPassword());

+ 4 - 0
service-base/src/main/java/com/simuwang/base/common/util/ExcelUtil.java

@@ -410,6 +410,7 @@ public class ExcelUtil {
                 cell.setCellValue(title.get(i));
                 cell.setCellStyle(style);
             }
+            int count = 65500;
             List<List<String>> values = valueMap.get(sheetName);
             //创建内容
             for (int i = 0; i < values.size(); i++) {
@@ -418,6 +419,9 @@ public class ExcelUtil {
                     //将内容按顺序赋给对应的列对象
                     row.createCell(j).setCellValue(values.get(i).get(j));
                 }
+                if(i > count){
+                    break;
+                }
             }
         } catch (Exception e) {
             logger.error(e.getMessage(), e);

+ 5 - 0
service-base/src/main/java/com/simuwang/base/pojo/dto/MailboxInfoDTO.java

@@ -35,4 +35,9 @@ public class MailboxInfoDTO {
      */
     private String protocol;
 
+    /**
+     * 协议
+     */
+    private String ssl;
+
 }

+ 1 - 0
service-manage/src/main/java/com/simuwang/manage/service/impl/CompanyEmailConfigServiceImpl.java

@@ -202,6 +202,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
         dto.setPassword(sysConfigMapper.selectConfigByKey("sender.password"));
         dto.setPort(sysConfigMapper.selectConfigByKey("sender.port"));
         dto.setHost(sysConfigMapper.selectConfigByKey("sender.host"));
+        dto.setSsl(sysConfigMapper.selectConfigByKey("sender.ssl"));
         return dto;
     }
 

+ 1 - 0
service-manage/src/main/java/com/simuwang/manage/task/SendDeletionEmailTask.java

@@ -178,6 +178,7 @@ public class SendDeletionEmailTask {
         dto.setPassword(sysConfigMapper.selectConfigByKey("sender.password"));
         dto.setPort(sysConfigMapper.selectConfigByKey("sender.port"));
         dto.setHost(sysConfigMapper.selectConfigByKey("sender.host"));
+        dto.setSsl(sysConfigMapper.selectConfigByKey("sender.ssl"));
         return dto;
     }
     private EmailTaskInfoDO startEmailTask(String email,Integer taskStatus) {