From 142edd9438bb21f13db05c0636dadc4d29cea355 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 1 Feb 2023 10:27:12 +0800 Subject: [PATCH] perf: update applet download and deployment --- apps/templates/resource_download.html | 22 +++++++------------ apps/terminal/applets/chrome/common.py | 2 +- apps/terminal/applets/navicat/common.py | 10 ++++----- .../deploy_applet_host/playbook.yml | 14 +++++++++++- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/apps/templates/resource_download.html b/apps/templates/resource_download.html index df0577307..14a7b30c2 100644 --- a/apps/templates/resource_download.html +++ b/apps/templates/resource_download.html @@ -20,10 +20,10 @@ p { {% trans 'JumpServer Client, currently used to launch the client, now only support launch RDP SSH client, The Telnet client will next' %}

@@ -33,7 +33,7 @@ p { {% trans 'macOS needs to download the client to connect RDP asset, which comes with Windows' %}

@@ -42,22 +42,16 @@ p {

{% trans 'Windows Remote application publisher tools' %}

{% trans 'OpenSSH is a program used to connect remote applications in the Windows Remote Application Publisher' %}

- {% if XPACK_ENABLED %} -

{% trans 'Jmservisor is the program used to pull up remote applications in Windows Remote Application publisher' %}

- - {% endif %}

JumpServer {% trans 'Offline video player' %} v0.1.5

diff --git a/apps/terminal/applets/chrome/common.py b/apps/terminal/applets/chrome/common.py index 4bffa5081..dbac3a22b 100644 --- a/apps/terminal/applets/chrome/common.py +++ b/apps/terminal/applets/chrome/common.py @@ -129,7 +129,7 @@ class Asset(DictObj): address: str protocols: list[Protocol] category: Category - specific: Specific + spec_info: Specific def get_protocol_port(self, protocol): for item in self.protocols: diff --git a/apps/terminal/applets/navicat/common.py b/apps/terminal/applets/navicat/common.py index f1e6429de..1802c8d86 100644 --- a/apps/terminal/applets/navicat/common.py +++ b/apps/terminal/applets/navicat/common.py @@ -1,11 +1,11 @@ import abc -import subprocess +import base64 +import json import locale +import os +import subprocess import sys import time -import os -import json -import base64 from subprocess import CREATE_NO_WINDOW _blockInput = None @@ -125,7 +125,7 @@ class Asset(DictObj): address: str protocols: list[Protocol] category: Category - specific: Specific + spec_info: Specific def get_protocol_port(self, protocol): for item in self.protocols: diff --git a/apps/terminal/automations/deploy_applet_host/playbook.yml b/apps/terminal/automations/deploy_applet_host/playbook.yml index 3d86ea52a..763df39a8 100644 --- a/apps/terminal/automations/deploy_applet_host/playbook.yml +++ b/apps/terminal/automations/deploy_applet_host/playbook.yml @@ -13,7 +13,7 @@ RDS_fSingleSessionPerUser: 1 RDS_MaxDisconnectionTime: 60000 RDS_RemoteAppLogoffTimeLimit: 0 - TinkerInstaller: Tinker_Installer_v0.0.1.exe + TinkerInstaller: Tinker_Installer.exe tasks: - name: Install RDS-Licensing (RDS) @@ -151,6 +151,18 @@ state: present arguments: - /quiet + - + - name: Download navicat161_premium_en package (navicat) + ansible.windows.win_get_url: + url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/navicat161_premium_en_x64.exe" + dest: "{{ ansible_env.TEMP }}\\navicat161_premium_en_x64.exe" + + - name: Install navicat (navicat) + ansible.windows.win_package: + path: "{{ ansible_env.TEMP }}\\navicat161_premium_en_x64.exe" + state: present + arguments: + - /SILENT - name: Generate tinkerd component config ansible.windows.win_shell: