From 864da49ae6e13f55c3ea564c0ddc9abb1cfe9459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Wed, 1 Nov 2023 18:10:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=20chrome=20?= =?UTF-8?q?=E5=92=8C=20chromedriver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automations/deploy_applet_host/playbook.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/terminal/automations/deploy_applet_host/playbook.yml b/apps/terminal/automations/deploy_applet_host/playbook.yml index 0c0ad4f3d..84189eed0 100644 --- a/apps/terminal/automations/deploy_applet_host/playbook.yml +++ b/apps/terminal/automations/deploy_applet_host/playbook.yml @@ -168,14 +168,14 @@ - name: Download chromedriver (Chrome) ansible.windows.win_get_url: - url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/chromedriver_win32.zip" - dest: "{{ ansible_env.TEMP }}\\chromedriver-win32.zip" + url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/chromedriver-win64.zip" + dest: "{{ ansible_env.TEMP }}\\chromedriver-win64.zip" validate_certs: "{{ not IGNORE_VERIFY_CERTS }}" - name: Unzip chromedriver (Chrome) community.windows.win_unzip: - src: "{{ ansible_env.TEMP }}\\chromedriver-win32.zip" - dest: C:\Program Files\JumpServer\drivers\chromedriver-win32 + src: "{{ ansible_env.TEMP }}\\chromedriver-win64.zip" + dest: C:\Program Files\JumpServer\drivers - name: Stop Chrome before install (jumpserver) ansible.windows.win_powershell: @@ -201,6 +201,7 @@ - name: Check and Clean global system path (Chrome) ansible.windows.win_path: elements: + - 'C:\Program Files\JumpServer\drivers\chromedriver-win32' - 'C:\Program Files\JumpServer\drivers\chromedriver_win32' - 'C:\Program Files\Chrome\chrome-win32' - 'C:\Program Files\Chrome\chrome-win' @@ -211,7 +212,7 @@ ansible.windows.win_path: elements: - 'C:\Program Files\JumpServer\applications\Chrome\Application' - - 'C:\Program Files\JumpServer\drivers\chromedriver-win32' + - 'C:\Program Files\JumpServer\drivers\chromedriver-win64' - name: Set Chrome variables disable Google Api (Chrome) ansible.windows.win_environment: From af33ad6631976070cc6e5c4e99b6392848cf83e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Wed, 1 Nov 2023 18:35:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E7=A7=BB=E9=99=A4=20python3=20?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/automations/deploy_applet_host/playbook.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/terminal/automations/deploy_applet_host/playbook.yml b/apps/terminal/automations/deploy_applet_host/playbook.yml index 84189eed0..bbb5350c3 100644 --- a/apps/terminal/automations/deploy_applet_host/playbook.yml +++ b/apps/terminal/automations/deploy_applet_host/playbook.yml @@ -201,6 +201,8 @@ - name: Check and Clean global system path (Chrome) ansible.windows.win_path: elements: + - 'C:\Program Files\Python310\Scripts\' + - 'C:\Program Files\Python310\' - 'C:\Program Files\JumpServer\drivers\chromedriver-win32' - 'C:\Program Files\JumpServer\drivers\chromedriver_win32' - 'C:\Program Files\Chrome\chrome-win32' From 78e9f5178655568d573eb6aa372f1965e537d71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Wed, 1 Nov 2023 18:49:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E7=A7=BB=E9=99=A4=E6=97=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20Chrome=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy_applet_host/playbook.yml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/apps/terminal/automations/deploy_applet_host/playbook.yml b/apps/terminal/automations/deploy_applet_host/playbook.yml index bbb5350c3..45289cd30 100644 --- a/apps/terminal/automations/deploy_applet_host/playbook.yml +++ b/apps/terminal/automations/deploy_applet_host/playbook.yml @@ -172,6 +172,16 @@ dest: "{{ ansible_env.TEMP }}\\chromedriver-win64.zip" validate_certs: "{{ not IGNORE_VERIFY_CERTS }}" + - name: Remove old chromedriver (Chrome) + ansible.windows.win_file: + path: "{{ item }}" + state: absent + with_items: + - C:\Program Files\JumpServer\drivers\chromedriver-win32 + - C:\Program Files\JumpServer\drivers\chromedriver_win32 + - C:\Program Files\JumpServer\drivers\chromedriver-win64 + - C:\Program Files\JumpServer\drivers\chromedriver_win64 + - name: Unzip chromedriver (Chrome) community.windows.win_unzip: src: "{{ ansible_env.TEMP }}\\chromedriver-win64.zip" @@ -193,6 +203,16 @@ dest: "{{ ansible_env.TEMP }}\\chrome-win.zip" validate_certs: "{{ not IGNORE_VERIFY_CERTS }}" + - name: Remove old Chrome (Chrome) + ansible.windows.win_file: + path: "{{ item }}" + state: absent + with_items: + - C:\Program Files\JumpServer\applications\Chrome + - C:\Program Files\Chrome\chrome-win32 + - C:\Program Files\Chrome\chrome-win + - C:\Program Files\chrome-win + - name: Unzip Chrome (Chrome) community.windows.win_unzip: src: "{{ ansible_env.TEMP }}\\chrome-win.zip"