mail相关修改

Author: Evan Hu

src/main/java/info/xiaomo/gengine/concurrent/QueueExecutor.java

@@ -7,8 +7,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import info.xiaomo.gengine.concurrent.command.IQueueDriverCommand;
 import info.xiaomo.gengine.concurrent.queue.ICommandQueue;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -18,7 +19,8 @@
  * @date 2015-3-11 下午10:51:20
  */
 @EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
 @Slf4j
 public class QueueExecutor extends ThreadPoolExecutor {
 

src/main/java/info/xiaomo/gengine/logger/AbstractLog.java

@@ -5,7 +5,7 @@
 import java.sql.*;
 import java.util.*;
 import info.xiaomo.gengine.logger.annotation.Column;
-import info.xiaomo.gengine.logger.annotation.Table;
+import info.xiaomo.gengine.logger.annotation.LogTable;
 import info.xiaomo.gengine.logger.desc.ColumnDesc;
 import info.xiaomo.gengine.logger.desc.TableDesc;
 import org.slf4j.Logger;
@@ -16,7 +16,7 @@
  *
  * @author 张力
  */
-@Table(cycle = TableCycle.SINGLE)
+@LogTable(cycle = TableCycle.SINGLE)
 public abstract class AbstractLog implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractLog.class);
