From d6f217d40c1a2a64c0eedd624f21aa2f17a9eace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98KimigaiiWuyi=E2=80=99?= <444835641@qq.com> Date: Thu, 20 Apr 2023 19:56:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BC=98=E5=8C=96=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gsuid_core/gss.py | 11 +++++++++-- gsuid_core/sv.py | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gsuid_core/gss.py b/gsuid_core/gss.py index 4e001aa..4cd56b8 100644 --- a/gsuid_core/gss.py +++ b/gsuid_core/gss.py @@ -1,3 +1,5 @@ +import inspect + from gsuid_core.aps import scheduler from gsuid_core.logger import logger from gsuid_core.server import GsServer @@ -12,7 +14,12 @@ if not gss.is_load: if i.name not in repeat_jobs: repeat_jobs[i.name] = i else: - logger.warning(f'发现重复函数名定时任务{i.name}, 移除该任务...') - scheduler.remove_job(i.id) + source_i = inspect.getsource(repeat_jobs[i.name].func) + source_j = inspect.getsource(i.func) + if source_i == source_j: + scheduler.remove_job(i.id) + else: + logger.warning(f'发现重复函数名定时任务{i.name}, 移除该任务...') + scheduler.remove_job(i.id) del repeat_jobs diff --git a/gsuid_core/sv.py b/gsuid_core/sv.py index 05294d3..c58bbf8 100644 --- a/gsuid_core/sv.py +++ b/gsuid_core/sv.py @@ -85,6 +85,10 @@ class SV: area=area, ) + if name == '测试开关': + self.pm = 1 + self.enabled = False + def set(self, **kwargs): for var in kwargs: setattr(self, var, kwargs[var])