From 67859e98732c10b3af71e383d62554a7dd75c219 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 14 Jul 2025 19:50:33 +0800 Subject: [PATCH] feat: add ChatUser, UserGroup, and authorization models to initial migration --- apps/application/migrations/0001_initial.py | 5 +- ...tionaccesstoken_authentication_and_more.py | 23 ------ apps/system_manage/migrations/0001_initial.py | 70 +++++++++++++++++++ 3 files changed, 74 insertions(+), 24 deletions(-) delete mode 100644 apps/application/migrations/0002_applicationaccesstoken_authentication_and_more.py diff --git a/apps/application/migrations/0001_initial.py b/apps/application/migrations/0001_initial.py index bd43cb420..36e8bc3f6 100644 --- a/apps/application/migrations/0001_initial.py +++ b/apps/application/migrations/0001_initial.py @@ -1,7 +1,8 @@ -# Generated by Django 5.2.3 on 2025-06-23 02:14 +# Generated by Django 5.2.4 on 2025-07-14 11:45 from django.db.models import QuerySet import application.models.application +import application.models.application_chat import common.encoder.encoder import django.contrib.postgres.fields import django.db.models.deletion @@ -79,6 +80,8 @@ class Migration(migrations.Migration): ('white_list', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, max_length=128), default=list, size=None, verbose_name='白名单列表')), ('show_source', models.BooleanField(default=False, verbose_name='是否显示知识来源')), ('show_exec', models.BooleanField(default=False, verbose_name='是否显示执行详情')), + ('authentication', models.BooleanField(default=False, verbose_name='是否需要认证')), + ('authentication_value', models.JSONField(default=dict, verbose_name='认证的值')), ('language', models.CharField(default=None, max_length=10, null=True, verbose_name='语言')), ], options={ diff --git a/apps/application/migrations/0002_applicationaccesstoken_authentication_and_more.py b/apps/application/migrations/0002_applicationaccesstoken_authentication_and_more.py deleted file mode 100644 index 280c2d674..000000000 --- a/apps/application/migrations/0002_applicationaccesstoken_authentication_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 5.2.3 on 2025-07-14 09:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('application', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='applicationaccesstoken', - name='authentication', - field=models.BooleanField(default=False, verbose_name='是否需要认证'), - ), - migrations.AddField( - model_name='applicationaccesstoken', - name='authentication_value', - field=models.JSONField(default=dict, verbose_name='认证的值'), - ), - ] diff --git a/apps/system_manage/migrations/0001_initial.py b/apps/system_manage/migrations/0001_initial.py index c8d7910a5..3692a2862 100644 --- a/apps/system_manage/migrations/0001_initial.py +++ b/apps/system_manage/migrations/0001_initial.py @@ -16,6 +16,24 @@ class Migration(migrations.Migration): ] operations = [ + migrations.CreateModel( + name='ChatUser', + fields=[ + ('id', models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id')), + ('email', models.EmailField(blank=True, db_index=True, max_length=254, null=True, verbose_name='邮箱')), + ('phone', models.CharField(default='', max_length=20, verbose_name='电话')), + ('nick_name', models.CharField(db_index=True, max_length=150, unique=True, verbose_name='昵称')), + ('username', models.CharField(db_index=True, max_length=150, unique=True, verbose_name='用户名')), + ('password', models.CharField(max_length=150, verbose_name='密码')), + ('source', models.CharField(db_index=True, default='LOCAL', max_length=10, verbose_name='来源')), + ('is_active', models.BooleanField(db_index=True, default=True)), + ('create_time', models.DateTimeField(auto_now_add=True, db_index=True, null=True, verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, db_index=True, null=True, verbose_name='修改时间')), + ], + options={ + 'db_table': 'chat_user', + }, + ), migrations.CreateModel( name='Log', fields=[ @@ -47,6 +65,27 @@ class Migration(migrations.Migration): 'db_table': 'system_setting', }, ), + migrations.CreateModel( + name='UserGroup', + fields=[ + ('id', models.CharField(default=uuid_utils.compat.uuid7, editable=False, max_length=128, primary_key=True, serialize=False, verbose_name='主键id')), + ('name', models.CharField(db_index=True, max_length=150, unique=True, verbose_name='名称')), + ], + options={ + 'db_table': 'user_group', + }, + ), + migrations.CreateModel( + name='UserGroupRelation', + fields=[ + ('id', models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id')), + ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='system_manage.usergroup', verbose_name='用户组')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='system_manage.chatuser', verbose_name='用户')), + ], + options={ + 'db_table': 'user_group_relation', + }, + ), migrations.CreateModel( name='WorkspaceUserResourcePermission', fields=[ @@ -64,4 +103,35 @@ class Migration(migrations.Migration): 'db_table': 'workspace_user_resource_permission', }, ), + migrations.CreateModel( + name='ResourceChatUserGroupAuthorize', + fields=[ + ('id', models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id')), + ('workspace_id', models.CharField(db_index=True, default='default', max_length=64, null=True, verbose_name='工作空间id')), + ('resource_id', models.UUIDField(db_index=True, verbose_name='资源id')), + ('resource_type', models.CharField(choices=[('KNOWLEDGE', '知识库'), ('APPLICATION', '应用')], db_index=True, verbose_name='资源类型')), + ('is_auth', models.BooleanField(verbose_name='是否授权')), + ('user_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='system_manage.usergroup', verbose_name='用户组')), + ], + options={ + 'db_table': 'resource_chat_user_group_authorize', + 'unique_together': {('user_group_id', 'resource_type', 'resource_id')}, + }, + ), + migrations.CreateModel( + name='ResourceChatUserAuthorize', + fields=[ + ('id', models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id')), + ('workspace_id', models.CharField(db_index=True, default='default', max_length=64, null=True, verbose_name='工作空间id')), + ('resource_id', models.UUIDField(db_index=True, verbose_name='资源id')), + ('resource_type', models.CharField(choices=[('KNOWLEDGE', '知识库'), ('APPLICATION', '应用')], db_index=True, verbose_name='资源类型')), + ('is_auth', models.BooleanField(verbose_name='是否授权')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='system_manage.chatuser', verbose_name='用户')), + ('user_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='system_manage.usergroup', verbose_name='用户组')), + ], + options={ + 'db_table': 'resource_chat_user_authorize', + 'unique_together': {('user_group_id', 'resource_type', 'resource_id', 'user_id')}, + }, + ), ]