阻止模块被 SpringContext 扫描加载，我们手动加载他们

PBH-BTN · Aug 17, 2024 · 0861089 · 0861089
1 parent 469fd4f
commit 0861089
Show file tree

Hide file tree

Showing 30 changed files with 98 additions and 41 deletions.
diff --git a/src/main/java/com/ghostchu/peerbanhelper/AppConfig.java b/src/main/java/com/ghostchu/peerbanhelper/AppConfig.java
@@ -1,5 +1,6 @@
 package com.ghostchu.peerbanhelper;
 
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.simplereloadlib.ReloadManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
@@ -9,7 +10,7 @@
 import java.io.File;
 
 @Configuration
-@ComponentScan("com.ghostchu.peerbanhelper")
+@ComponentScan(value = "com.ghostchu.peerbanhelper", excludeFilters = @ComponentScan.Filter(IgnoreScan.class))
 @Slf4j
 public class AppConfig {
     @Bean

diff --git a/src/main/java/com/ghostchu/peerbanhelper/config/MainConfigUpdateScript.java b/src/main/java/com/ghostchu/peerbanhelper/config/MainConfigUpdateScript.java
@@ -25,6 +25,11 @@ private void validate() {
 //        }
     }
 
+    @UpdateScript(version = 17)
+    public void windowsEcoQoSApi() {
+        conf.set("performance.windows-ecoqos-api", true);
+    }
+
     @UpdateScript(version = 16)
     public void fixNonProxyHosts() {
         if (!conf.isSet("proxy.non-proxy-hosts")) {

diff --git a/...ain/java/com/ghostchu/peerbanhelper/database/dao/impl/ProgressCheatBlockerPersistDao.java b/...ain/java/com/ghostchu/peerbanhelper/database/dao/impl/ProgressCheatBlockerPersistDao.java
@@ -50,36 +50,36 @@ public List<ProgressCheatBlocker.ClientTask> fetchFromDatabase(ProgressCheatBloc
     public void flushDatabase(List<ProgressCheatBlocker.ClientTaskRecord> records) throws SQLException {
         callBatchTasks(() -> {
             records.forEach(record -> {
-                    String torrentId = record.client().getTorrentId();
-                    record.task().forEach(task -> {
-                        try {
-                            var entity = findExists(task.getPeerIp(), torrentId);
-                            if (entity == null) {
-                                entity = new ProgressCheatBlockerPersistEntity(null,
-                                        task.getPeerIp(),
-                                        torrentId,
-                                        task.getLastReportProgress(),
-                                        task.getLastReportUploaded(),
-                                        task.getTrackingUploadedIncreaseTotal(),
-                                        task.getRewindCounter(),
-                                        task.getProgressDifferenceCounter(),
-                                        new Timestamp(System.currentTimeMillis()),
-                                        new Timestamp(System.currentTimeMillis())
-                                );
-                                create(entity);
-                            } else {
-                                entity.setLastReportProgress(task.getLastReportProgress());
-                                entity.setLastReportUploaded(task.getLastReportUploaded());
-                                entity.setProgressDifferenceCounter(task.getProgressDifferenceCounter());
-                                entity.setRewindCounter(task.getRewindCounter());
-                                entity.setTrackingUploadedIncreaseTotal(task.getTrackingUploadedIncreaseTotal());
-                                entity.setLastTimeSeen(new Timestamp(System.currentTimeMillis()));
-                                update(entity);
-                            }
-                        } catch (SQLException e) {
-                            log.error("Unable write PCB persist data into database", e);
+                String torrentId = record.client().getTorrentId();
+                record.task().forEach(task -> {
+                    try {
+                        var entity = findExists(task.getPeerIp(), torrentId);
+                        if (entity == null) {
+                            entity = new ProgressCheatBlockerPersistEntity(null,
+                                    task.getPeerIp(),
+                                    torrentId,
+                                    task.getLastReportProgress(),
+                                    task.getLastReportUploaded(),
+                                    task.getTrackingUploadedIncreaseTotal(),
+                                    task.getRewindCounter(),
+                                    task.getProgressDifferenceCounter(),
+                                    new Timestamp(System.currentTimeMillis()),
+                                    new Timestamp(System.currentTimeMillis())
+                            );
+                            create(entity);
+                        } else {
+                            entity.setLastReportProgress(task.getLastReportProgress());
+                            entity.setLastReportUploaded(task.getLastReportUploaded());
+                            entity.setProgressDifferenceCounter(task.getProgressDifferenceCounter());
+                            entity.setRewindCounter(task.getRewindCounter());
+                            entity.setTrackingUploadedIncreaseTotal(task.getTrackingUploadedIncreaseTotal());
+                            entity.setLastTimeSeen(new Timestamp(System.currentTimeMillis()));
+                            update(entity);
                         }
-                    });
+                    } catch (SQLException e) {
+                        log.error("Unable write PCB persist data into database", e);
+                    }
+                });
             });
             return null;
         });

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ActiveMonitoringModule.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ActiveMonitoringModule.java
@@ -8,6 +8,7 @@
 import com.ghostchu.peerbanhelper.module.AbstractFeatureModule;
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.util.MiscUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.simplereloadlib.ReloadResult;
 import com.ghostchu.simplereloadlib.Reloadable;
 import com.google.common.cache.Cache;
@@ -28,6 +29,7 @@
 
 @Slf4j
 @Component
+@IgnoreScan
 public class ActiveMonitoringModule extends AbstractFeatureModule implements Reloadable {
     private final PeerRecordDao peerRecordDao;
     private final Deque<PeerRecordDao.BatchHandleTasks> dataBuffer = new ConcurrentLinkedDeque<>();
@@ -127,10 +129,10 @@ private void writeJournal() {
             long uploaded = 0;
             long downloaded = 0;
             if (data != null) {
-                if(data[0]!=null && !data[0].isBlank()){
+                if (data[0] != null && !data[0].isBlank()) {
                     uploaded = Long.parseLong(data[0]);
                 }
-                if(data[1]!=null && !data[1].isBlank()){
+                if (data[1] != null && !data[1].isBlank()) {
                     downloaded = Long.parseLong(data[1]);
                 }
             }

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/AutoRangeBan.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/AutoRangeBan.java
@@ -9,6 +9,7 @@
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
@@ -28,6 +29,7 @@
 
 @Slf4j
 @Component
+@IgnoreScan
 public class AutoRangeBan extends AbstractRuleFeatureModule implements Reloadable {
     @Autowired
     private PeerBanHelperServer peerBanHelperServer;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/BtnNetworkOnline.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/BtnNetworkOnline.java
@@ -12,6 +12,7 @@
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
 import com.ghostchu.peerbanhelper.util.NullUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.util.rule.Rule;
 import com.ghostchu.peerbanhelper.util.rule.RuleMatchResult;
 import com.ghostchu.peerbanhelper.util.rule.RuleParser;
@@ -29,6 +30,7 @@
 
 @Slf4j
 @Component
+@IgnoreScan
 public class BtnNetworkOnline extends AbstractRuleFeatureModule implements Reloadable {
     private final CheckResult BTN_MANAGER_NOT_INITIALIZED = new CheckResult(getClass(), PeerAction.NO_ACTION, 0, new TranslationComponent(Lang.GENERAL_NA), new TranslationComponent("BtnManager not initialized"));
     @Autowired(required = false)

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ClientNameBlacklist.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ClientNameBlacklist.java
@@ -8,6 +8,7 @@
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.util.rule.Rule;
 import com.ghostchu.peerbanhelper.util.rule.RuleMatchResult;
 import com.ghostchu.peerbanhelper.util.rule.RuleParser;
@@ -28,6 +29,7 @@
 
 @Getter
 @Component
+@IgnoreScan
 public class ClientNameBlacklist extends AbstractRuleFeatureModule implements Reloadable {
     private List<Rule> bannedPeers;
     @Autowired

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ExpressionRule.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ExpressionRule.java
@@ -6,17 +6,15 @@
 import com.ghostchu.peerbanhelper.module.CheckResult;
 import com.ghostchu.peerbanhelper.module.PeerAction;
 import com.ghostchu.peerbanhelper.peer.Peer;
-import com.ghostchu.peerbanhelper.peer.PeerImpl;
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
-import com.ghostchu.peerbanhelper.torrent.TorrentImpl;
 import com.ghostchu.peerbanhelper.util.HTTPUtil;
 import com.ghostchu.peerbanhelper.util.IPAddressUtil;
 import com.ghostchu.peerbanhelper.util.StrUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.util.json.JsonUtil;
 import com.ghostchu.peerbanhelper.util.time.InfoHashUtil;
-import com.ghostchu.peerbanhelper.wrapper.PeerAddress;
 import com.ghostchu.simplereloadlib.ReloadResult;
 import com.ghostchu.simplereloadlib.Reloadable;
 import com.googlecode.aviator.AviatorEvaluator;
@@ -54,6 +52,7 @@
 
 @Slf4j
 @Component
+@IgnoreScan
 public class ExpressionRule extends AbstractRuleFeatureModule implements Reloadable {
     private final long maxScriptExecuteTime = 1500;
     private final Map<ExpressionMetadata, ReentrantLock> threadLocks = new HashMap<>();

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/IPBlackList.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/IPBlackList.java
@@ -9,6 +9,7 @@
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
 import com.ghostchu.peerbanhelper.util.IPAddressUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
@@ -33,6 +34,7 @@
 
 @Slf4j
 @Component
+@IgnoreScan
 public class IPBlackList extends AbstractRuleFeatureModule implements Reloadable {
     private Set<IPAddress> ips;
     private Set<Integer> ports;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/IPBlackRuleList.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/IPBlackRuleList.java
@@ -14,6 +14,7 @@
 import com.ghostchu.peerbanhelper.torrent.Torrent;
 import com.ghostchu.peerbanhelper.util.HTTPUtil;
 import com.ghostchu.peerbanhelper.util.IPAddressUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.util.paging.Page;
 import com.ghostchu.peerbanhelper.util.paging.Pageable;
 import com.ghostchu.peerbanhelper.util.rule.MatchResult;
@@ -58,6 +59,7 @@
 @Slf4j
 @Component
 @Getter
+@IgnoreScan
 public class IPBlackRuleList extends AbstractRuleFeatureModule implements Reloadable {
     private final RuleSubLogsDao ruleSubLogsDao;
     private List<IPMatcher> ipBanMatchers;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/MultiDialingBlocker.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/MultiDialingBlocker.java
@@ -9,6 +9,7 @@
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
 import com.ghostchu.peerbanhelper.util.IPAddressUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
@@ -34,6 +35,7 @@
  */
 @Slf4j
 @Component
+@IgnoreScan
 public class MultiDialingBlocker extends AbstractRuleFeatureModule implements Reloadable {
     // 计算缓存容量
     private static final int TORRENT_PEER_MAX_NUM = 1024;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/PeerIdBlacklist.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/PeerIdBlacklist.java
@@ -8,6 +8,7 @@
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.util.rule.Rule;
 import com.ghostchu.peerbanhelper.util.rule.RuleMatchResult;
 import com.ghostchu.peerbanhelper.util.rule.RuleParser;
@@ -26,6 +27,7 @@
 import java.util.concurrent.ExecutorService;
 
 @Component
+@IgnoreScan
 public class PeerIdBlacklist extends AbstractRuleFeatureModule implements Reloadable {
     private List<Rule> bannedPeers;
     @Autowired

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ProgressCheatBlocker.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ProgressCheatBlocker.java
@@ -11,6 +11,7 @@
 import com.ghostchu.peerbanhelper.torrent.Torrent;
 import com.ghostchu.peerbanhelper.util.IPAddressUtil;
 import com.ghostchu.peerbanhelper.util.MsgUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
@@ -37,6 +38,7 @@
 
 @Component
 @Slf4j
+@IgnoreScan
 public class ProgressCheatBlocker extends AbstractRuleFeatureModule implements Reloadable {
     private final Deque<ClientTaskRecord> pendingPersistQueue = new ConcurrentLinkedDeque<>();
     private final Cache<Client, List<ClientTask>> progressRecorder = CacheBuilder.newBuilder()

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/BlockListController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/BlockListController.java
@@ -2,6 +2,7 @@
 
 import com.ghostchu.peerbanhelper.module.AbstractFeatureModule;
 import com.ghostchu.peerbanhelper.util.IPAddressUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.wrapper.BanMetadata;
@@ -18,6 +19,7 @@
 import java.util.UUID;
 
 @Component
+@IgnoreScan
 public class BlockListController extends AbstractFeatureModule {
     @Autowired
     private JavalinWebContainer webContainer;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHAlertController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHAlertController.java
@@ -2,6 +2,7 @@
 
 import com.ghostchu.peerbanhelper.alert.AlertManager;
 import com.ghostchu.peerbanhelper.module.AbstractFeatureModule;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
@@ -11,6 +12,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
+@IgnoreScan
 public class PBHAlertController extends AbstractFeatureModule {
     @Autowired
     private AlertManager alertManager;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHAuthenticateController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHAuthenticateController.java
@@ -2,6 +2,7 @@
 
 import com.ghostchu.peerbanhelper.module.AbstractFeatureModule;
 import com.ghostchu.peerbanhelper.text.Lang;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.exception.NeedInitException;
@@ -20,6 +21,7 @@
 
 @Component
 @Slf4j
+@IgnoreScan
 public class PBHAuthenticateController extends AbstractFeatureModule {
     @Autowired
     private JavalinWebContainer webContainer;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHBanController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHBanController.java
@@ -5,6 +5,7 @@
 import com.ghostchu.peerbanhelper.database.table.HistoryEntity;
 import com.ghostchu.peerbanhelper.metric.BasicMetrics;
 import com.ghostchu.peerbanhelper.module.AbstractFeatureModule;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.util.paging.Page;
 import com.ghostchu.peerbanhelper.util.paging.Pageable;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
@@ -31,6 +32,7 @@
 
 @Slf4j
 @Component
+@IgnoreScan
 public class PBHBanController extends AbstractFeatureModule {
     @Autowired
     private Database db;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHChartController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHChartController.java
@@ -11,6 +11,7 @@
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.util.MiscUtil;
 import com.ghostchu.peerbanhelper.util.WebUtil;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.exception.RequirePBHPlusLicenseException;
@@ -35,6 +36,7 @@
 
 @Component
 @Slf4j
+@IgnoreScan
 public class PBHChartController extends AbstractFeatureModule {
     @Autowired
     private JavalinWebContainer webContainer;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHDownloaderController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHDownloaderController.java
@@ -8,6 +8,7 @@
 import com.ghostchu.peerbanhelper.module.impl.webapi.dto.PopulatedPeerDTO;
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
@@ -31,6 +32,7 @@
 
 @Slf4j
 @Component
+@IgnoreScan
 public class PBHDownloaderController extends AbstractFeatureModule {
     @Autowired
     private JavalinWebContainer webContainer;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHGeneralController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHGeneralController.java
@@ -2,6 +2,7 @@
 
 import com.ghostchu.peerbanhelper.Main;
 import com.ghostchu.peerbanhelper.module.AbstractFeatureModule;
+import com.ghostchu.peerbanhelper.util.context.IgnoreScan;
 import com.ghostchu.peerbanhelper.web.JavalinWebContainer;
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
@@ -15,6 +16,7 @@
 import java.util.List;
 
 @Component
+@IgnoreScan
 public class PBHGeneralController extends AbstractFeatureModule {
     @Autowired
     private JavalinWebContainer webContainer;