From 1974fa4d913996ed7f7b7ca8828202089b4783ff Mon Sep 17 00:00:00 2001 From: rogersun Date: Tue, 21 Apr 2026 15:57:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=A7=E8=A1=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/utils/cmd_extcute.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/update/utils/cmd_extcute.py b/update/utils/cmd_extcute.py index 0ecb645..92fbea2 100644 --- a/update/utils/cmd_extcute.py +++ b/update/utils/cmd_extcute.py @@ -135,7 +135,7 @@ class UpdateConfigUtil: def exec_config(self, short_release): main_ver = Release.objects.filter(short_release=short_release).all()[0].main_ver - cmd_list = self.get_all_exec_cmd(main_ver) + cmd_list = self.get_all_exec_cmd({'33': main_ver}) db_config = Cinema.objects.filter(ip=self.ip).values()[0] db_conn = pymysql.Connect(host=self.ip, port=3306, user=db_config['db_user'], passwd=db_config['db_pwd'], database='cine') @@ -159,20 +159,27 @@ class UpdateConfigUtil: db_conn.close() return '
'.join(result_list) - def get_all_exec_cmd(self, param): + def get_all_exec_cmd(self, params): all_config_obj = UpdateCommand.objects.filter( Q(process='config') & Q(run=self.run_before_teardown) & Q(is_delete=False)).values() cmd_list = [] print(all_config_obj) + params = self.custom_param(params) for config_item in all_config_obj: if config_item['id'] in self.checked_list: + param = params.get(str(config_item['id']), '') cmd_list.append({"desc": config_item['desc'], "cmd": [cmd.replace('', param) for cmd in json.loads(config_item['command'])['checked']], "combo_cmd": config_item['combo_cmd']}) else: cmd_list.append({"desc": config_item['desc'], - "cmd": [cmd.replace('', param) for cmd in - json.loads(config_item['command'])['unchecked']], + "cmd": json.loads(config_item['command'])['unchecked'], "combo_cmd": config_item['combo_cmd']}) return cmd_list + + def custom_param(self, params): + if 21 in self.checked_list: + if '33' in params.keys(): + params['33'] = 'Cloud_' + params['33'] + return params \ No newline at end of file