Open ping15 opened 1 month ago
简明扼要地描述bug是什么
请提供截屏来解释你的问题，当然这也能更好地帮助我们理解问题。
列出如何重现的方法或操作步骤
class BatchExecutionSolutionMaker(BaseExecutionSolutionMaker): def _make(self) -> ExecutionSolution: # 1. 准备阶段：创建目录 create_pre_dirs_step: ExecutionSolutionStep = self.get_create_pre_dirs_step() # 2. 依赖下载 dependencies_step: ExecutionSolutionStep = ExecutionSolutionStep( step_type=constants.CommonExecutionSolutionStepType.DEPENDENCIES.value, description=str(_("下载依赖文件到 {dest_dir} 下").format(dest_dir=self.dest_dir)), contents=[ ExecutionSolutionStepContent( name=name, text=f"{self.gse_servers_info['package_url']}/{name}", description=str(description), show_description=False, ) for name, description in constants.AgentWindowsDependencies.get_member_value__alias_map().items() ], ) dependencies_step.contents.append( ExecutionSolutionStepContent( name="setup_agent.bat", text=f"{self.get_agent_tools_url(self.script_file_name)}", description="Install Scripts", child_dir=self.agent_setup_info.agent_tools_relative_dir, # 在云区域场景下需要实时更新 always_download=True, show_description=False, ) ) # 3. 执行安装命令 # download_cmd: str = ( # f"{self.dest_dir}curl.exe {self.get_agent_tools_url(self.script_file_name)} " # f"-o {self.dest_dir}{self.script_file_name} -sSfg" # ) # download_cmd = self.adjust_cmd_proxy_config(download_cmd) run_cmd: str = f"{self.dest_dir}{self.script_file_name} {' '.join(self.get_run_cmd_base_params())}" run_cmds_step: ExecutionSolutionStep = ExecutionSolutionStep( step_type=constants.CommonExecutionSolutionStepType.COMMANDS.value, description=str(_("执行{setup_type_alias}命令").format(setup_type_alias=self.get_setup_type_alias())), contents=[ # ExecutionSolutionStepContent( # name="download_cmd", # text=download_cmd, # description=str(_("下载{setup_type_alias}脚本").format(setup_type_alias=self.get_setup_type_alias())), # show_description=False, # ), ExecutionSolutionStepContent( name="run_cmd", text=run_cmd, description=str(_("执行{setup_type_alias}脚本").format(setup_type_alias=self.get_setup_type_alias())), show_description=False, ), ], ) return ExecutionSolution( solution_type=constants.CommonExecutionSolutionType.BATCH.value, description=str( _("通过 {solution_type_alias} 进行{setup_type_alias}").format( solution_type_alias=constants.CommonExecutionSolutionType.get_member_value__alias_map()[ constants.CommonExecutionSolutionType.BATCH.value ], setup_type_alias=self.get_setup_type_alias(), ) ), steps=[ create_pre_dirs_step, dependencies_step, # 脚本的执行可能会有依赖受限，放置到依赖下载步骤之后 *self.build_script_hook_steps(), run_cmds_step, ], )
class BatchExecutionSolutionMaker(BaseExecutionSolutionMaker): def build_jump_server_policy_steps(self) -> typing.List[ExecutionSolutionStep]: policy_step: typing.List[ExecutionSolutionStep] = [] # 开通开通跳板机17980和17981端口 jump_server: models.Host = self.gse_servers_info["jump_server"] jump_server_lan_ip: str = jump_server.inner_ip or jump_server.inner_ipv6 if jump_server_lan_ip and not basic.is_v6(jump_server_lan_ip): policy_step.append(ExecutionSolutionStep( step_type=constants.CommonExecutionSolutionStepType.COMMANDS.value, description="开通跳板机17980和17981端口", contents=[ ExecutionSolutionStepContent( name="run_cmd", text=f'netsh advfirewall firewall show rule name=IEOD_Outbound_NodeMan_Rule_TCP 2>&1 > NUL || ' f'netsh advfirewall firewall add rule name=IEOD_Outbound_NodeMan_Rule_TCP dir=out ' f'remoteip="{jump_server_lan_ip}/32" protocol=tcp remoteport="17980,17981" ' f'profile=public enable=yes action=allow', description="开通跳板机17980和17981端口", show_description=False, ), ], )) return policy_step def _make(self) -> ExecutionSolution: # 1. 准备阶段：创建目录 create_pre_dirs_step: ExecutionSolutionStep = self.get_create_pre_dirs_step() # 2. 依赖下载 dependencies_step: ExecutionSolutionStep = ExecutionSolutionStep( step_type=constants.CommonExecutionSolutionStepType.DEPENDENCIES.value, description=str(_("下载依赖文件到 {dest_dir} 下").format(dest_dir=self.dest_dir)), contents=[ ExecutionSolutionStepContent( name=name, text=f"{self.gse_servers_info['package_url']}/{name}", description=str(description), show_description=False, ) for name, description in constants.AgentWindowsDependencies.get_member_value__alias_map().items() ], ) dependencies_step.contents.append( ExecutionSolutionStepContent( name="setup_agent.bat", text=f"{self.get_agent_tools_url(self.script_file_name)}", description="Install Scripts", child_dir=self.agent_setup_info.agent_tools_relative_dir, # 在云区域场景下需要实时更新 always_download=True, show_description=False, ) ) # 3. 执行安装命令 # download_cmd: str = ( # f"{self.dest_dir}curl.exe {self.get_agent_tools_url(self.script_file_name)} " # f"-o {self.dest_dir}{self.script_file_name} -sSfg" # ) # download_cmd = self.adjust_cmd_proxy_config(download_cmd) run_cmd: str = f"{self.dest_dir}{self.script_file_name} {' '.join(self.get_run_cmd_base_params())}" run_cmds_step: ExecutionSolutionStep = ExecutionSolutionStep( step_type=constants.CommonExecutionSolutionStepType.COMMANDS.value, description=str(_("执行{setup_type_alias}命令").format(setup_type_alias=self.get_setup_type_alias())), contents=[ # ExecutionSolutionStepContent( # name="download_cmd", # text=download_cmd, # description=str(_("下载{setup_type_alias}脚本").format(setup_type_alias=self.get_setup_type_alias())), # show_description=False, # ), ExecutionSolutionStepContent( name="run_cmd", text=run_cmd, description=str(_("执行{setup_type_alias}脚本").format(setup_type_alias=self.get_setup_type_alias())), show_description=False, ), ], ) return ExecutionSolution( solution_type=constants.CommonExecutionSolutionType.BATCH.value, description=str( _("通过 {solution_type_alias} 进行{setup_type_alias}").format( solution_type_alias=constants.CommonExecutionSolutionType.get_member_value__alias_map()[ constants.CommonExecutionSolutionType.BATCH.value ], setup_type_alias=self.get_setup_type_alias(), ) ), steps=[ create_pre_dirs_step, # 如果是idc windows机器，则开通跳板机的17980和17981端口 *self.build_jump_server_policy_steps(), dependencies_step, # 脚本的执行可能会有依赖受限，放置到依赖下载步骤之后 *self.build_script_hook_steps(), run_cmds_step, ], )
代码变更覆盖功能点需要自测并截图
描述代码变更涉及功能点及自测截图
问题描述
截屏
请提供截屏来解释你的问题，当然这也能更好地帮助我们理解问题。
请提供以下信息
重现方法
修复
建议的修复方案
修复方案
修复前
修复后
功能自测
功能点 1
描述代码变更涉及功能点及自测截图
功能点 2
描述代码变更涉及功能点及自测截图
...