zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: The project cannot be started (#2040)

Browse Source
This commit is contained in:
shaohuzhang1 2025-01-20 15:03:16 +08:00 committed by GitHub
parent e350a221c9
commit defe853728
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/application/migrations/0024_applicationaccesstoken_language.py
View File

@ -1,7 +1,7 @@
# Generated by Django 4.2.15 on 2025-01-20 03:20 # Generated by Django 4.2.15 on 2025-01-20 06:59
import application.models.api_key_model
from django.db import migrations, models from django.db import migrations, models
import smartdoc.conf
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='applicationaccesstoken', model_name='applicationaccesstoken',
name='language', name='language',
field=models.CharField(default=smartdoc.conf.Config.get_language_code, max_length=10, verbose_name='语言'), field=models.CharField(default=application.models.api_key_model.get_language, max_length=10, verbose_name='语言'),
), ),
] ]

6
apps/application/models/api_key_model.py
View File

@ -17,6 +17,10 @@ from smartdoc.const import CONFIG
from users.models import User from users.models import User
def get_language():
return CONFIG.get_language_code()
class ApplicationApiKey(AppModelMixin): class ApplicationApiKey(AppModelMixin):
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid1, editable=False, verbose_name="主键id") id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid1, editable=False, verbose_name="主键id")
secret_key = models.CharField(max_length=1024, verbose_name="秘钥", unique=True) secret_key = models.CharField(max_length=1024, verbose_name="秘钥", unique=True)
@ -46,7 +50,7 @@ class ApplicationAccessToken(AppModelMixin):
, default=list) , default=list)
show_source = models.BooleanField(default=False, verbose_name="是否显示知识来源") show_source = models.BooleanField(default=False, verbose_name="是否显示知识来源")
language = models.CharField(max_length=10, verbose_name="语言", default=CONFIG.get_language_code) language = models.CharField(max_length=10, verbose_name="语言", default=get_language)
class Meta: class Meta:
db_table = "application_access_token" db_table = "application_access_token"

6
apps/users/migrations/0005_user_language.py
View File

@ -1,7 +1,7 @@
# Generated by Django 4.2.15 on 2025-01-20 03:19 # Generated by Django 4.2.15 on 2025-01-20 06:59
from django.db import migrations, models from django.db import migrations, models
import smartdoc.conf import users.models.user
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='language', name='language',
field=models.CharField(default=smartdoc.conf.Config.get_language_code, max_length=10, verbose_name='语言'), field=models.CharField(default=users.models.user.get_language, max_length=10, verbose_name='语言'),
), ),
] ]

6
apps/users/models/user.py
View File

@ -23,6 +23,10 @@ __all__ = ["User", "password_encrypt", 'get_user_dynamics_permission']
from smartdoc.const import CONFIG from smartdoc.const import CONFIG
def get_language():
return CONFIG.get_language_code()
def password_encrypt(raw_password): def password_encrypt(raw_password):
""" """
密码 md5加密 密码 md5加密
@ -73,7 +77,7 @@ class User(AppModelMixin):
role = models.CharField(max_length=150, verbose_name="角色") role = models.CharField(max_length=150, verbose_name="角色")
source = models.CharField(max_length=10, verbose_name="来源", default="LOCAL") source = models.CharField(max_length=10, verbose_name="来源", default="LOCAL")
is_active = models.BooleanField(default=True) is_active = models.BooleanField(default=True)
language = models.CharField(max_length=10, verbose_name="语言", default=CONFIG.get_language_code) language = models.CharField(max_length=10, verbose_name="语言", default=get_language)
create_time = models.DateTimeField(verbose_name="创建时间", auto_now_add=True, null=True) create_time = models.DateTimeField(verbose_name="创建时间", auto_now_add=True, null=True)
update_time = models.DateTimeField(verbose_name="修改时间", auto_now=True, null=True) update_time = models.DateTimeField(verbose_name="修改时间", auto_now=True, null=True)