From d72aa345130ea6f22b330e3f827ce1521b986bc9 Mon Sep 17 00:00:00 2001 From: Michael Bai Date: Wed, 8 Dec 2021 10:16:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=A7=84=E5=88=99=E7=94=9F=E6=88=90=E6=AD=A3?= =?UTF-8?q?=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E9=AB=98=E5=91=BD=E4=BB=A4=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=87=86=E7=A1=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/cmd_filter.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/assets/models/cmd_filter.py b/apps/assets/models/cmd_filter.py index bf91a16b2..829d06ab6 100644 --- a/apps/assets/models/cmd_filter.py +++ b/apps/assets/models/cmd_filter.py @@ -75,9 +75,17 @@ class CommandFilterRule(OrgModelMixin): if self.type == 'command': regex = [] content = self.content.replace('\r\n', '\n') - for cmd in content.split('\n'): + for _cmd in content.split('\n'): + cmd = re.sub(r'\s+', ' ', _cmd) cmd = re.escape(cmd) cmd = cmd.replace('\\ ', '\s+') + + # 有空格就不能 铆钉单词了 + if ' ' in _cmd: + regex.append(cmd) + continue + + # 如果是单个字符 if cmd[-1].isalpha(): regex.append(r'\b{0}\b'.format(cmd)) else: