From 8ca2522c71c483f4f9f3d8143d9286ac20b8cf85 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 29 Apr 2021 14:18:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9tokent=E4=B8=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=20Protocols=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 优化protocols

fix: session bpp

token 时间加长
---
 apps/authentication/api/connection_token.py | 4 ++--
 apps/authentication/serializers.py          | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/authentication/api/connection_token.py b/apps/authentication/api/connection_token.py
index e15f20661..ceebf3bde 100644
--- a/apps/authentication/api/connection_token.py
+++ b/apps/authentication/api/connection_token.py
@@ -79,7 +79,7 @@ class UserConnectionTokenViewSet(RootOrgViewMixin, SerializerMixin2, GenericView
             })
 
         key = self.CACHE_KEY_PREFIX.format(token)
-        cache.set(key, value, timeout=20)
+        cache.set(key, value, timeout=30*60)
         return token
 
     def create(self, request, *args, **kwargs):
@@ -102,7 +102,7 @@ class UserConnectionTokenViewSet(RootOrgViewMixin, SerializerMixin2, GenericView
             'desktopwidth:i': '1280',
             'desktopheight:i': '800',
             'use multimon:i': '1',
-            'session bpp:i': '24',
+            'session bpp:i': '32',
             'audiomode:i': '0',
             'disable wallpaper:i': '0',
             'disable full window drag:i': '0',
diff --git a/apps/authentication/serializers.py b/apps/authentication/serializers.py
index c86b48039..5f2bc231b 100644
--- a/apps/authentication/serializers.py
+++ b/apps/authentication/serializers.py
@@ -8,6 +8,7 @@ from users.models import User
 from assets.models import Asset, SystemUser, Gateway
 from applications.models import Application
 from users.serializers import UserProfileSerializer
+from assets.serializers import ProtocolsField
 from perms.serializers.asset.permission import ActionsField
 from .models import AccessKey, LoginConfirmSetting, SSOToken
 
@@ -150,9 +151,11 @@ class ConnectionTokenUserSerializer(serializers.ModelSerializer):
 
 
 class ConnectionTokenAssetSerializer(serializers.ModelSerializer):
+    protocols = ProtocolsField(label='Protocols', read_only=True)
+
     class Meta:
         model = Asset
-        fields = ['id', 'hostname', 'ip', 'port', 'org_id']
+        fields = ['id', 'hostname', 'ip', 'protocols', 'org_id']
 
 
 class ConnectionTokenSystemUserSerializer(serializers.ModelSerializer):