LamGC/ContentGrabbingJi
1
0
Fork 0
mirror of https://github.com/LamGC/ContentGrabbingJi.git synced 2025-04-30 06:37:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Change] Main, SpringCQApplication 移除仅与SpringCQ相关的Spring相关代码, 转移到SpringCQApplication;

Browse Source 
[Delete] CQPluginMain 移除注释信息;
This commit is contained in:
LamGC 2020-07-03 07:52:48 +08:00
parent 553212e556
commit 3045b571a8
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/lamgc/cgj/Main.java
View File

@ -25,20 +25,15 @@ import org.apache.http.util.EntityUtils;
import org.apache.tomcat.util.http.fileupload.util.Streams; import org.apache.tomcat.util.http.fileupload.util.Streams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
@SpringBootApplication
public class Main { public class Main {
private final static Logger log = LoggerFactory.getLogger(Main.class); private final static Logger log = LoggerFactory.getLogger(Main.class);

2
src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
View File

@ -18,8 +18,6 @@ import org.springframework.stereotype.Component;
public class CQPluginMain extends CQPlugin implements EventHandler { public class CQPluginMain extends CQPlugin implements EventHandler {
public CQPluginMain() { public CQPluginMain() {
// TODO(LamGC, 2020.04.21): SpringCQ无法适配MessageSenderBuilder
// MessageSenderBuilder.setCurrentMessageSenderFactory(new SpringCQMessageSenderFactory());
ApplicationBoot.initialBot(); ApplicationBoot.initialBot();
LoggerFactory.getLogger(CQPluginMain.class) LoggerFactory.getLogger(CQPluginMain.class)
.info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX); .info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX);

5
src/main/java/net/lamgc/cgj/bot/framework/coolq/SpringCQApplication.java
View File

@ -1,11 +1,11 @@
package net.lamgc.cgj.bot.framework.coolq; package net.lamgc.cgj.bot.framework.coolq;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import net.lamgc.cgj.Main;
import net.lamgc.cgj.bot.boot.BotGlobal; import net.lamgc.cgj.bot.boot.BotGlobal;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationFailedEvent;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
@ -16,6 +16,7 @@ import java.util.ArrayList;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@SpringBootApplication
public class SpringCQApplication { public class SpringCQApplication {
private final static Logger log = LoggerFactory.getLogger(SpringCQApplication.class); private final static Logger log = LoggerFactory.getLogger(SpringCQApplication.class);
@ -32,7 +33,7 @@ public class SpringCQApplication {
} }
String[] args = new String[argsList.size()]; String[] args = new String[argsList.size()];
argsList.toArray(args); argsList.toArray(args);
ConfigurableApplicationContext context = SpringApplication.run(Main.class, args); ConfigurableApplicationContext context = SpringApplication.run(SpringCQApplication.class, args);
registerShutdownHook(context); registerShutdownHook(context);
try { try {
synchronized (quitLock) { synchronized (quitLock) {