Merge remote-tracking branch 'origin/v2' into v2

app/chain/search.py

@@ -312,11 +312,6 @@ class SearchChain(ChainBase):
         for indexer in self.siteshelper.get_indexers():
             # 检查站点索引开关
             if not sites or indexer.get("id") in sites:
-                # 站点流控
-                state, msg = self.siteshelper.check(indexer.get("domain"))
-                if state:
-                    logger.warn(msg)
-                    continue
                 indexer_sites.append(indexer)
         if not indexer_sites:
             logger.warn('未开启任何有效站点，无法搜索资源')

app/modules/filter/__init__.py

@@ -52,7 +52,7 @@ class FilterModule(_ModuleBase):
         },
         # 官种
         "GZ": {
-            "include": [r'官方', r'官种'],
+            "include": [r'官方', r'官种', r'官组'],
             "match": ["labels"]
         },
         # 特效字幕

app/modules/indexer/__init__.py

@@ -122,6 +122,12 @@ class IndexerModule(_ModuleBase):
                 logger.warn(f"{site.get('name')} 不支持中文搜索")
                 continue
 
+            # 站点流控
+            state, msg = SitesHelper().check(StringUtils.get_url_domain(site.get("domain")))
+            if state:
+                logger.warn(msg)
+                continue
+
             # 去除搜索关键字中的特殊字符
             if search_word:
                 search_word = StringUtils.clear(search_word, replace_word=" ", allow_space=True)

app/scheduler.py

@@ -30,6 +30,9 @@ from app.utils.singleton import Singleton
 from app.utils.timer import TimerUtils
 
 
+lock = threading.Lock()
+
+
 class SchedulerChain(ChainBase):
     pass
 
@@ -56,6 +59,15 @@ class Scheduler(metaclass=Singleton):
         """
         初始化定时服务
         """
+
+        # 停止定时服务
+        self.stop()
+
+        # 调试模式不启动定时服务
+        if settings.DEV:
+            return
+
+        with lock:
             # 各服务的运行状态
             self._jobs = {
                 "cookiecloud": {
@@ -136,13 +148,6 @@ class Scheduler(metaclass=Singleton):
                 }
             }
 
-        # 停止定时服务
-        self.stop()
-
-        # 调试模式不启动定时服务
-        if settings.DEV:
-            return
-
             # 创建定时服务
             self._scheduler = BackgroundScheduler(timezone=settings.TZ,
                                                   executors={
@@ -496,7 +501,6 @@ class Scheduler(metaclass=Singleton):
         """
         if not self._scheduler:
             return
-
         # 移除该工作流的全部服务
         self.remove_workflow_job(workflow)
         # 添加工作流服务
@@ -625,6 +629,7 @@ class Scheduler(metaclass=Singleton):
         """
         关闭定时服务
         """
+        with lock:
             try:
                 if self._scheduler:
                     logger.info("正在停止定时任务...")