From dd57b145622480957daae14b39d89c3211fa3001 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:57:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20sqlserver=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20(#12288)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 增加 sqlserver 支持 * feat: 删除一些 migrations --------- Co-authored-by: Aaron3S --- apps/terminal/connect_methods.py | 3 ++- ...er_port_alter_appprovider_apps_and_more.py | 21 +++++++++++++++++++ apps/terminal/models/component/endpoint.py | 1 + apps/terminal/serializers/endpoint.py | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 apps/terminal/migrations/0069_endpoint_sqlserver_port_alter_appprovider_apps_and_more.py diff --git a/apps/terminal/connect_methods.py b/apps/terminal/connect_methods.py index 27d67e1af..72007112d 100644 --- a/apps/terminal/connect_methods.py +++ b/apps/terminal/connect_methods.py @@ -49,6 +49,7 @@ class NativeClient(TextChoices): Protocol.mongodb: [cls.db_client, cls.db_guide], Protocol.oracle: [cls.db_client, cls.db_guide], Protocol.postgresql: [cls.db_client, cls.db_guide], + Protocol.sqlserver: [cls.db_client, cls.db_guide], } return clients @@ -180,7 +181,7 @@ class ConnectMethodUtil: 'support': [ Protocol.mysql, Protocol.postgresql, Protocol.oracle, Protocol.mariadb, - Protocol.redis + Protocol.redis, Protocol.sqlserver ], 'match': 'map' }, diff --git a/apps/terminal/migrations/0069_endpoint_sqlserver_port_alter_appprovider_apps_and_more.py b/apps/terminal/migrations/0069_endpoint_sqlserver_port_alter_appprovider_apps_and_more.py new file mode 100644 index 000000000..f68cca188 --- /dev/null +++ b/apps/terminal/migrations/0069_endpoint_sqlserver_port_alter_appprovider_apps_and_more.py @@ -0,0 +1,21 @@ +# Generated by Django 4.1.10 on 2023-12-08 09:41 + +import common.db.fields +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('terminal', '0068_virtualapp'), + ] + + operations = [ + migrations.AddField( + model_name='endpoint', + name='sqlserver_port', + field=common.db.fields.PortField(default=14330, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(65535)], verbose_name='SQLServer port'), + ), + ] diff --git a/apps/terminal/models/component/endpoint.py b/apps/terminal/models/component/endpoint.py index eb080dc99..d9d4cfab8 100644 --- a/apps/terminal/models/component/endpoint.py +++ b/apps/terminal/models/component/endpoint.py @@ -20,6 +20,7 @@ class Endpoint(JMSBaseModel): mariadb_port = PortField(default=33062, verbose_name=_('MariaDB port')) postgresql_port = PortField(default=54320, verbose_name=_('PostgreSQL port')) redis_port = PortField(default=63790, verbose_name=_('Redis port')) + sqlserver_port = PortField(default=14330, verbose_name=_('SQLServer port')) comment = models.TextField(default='', blank=True, verbose_name=_('Comment')) diff --git a/apps/terminal/serializers/endpoint.py b/apps/terminal/serializers/endpoint.py index 82de09fce..2b734f71e 100644 --- a/apps/terminal/serializers/endpoint.py +++ b/apps/terminal/serializers/endpoint.py @@ -28,7 +28,7 @@ class EndpointSerializer(BulkModelSerializer): fields_small = [ 'host', 'https_port', 'http_port', 'ssh_port', 'rdp_port', 'mysql_port', 'mariadb_port', 'postgresql_port', 'redis_port', - 'oracle_port_range', 'oracle_port', + 'oracle_port_range', 'oracle_port', 'sqlserver_port', ] fields = fields_mini + fields_small + [ 'comment', 'date_created', 'date_updated', 'created_by'