From 1b97dc031edb1c62e7fadcb6750230cff967ccbd Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Aug 2023 16:57:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=A4=87=E6=B3=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A1=AB=E5=86=99=E5=8F=88=E6=B8=85=E7=A9=BA=EF=BC=8C?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF=E5=8F=98=E4=B8=BA=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: root --- .../0005_alter_cluster_cluster_description.py | 18 ++++++++++++++++++ sysom_server/sysom_api/apps/host/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 sysom_server/sysom_api/apps/host/migrations/0005_alter_cluster_cluster_description.py diff --git a/sysom_server/sysom_api/apps/host/migrations/0005_alter_cluster_cluster_description.py b/sysom_server/sysom_api/apps/host/migrations/0005_alter_cluster_cluster_description.py new file mode 100644 index 00000000..478cd95f --- /dev/null +++ b/sysom_server/sysom_api/apps/host/migrations/0005_alter_cluster_cluster_description.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.16 on 2023-08-09 08:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('host', '0004_auto_20221227_1705'), + ] + + operations = [ + migrations.AlterField( + model_name='cluster', + name='cluster_description', + field=models.CharField(blank=True, default='', max_length=255, null=True), + ), + ] diff --git a/sysom_server/sysom_api/apps/host/models.py b/sysom_server/sysom_api/apps/host/models.py index 61f09f63..f8b68242 100644 --- a/sysom_server/sysom_api/apps/host/models.py +++ b/sysom_server/sysom_api/apps/host/models.py @@ -33,7 +33,7 @@ class HostModel(BaseModel): class Cluster(BaseModel): cluster_name = models.CharField(max_length=128, unique=True) - cluster_description = models.CharField(max_length=255, default="") + cluster_description = models.CharField(max_length=255, default="", null=True, blank=True) class Meta: db_table = "sys_cluster" -- Gitee From 9d17e03d7e3a00adc58a082a4bc1d93054f0b731 Mon Sep 17 00:00:00 2001 From: sunxinpeng Date: Wed, 9 Aug 2023 17:45:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=B8=BB=E6=9C=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=8F=8F=E8=BF=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A1=AB=E5=86=99=E5=8F=88=E6=B8=85=E7=A9=BA=EF=BC=8C?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF=E5=8F=98=E4=B8=BA=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunxinpeng --- .../0006_alter_hostmodel_description.py | 18 ++++++++++++++++++ sysom_server/sysom_api/apps/host/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 sysom_server/sysom_api/apps/host/migrations/0006_alter_hostmodel_description.py diff --git a/sysom_server/sysom_api/apps/host/migrations/0006_alter_hostmodel_description.py b/sysom_server/sysom_api/apps/host/migrations/0006_alter_hostmodel_description.py new file mode 100644 index 00000000..154d40f7 --- /dev/null +++ b/sysom_server/sysom_api/apps/host/migrations/0006_alter_hostmodel_description.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.16 on 2023-08-09 09:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('host', '0005_alter_cluster_cluster_description.py'), + ] + + operations = [ + migrations.AlterField( + model_name='hostmodel', + name='description', + field=models.CharField(blank=True, max_length=255, null=True), + ), + ] diff --git a/sysom_server/sysom_api/apps/host/models.py b/sysom_server/sysom_api/apps/host/models.py index f8b68242..b89b4186 100644 --- a/sysom_server/sysom_api/apps/host/models.py +++ b/sysom_server/sysom_api/apps/host/models.py @@ -16,7 +16,7 @@ class HostModel(BaseModel): port = models.IntegerField(validators=[validators.MaxValueValidator(65535), validators.MinValueValidator(0)]) username = models.CharField(max_length=100) private_key = models.TextField(null=True) - description = models.CharField(max_length=255, null=True) + description = models.CharField(max_length=255, null=True, blank=True) status = models.IntegerField(choices=HOST_STATUS_CHOICES, default=2, verbose_name="主机状态") host_info = models.TextField(verbose_name='主机信息', default="") client_deploy_cmd = models.TextField(verbose_name="client部署命令", default="") -- Gitee