From 3045b571a86eedc5d5cc9e51f1c086d1090071de Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Fri, 3 Jul 2020 07:52:48 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20Main,=20SpringCQApplication=20?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=85=E4=B8=8ESpringCQ=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84Spring=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81,=20?=
 =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=88=B0SpringCQApplication;=20[Delete]=20CQ?=
 =?UTF-8?q?PluginMain=20=E7=A7=BB=E9=99=A4=E6=B3=A8=E9=87=8A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/lamgc/cgj/Main.java                        | 5 -----
 .../java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java | 2 --
 .../lamgc/cgj/bot/framework/coolq/SpringCQApplication.java   | 5 +++--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java
index 0ff5cbe..e501d3a 100644
--- a/src/main/java/net/lamgc/cgj/Main.java
+++ b/src/main/java/net/lamgc/cgj/Main.java
@@ -25,20 +25,15 @@ import org.apache.http.util.EntityUtils;
 import org.apache.tomcat.util.http.fileupload.util.Streams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-@SpringBootApplication
 public class Main {
 
     private final static Logger log = LoggerFactory.getLogger(Main.class);
diff --git a/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
index 546f3e2..62daac5 100644
--- a/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
@@ -18,8 +18,6 @@ import org.springframework.stereotype.Component;
 public class CQPluginMain extends CQPlugin implements EventHandler {
 
     public CQPluginMain() {
-        // TODO(LamGC, 2020.04.21): SpringCQ无法适配MessageSenderBuilder
-        // MessageSenderBuilder.setCurrentMessageSenderFactory(new SpringCQMessageSenderFactory());
         ApplicationBoot.initialBot();
         LoggerFactory.getLogger(CQPluginMain.class)
                 .info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX);
diff --git a/src/main/java/net/lamgc/cgj/bot/framework/coolq/SpringCQApplication.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/SpringCQApplication.java
index 0e4ae0b..d21abc1 100644
--- a/src/main/java/net/lamgc/cgj/bot/framework/coolq/SpringCQApplication.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/SpringCQApplication.java
@@ -1,11 +1,11 @@
 package net.lamgc.cgj.bot.framework.coolq;
 
 import com.google.common.base.Strings;
-import net.lamgc.cgj.Main;
 import net.lamgc.cgj.bot.boot.BotGlobal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.event.ApplicationFailedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@SpringBootApplication
 public class SpringCQApplication {
 
     private final static Logger log = LoggerFactory.getLogger(SpringCQApplication.class);
@@ -32,7 +33,7 @@ public class SpringCQApplication {
         }
         String[] args = new String[argsList.size()];
         argsList.toArray(args);
-        ConfigurableApplicationContext context = SpringApplication.run(Main.class, args);
+        ConfigurableApplicationContext context = SpringApplication.run(SpringCQApplication.class, args);
         registerShutdownHook(context);
         try {
             synchronized (quitLock) {