|
@@ -6,7 +6,6 @@ import cn.hutool.core.map.MapUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.extra.mail.JakartaUserPassAuthenticator;
|
|
import cn.hutool.extra.mail.JakartaUserPassAuthenticator;
|
|
import com.smppw.modaq.common.conts.EmailTypeConst;
|
|
import com.smppw.modaq.common.conts.EmailTypeConst;
|
|
-import com.smppw.modaq.common.conts.PatternConsts;
|
|
|
|
import com.smppw.modaq.common.enums.ReportType;
|
|
import com.smppw.modaq.common.enums.ReportType;
|
|
import com.smppw.modaq.domain.dto.MailboxInfoDTO;
|
|
import com.smppw.modaq.domain.dto.MailboxInfoDTO;
|
|
import com.sun.mail.imap.IMAPStore;
|
|
import com.sun.mail.imap.IMAPStore;
|
|
@@ -23,7 +22,6 @@ import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.Properties;
|
|
import java.util.Properties;
|
|
-import java.util.regex.Matcher;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @author mozuwen
|
|
* @author mozuwen
|
|
@@ -294,12 +292,12 @@ public class EmailUtil {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- // 特殊月报识别规则(没有月报或月度等关键字的月报)
|
|
|
|
- Matcher monthMatcher = PatternConsts.MONTHLY_PATTERN.matcher(subject);
|
|
|
|
- Matcher dayMatcher = PatternConsts.DAY_PATTERN.matcher(subject);
|
|
|
|
- if (monthMatcher.find() && !dayMatcher.find()) {
|
|
|
|
- return EmailTypeConst.REPORT_EMAIL_TYPE;
|
|
|
|
- }
|
|
|
|
|
|
+// // 特殊月报识别规则(没有月报或月度等关键字的月报)
|
|
|
|
+// Matcher monthMatcher = PatternConsts.MONTHLY_PATTERN.matcher(subject);
|
|
|
|
+// Matcher dayMatcher = PatternConsts.DAY_PATTERN.matcher(subject);
|
|
|
|
+// if (monthMatcher.find() && !dayMatcher.find()) {
|
|
|
|
+// return EmailTypeConst.REPORT_EMAIL_TYPE;
|
|
|
|
+// }
|
|
return EmailTypeConst.NAV_EMAIL_TYPE;
|
|
return EmailTypeConst.NAV_EMAIL_TYPE;
|
|
}
|
|
}
|
|
|
|
|