From d7e3186f9dfd3a4e57c6c4abfd16995a1c818cfd Mon Sep 17 00:00:00 2001 From: nineven Date: Wed, 30 Mar 2022 00:22:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E5=90=8D?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fir_client/vue.config.js | 2 +- ..._auto_20220329_1736.py => 0004_auto_20220330_0009.py} | 9 +++++---- fir_ser/api/models.py | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) rename fir_ser/api/migrations/{0004_auto_20220329_1736.py => 0004_auto_20220330_0009.py} (96%) diff --git a/fir_client/vue.config.js b/fir_client/vue.config.js index dcc2780..21bf184 100644 --- a/fir_client/vue.config.js +++ b/fir_client/vue.config.js @@ -82,7 +82,7 @@ if (page) { } } -const version='2.2.6'; +const version='2.2.8'; const pro_base_env = { baseUrl: 'https://flyapps.cn', diff --git a/fir_ser/api/migrations/0004_auto_20220329_1736.py b/fir_ser/api/migrations/0004_auto_20220330_0009.py similarity index 96% rename from fir_ser/api/migrations/0004_auto_20220329_1736.py rename to fir_ser/api/migrations/0004_auto_20220330_0009.py index 3339590..a97bb47 100644 --- a/fir_ser/api/migrations/0004_auto_20220329_1736.py +++ b/fir_ser/api/migrations/0004_auto_20220330_0009.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.3 on 2022-03-29 17:36 +# Generated by Django 3.2.3 on 2022-03-30 00:09 import django.db.models.deletion from django.conf import settings @@ -61,7 +61,7 @@ class Migration(migrations.Migration): name='NotifyReceiver', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('receiver_name', models.CharField(max_length=128, unique=True, verbose_name='姓名')), + ('receiver_name', models.CharField(max_length=128, verbose_name='姓名')), ('email', models.EmailField(blank=True, max_length=255, null=True, verbose_name='邮箱')), ('description', models.CharField(blank=True, default='', max_length=256, verbose_name='备注')), ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='添加时间')), @@ -74,14 +74,14 @@ class Migration(migrations.Migration): options={ 'verbose_name': '信息接收配置', 'verbose_name_plural': '信息接收配置', - 'unique_together': {('user_id', 'email'), ('user_id', 'weixin')}, + 'unique_together': {('user_id', 'email'), ('user_id', 'weixin'), ('user_id', 'receiver_name')}, }, ), migrations.CreateModel( name='NotifyConfig', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('config_name', models.CharField(max_length=128, unique=True, verbose_name='通知名称')), + ('config_name', models.CharField(max_length=128, verbose_name='通知名称')), ('message_type', models.SmallIntegerField( choices=[(0, '签名余额不足'), (1, '下载次数不足'), (2, '应用签名限额'), (3, '应用签名失败'), (4, '充值到账提醒'), (5, '优惠活动通知'), (6, '证书到期消息'), (7, '系统提醒')], default=5, verbose_name='消息类型')), @@ -96,6 +96,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': '信息接收配置', 'verbose_name_plural': '信息接收配置', + 'unique_together': {('user_id', 'config_name')}, }, ), ] diff --git a/fir_ser/api/models.py b/fir_ser/api/models.py index fa7280f..57a63ba 100644 --- a/fir_ser/api/models.py +++ b/fir_ser/api/models.py @@ -493,7 +493,7 @@ class SystemConfig(models.Model): class NotifyReceiver(models.Model): - receiver_name = models.CharField(max_length=128, unique=True, verbose_name="姓名") + receiver_name = models.CharField(max_length=128, verbose_name="姓名") user_id = models.ForeignKey(to=UserInfo, verbose_name="用户ID", on_delete=models.CASCADE) weixin = models.ForeignKey(to=ThirdWeChatUserInfo, verbose_name="微信ID", on_delete=models.CASCADE, null=True) email = models.EmailField(verbose_name='邮箱', max_length=255, blank=True, null=True) @@ -503,7 +503,7 @@ class NotifyReceiver(models.Model): class Meta: verbose_name = '信息接收配置' verbose_name_plural = "信息接收配置" - unique_together = (('user_id', 'email',), ('user_id', 'weixin')) + unique_together = (('user_id', 'email',), ('user_id', 'weixin'), ('user_id', 'receiver_name')) def __str__(self): return "%s-%s-%s" % (self.user_id, self.receiver_name, self.description) @@ -511,7 +511,7 @@ class NotifyReceiver(models.Model): class NotifyConfig(models.Model): user_id = models.ForeignKey(to=UserInfo, verbose_name="用户ID", on_delete=models.CASCADE) - config_name = models.CharField(max_length=128, unique=True, verbose_name="通知名称") + config_name = models.CharField(max_length=128, verbose_name="通知名称") message_type_choices = ( (0, '签名余额不足'), (1, '下载次数不足'), (2, '应用签名限额'), (3, '应用签名失败'), (4, '充值到账提醒'), (5, '优惠活动通知'), (6, '证书到期消息'), (7, '系统提醒')) @@ -525,6 +525,7 @@ class NotifyConfig(models.Model): class Meta: verbose_name = '信息接收配置' verbose_name_plural = "信息接收配置" + unique_together = (('user_id', 'config_name',),) def __str__(self): return "%s-%s-%s" % (self.user_id, self.get_message_type_display(), self.sender)