配置

yd-common/pom.xml

@@ -55,5 +55,9 @@
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 </project>
 </project>

yd-common/src/main/java/com/yd/common/enums/CommonEnum.java

@@ -36,6 +36,7 @@ public enum CommonEnum {
     UID_TYPE_EMAIL_VARIABLE("email_variable","邮箱变量表"),
     UID_TYPE_EMAIL_VARIABLE("email_variable","邮箱变量表"),
     UID_TYPE_EMAIL_VARIABLE_GROUP("email_variable_group","变量分组表"),
     UID_TYPE_EMAIL_VARIABLE_GROUP("email_variable_group","变量分组表"),
     UID_TYPE_EMAIL_CONTACT_IMPORT("email_contact_import","邮件联系人导入临时表"),
     UID_TYPE_EMAIL_CONTACT_IMPORT("email_contact_import","邮件联系人导入临时表"),
+    UID_TYPE_EMAIL_TASK("email_task","邮件任务表"),
 
 
     //作用域枚举
     //作用域枚举
     SCOPE_SYS("1","系统级（全局）"),
     SCOPE_SYS("1","系统级（全局）"),

yd-common/src/main/java/com/yd/common/utils/DateUtil.java

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.Date;
 import java.util.Objects;
 import java.util.Objects;
@@ -84,4 +85,16 @@ public class DateUtil {
         LocalDateTime localDateTime = LocalDateTime.parse(timeStr, formatter);
         LocalDateTime localDateTime = LocalDateTime.parse(timeStr, formatter);
         return localDateTime;
         return localDateTime;
     }
     }
+
+    /**
+     * LocalDateTime转成Date
+     * @return
+     */
+    public static Date convertDateByLocalDateTime(LocalDateTime localDateTime){
+        //指定时区（如系统默认时区）
+        ZoneId zoneId = ZoneId.systemDefault();
+        //转换为 ZonedDateTime，再转为 Instant，最后生成 Date
+        Date date = Date.from(localDateTime.atZone(zoneId).toInstant());
+        return date;
+    }
 }
 }

yd-common/src/main/java/com/yd/common/utils/IpUtil.java

+package com.yd.common.utils;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * ip工具类
+ */
+public class IpUtil {
+
+    /**
+     * 获取客户端IP
+     * @return
+     */
+    public static String getClientIp() {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String ip = request.getHeader("X-Forwarded-For");
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("Proxy-Client-IP");
+            }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("WL-Proxy-Client-IP");
+            }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getRemoteAddr();
+            }
+            return ip;
+        } catch (Exception e) {
+            return "unknown";
+        }
+    }
+}