Skip to content

Commit 005af8c

Browse files
committed
fix: The project cannot be started
1 parent e350a22 commit 005af8c

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

apps/application/migrations/0024_applicationaccesstoken_language.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Generated by Django 4.2.15 on 2025-01-20 03:20
1+
# Generated by Django 4.2.15 on 2025-01-20 06:59
22

3+
import application.models.api_key_model
34
from django.db import migrations, models
4-
import smartdoc.conf
55

66

77
class Migration(migrations.Migration):
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
1414
migrations.AddField(
1515
model_name='applicationaccesstoken',
1616
name='language',
17-
field=models.CharField(default=smartdoc.conf.Config.get_language_code, max_length=10, verbose_name='语言'),
17+
field=models.CharField(default=application.models.api_key_model.get_language, max_length=10, verbose_name='语言'),
1818
),
1919
]

apps/application/models/api_key_model.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
from users.models import User
1818

1919

20+
def get_language():
21+
return CONFIG.get_language_code()
22+
23+
2024
class ApplicationApiKey(AppModelMixin):
2125
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid1, editable=False, verbose_name="主键id")
2226
secret_key = models.CharField(max_length=1024, verbose_name="秘钥", unique=True)
@@ -46,7 +50,7 @@ class ApplicationAccessToken(AppModelMixin):
4650
, default=list)
4751
show_source = models.BooleanField(default=False, verbose_name="是否显示知识来源")
4852

49-
language = models.CharField(max_length=10, verbose_name="语言", default=CONFIG.get_language_code)
53+
language = models.CharField(max_length=10, verbose_name="语言", default=get_language)
5054

5155
class Meta:
5256
db_table = "application_access_token"

apps/users/migrations/0005_user_language.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Generated by Django 4.2.15 on 2025-01-20 03:19
1+
# Generated by Django 4.2.15 on 2025-01-20 06:59
22

33
from django.db import migrations, models
4-
import smartdoc.conf
4+
import users.models.user
55

66

77
class Migration(migrations.Migration):
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
1414
migrations.AddField(
1515
model_name='user',
1616
name='language',
17-
field=models.CharField(default=smartdoc.conf.Config.get_language_code, max_length=10, verbose_name='语言'),
17+
field=models.CharField(default=users.models.user.get_language, max_length=10, verbose_name='语言'),
1818
),
1919
]

apps/users/models/user.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
from smartdoc.const import CONFIG
2424

2525

26+
def get_language():
27+
return CONFIG.get_language_code()
28+
29+
2630
def password_encrypt(raw_password):
2731
"""
2832
密码 md5加密
@@ -73,7 +77,7 @@ class User(AppModelMixin):
7377
role = models.CharField(max_length=150, verbose_name="角色")
7478
source = models.CharField(max_length=10, verbose_name="来源", default="LOCAL")
7579
is_active = models.BooleanField(default=True)
76-
language = models.CharField(max_length=10, verbose_name="语言", default=CONFIG.get_language_code)
80+
language = models.CharField(max_length=10, verbose_name="语言", default=get_language)
7781
create_time = models.DateTimeField(verbose_name="创建时间", auto_now_add=True, null=True)
7882
update_time = models.DateTimeField(verbose_name="修改时间", auto_now=True, null=True)
7983

0 commit comments

Comments
 (0)