@@ -26,18 +26,18 @@ public abstract class AbstractLog implements Runnable {
     void init() throws Exception {
 
         Class<?> clazz = this.getClass();
-        Table table = clazz.getAnnotation(Table.class);
-        if (table == null) {
+        LogTable logTable = clazz.getAnnotation(LogTable.class);
+        if (logTable == null) {
             return;
         }
         TableDesc desc = new TableDesc();
-        desc.setCycle(table.cycle());
-        String tableName = table.tableName();
+        desc.setCycle(logTable.cycle());
+        String tableName = logTable.tableName();
         if ("".equals(tableName)) {
             tableName = clazz.getSimpleName();
         }
         desc.setName(tableName);
-        desc.setPrimaryKey(table.primaryKey());
+        desc.setPrimaryKey(logTable.primaryKey());
 
         // 找出所有父类，父类的属性先遍历，所以将顶级父类放在了列表第一个
         List<Class<?>> clazzList = new ArrayList<>();

…omo/gengine/logger/annotation/Table.java …/gengine/logger/annotation/LogTable.javasrc/main/java/info/xiaomo/gengine/logger/annotation/Table.java renamed to src/main/java/info/xiaomo/gengine/logger/annotation/LogTable.java src/main/java/info/xiaomo/gengine/logger/annotation/Table.java renamed to src/main/java/info/xiaomo/gengine/logger/annotation/LogTable.java

@@ -6,7 +6,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Target(ElementType.TYPE)
-public @interface Table {
+public @interface LogTable {
 
     String primaryKey() default "id";
 

src/main/java/info/xiaomo/gengine/logger/entity/ItemLog.java

@@ -4,10 +4,10 @@
 import info.xiaomo.gengine.logger.FieldType;
 import info.xiaomo.gengine.logger.TableCycle;
 import info.xiaomo.gengine.logger.annotation.Column;
-import info.xiaomo.gengine.logger.annotation.Table;
+import info.xiaomo.gengine.logger.annotation.LogTable;
 
 /** @author xiaomo */
-@Table(tableName = "item_log", primaryKey = "id", cycle = TableCycle.DAY)
+@LogTable(tableName = "item_log", primaryKey = "id", cycle = TableCycle.DAY)
 public class ItemLog extends AbstractLog {
 
     @Column(

…nfo/xiaomo/gengine/mail/MailManager.java …fo/xiaomo/gengine/mail/EMailManager.javasrc/main/java/info/xiaomo/gengine/mail/MailManager.java renamed to src/main/java/info/xiaomo/gengine/mail/EMailManager.java src/main/java/info/xiaomo/gengine/mail/MailManager.java renamed to src/main/java/info/xiaomo/gengine/mail/EMailManager.java

@@ -8,7 +8,7 @@
 import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
-import info.xiaomo.gengine.utils.FileUtil;
+import info.xiaomo.gengine.utils.YamlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,22 +17,22 @@
  *
  * <p>2017年8月22日 下午5:09:21
  */
-public class MailManager {
-    private static final Logger LOGGER = LoggerFactory.getLogger(MailManager.class);
-    private static volatile MailManager mailManager;
-    private MailConfig mailConfig; // 邮件配置
+public class EMailManager {
+    private static final Logger LOGGER = LoggerFactory.getLogger(EMailManager.class);
+    private static volatile EMailManager EMailManager;
+    private EmailConfig emailConfig; // 邮件配置
 
-    private MailManager() {}
+    private EMailManager() {}
 
-    public static MailManager getInstance() {
-        if (mailManager == null) {
-            synchronized (MailManager.class) {
-                if (mailManager == null) {
-                    mailManager = new MailManager();
+    public static EMailManager getInstance() {
+        if (EMailManager == null) {
+            synchronized (EMailManager.class) {
+                if (EMailManager == null) {
+                    EMailManager = new EMailManager();
                 }
             }
         }
-        return mailManager;
+        return EMailManager;
     }
 
     /**
@@ -42,23 +42,23 @@ public static MailManager getInstance() {
      *     <p>2017年8月22日 下午5:18:20
      */
     public void initMailConfig(String configPath) {
-        mailConfig = FileUtil.getConfigXML(configPath, "mailConfig.xml", MailConfig.class);
-        if (mailConfig == null) {
-            LOGGER.warn("{}/mailConfig.xml未找到配置文件", configPath);
-            mailConfig = new MailConfig();
+        emailConfig = YamlUtil.read(configPath + "email.yml", EmailConfig.class);
+        if (emailConfig == null) {
+            LOGGER.warn("{}/emailConfig.xml未找到配置文件", configPath);
+            emailConfig = new EmailConfig();
         }
     }
 
-    public MailConfig getMailConfig() {
-        if (mailConfig == null) {
+    public EmailConfig getMailConfig() {
+        if (emailConfig == null) {
             LOGGER.info("使用默认邮件配置");
-            mailConfig = new MailConfig();
+            emailConfig = new EmailConfig();
         }
-        return mailConfig;
+        return emailConfig;
     }
 
-    public void setMailConfig(MailConfig mailConfig) {
-        this.mailConfig = mailConfig;
+    public void setMailConfig(EmailConfig emailConfig) {
+        this.emailConfig = emailConfig;
     }
 
     /**

…info/xiaomo/gengine/mail/MailConfig.java …nfo/xiaomo/gengine/mail/EmailConfig.javasrc/main/java/info/xiaomo/gengine/mail/MailConfig.java renamed to src/main/java/info/xiaomo/gengine/mail/EmailConfig.java src/main/java/info/xiaomo/gengine/mail/MailConfig.java renamed to src/main/java/info/xiaomo/gengine/mail/EmailConfig.java

@@ -14,7 +14,7 @@
  */
 @Root
 @Data
-public class MailConfig {
+public class EmailConfig {
 
     /** 协议地址 */
     @Element(required = false)

…a/info/xiaomo/gengine/mail/TextMail.java …/info/xiaomo/gengine/mail/TextEmail.javasrc/main/java/info/xiaomo/gengine/mail/TextMail.java renamed to src/main/java/info/xiaomo/gengine/mail/TextEmail.java src/main/java/info/xiaomo/gengine/mail/TextMail.java renamed to src/main/java/info/xiaomo/gengine/mail/TextEmail.java

@@ -8,14 +8,14 @@
  * <p>2017年8月22日 下午5:14:12
  */
 @Data
-public class TextMail implements Runnable {
+public class TextEmail implements Runnable {
 
     /** 标题 */
     private final String title;
     /** 内容 */
     private final String content;
 
-    public TextMail(String title, String content) {
+    public TextEmail(String title, String content) {
         this.title = title;
         this.content = content;
     }

…nfo/xiaomo/mail/BaseMailManagerTest.java …fo/xiaomo/mail/BaseEMailManagerTest.javasrc/test/java/info/xiaomo/mail/BaseMailManagerTest.java renamed to src/test/java/info/xiaomo/mail/BaseEMailManagerTest.java src/test/java/info/xiaomo/mail/BaseMailManagerTest.java renamed to src/test/java/info/xiaomo/mail/BaseEMailManagerTest.java

@@ -1,6 +1,6 @@
 package info.xiaomo.mail;
 
-import info.xiaomo.gengine.mail.MailManager;
+import info.xiaomo.gengine.mail.EMailManager;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -10,11 +10,11 @@
  * <p>2017年8月22日 下午6:02:34
  */
 @Ignore
-public class BaseMailManagerTest {
+public class BaseEMailManagerTest {
 
     @Test
     public void testSendMail() {
-        MailManager.getInstance()
+        EMailManager.getInstance()
                 .sendTextMailAsync(
                         "hh", "dd", "[email protected]", "[email protected]");
         try {