From edd603b8e9c4f5645fe0b777aeebab81d55fabf1 Mon Sep 17 00:00:00 2001 From: youngS Date: Mon, 18 Oct 2021 18:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=9F=9F=E5=90=8D=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fir_ser/api/utils/baseutils.py | 2 ++ fir_ser/cli.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fir_ser/api/utils/baseutils.py b/fir_ser/api/utils/baseutils.py index dcf041a..35231fb 100644 --- a/fir_ser/api/utils/baseutils.py +++ b/fir_ser/api/utils/baseutils.py @@ -246,6 +246,8 @@ def check_app_domain_name_access(app_obj, access_domain_name, user_obj, extra_do if app_domain_name: domain_list.append(app_domain_name) user_domain_name = get_user_domain_name(user_obj) if user_domain_name: domain_list.append(user_domain_name) + user_qr_domain_name = get_user_domain_name(user_obj, 0) + if user_qr_domain_name: domain_list.append(user_qr_domain_name) if access_domain_name in domain_list: return True diff --git a/fir_ser/cli.py b/fir_ser/cli.py index d99e734..5a40655 100644 --- a/fir_ser/cli.py +++ b/fir_ser/cli.py @@ -11,7 +11,6 @@ import random import re import json import zipfile -import requests ''' pip install --upgrade pip @@ -87,6 +86,7 @@ def upload_qiniuyunoss(key, token, file_path): class FLYCliSer(object): + import requests def __init__(self, fly_cli_domain, fly_cli_token): self.fly_cli_domain = fly_cli_domain @@ -332,7 +332,7 @@ class AppInfo(object): def check_depends(): - cmd_list = ['--upgrade pip', 'setuptools-rust', 'oss2', 'requests-toolbelt', 'androguard', 'qiniu'] + cmd_list = ['--upgrade pip', 'setuptools-rust', 'oss2', 'requests-toolbelt', 'androguard', 'qiniu','requests'] for cmd in cmd_list: os.system('pip install %s' % cmd) @@ -381,7 +381,7 @@ if __name__ == '__main__': file_path_list = [] if args.filepath is not None and len(args.filepath) > 0: for args_filepath in args.filepath: - file_path_list.extend(os.path.join(base_dir, args_filepath)) + file_path_list.append(os.path.join(base_dir, args_filepath)) if args.dir_path is not None and len(args.dir_path) > 0: for args_dir_path in args.dir_path: dir_path = os.path.join(base_dir, args_dir_path)