修复导包apps 问题

dvadmin-backend/application/settings.py

@@ -13,6 +13,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/
 # 导入全局环境变量
 import datetime
 import os
+import sys
 
 from mongoengine import connect
 
@@ -20,7 +21,7 @@ from conf.env import *
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
+sys.path.insert(0,os.path.join(BASE_DIR,'apps'))
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
 

dvadmin-backend/apps/vadmin/op_drf/apps.py

@@ -6,7 +6,7 @@ logger = logging.getLogger(__name__)
 
 
 class OpDrfConfig(AppConfig):
-    name = 'vadmin.op_drf'
+    name = 'apps.vadmin.op_drf'
     verbose_name = "OP DRF"
 
     def ready(self):

dvadmin-backend/apps/vadmin/op_drf/fields.py

@@ -2,7 +2,7 @@ from django.contrib.auth import get_user_model
 from django.db import models
 from django.db.models import SET_NULL
 
-from ...vadmin.utils.string_util import uuid_8, uuid_16, uuid_32, uuid_36
+from ..utils.string_util import uuid_8, uuid_16, uuid_32, uuid_36
 
 
 class IdField(models.CharField):

dvadmin-backend/apps/vadmin/permission/apps.py

@@ -2,5 +2,5 @@ from django.apps import AppConfig
 
 
 class PermissionConfig(AppConfig):
-    name = 'vadmin.permission'
+    name = 'apps.vadmin.permission'
     verbose_name = "权限管理"

dvadmin-backend/apps/vadmin/system/migrations/0001_initial.py

@@ -1,165 +0,0 @@
-# Generated by Django 2.2.16 on 2021-03-13 07:50
-
-import apps.vadmin.op_drf.fields
-import apps.vadmin.system.models.save_file
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DictData',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', apps.vadmin.op_drf.fields.DescriptionField(blank=True, default='', help_text='描述', null=True, verbose_name='描述')),
-                ('modifier', apps.vadmin.op_drf.fields.ModifierCharField(blank=True, help_text='该记录最后修改者', max_length=255, null=True, verbose_name='修改者')),
-                ('update_datetime', apps.vadmin.op_drf.fields.UpdateDateTimeField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
-                ('create_datetime', apps.vadmin.op_drf.fields.CreateDateTimeField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
-                ('dictName', models.CharField(max_length=64, verbose_name='字典名称')),
-                ('dictType', models.CharField(max_length=64, verbose_name='字典类型')),
-                ('status', models.CharField(max_length=8, verbose_name='字典状态')),
-                ('remark', models.CharField(blank=True, max_length=256, null=True, verbose_name='备注')),
-                ('creator', models.ForeignKey(db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_query_name='creator_query', to=settings.AUTH_USER_MODEL, verbose_name='创建者')),
-            ],
-            options={
-                'verbose_name': '字典管理',
-                'verbose_name_plural': '字典管理',
-            },
-        ),
-        migrations.CreateModel(
-            name='MessagePush',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', apps.vadmin.op_drf.fields.DescriptionField(blank=True, default='', help_text='描述', null=True, verbose_name='描述')),
-                ('modifier', apps.vadmin.op_drf.fields.ModifierCharField(blank=True, help_text='该记录最后修改者', max_length=255, null=True, verbose_name='修改者')),
-                ('update_datetime', apps.vadmin.op_drf.fields.UpdateDateTimeField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
-                ('create_datetime', apps.vadmin.op_drf.fields.CreateDateTimeField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
-                ('title', models.CharField(max_length=128, verbose_name='通知标题')),
-                ('content', models.TextField(verbose_name='通知内容')),
-                ('message_type', models.CharField(max_length=8, verbose_name='通知类型')),
-                ('is_reviewed', models.BooleanField(default=True, verbose_name='是否审核')),
-                ('status', models.CharField(max_length=8, verbose_name='通知状态')),
-                ('to_path', models.CharField(blank=True, max_length=256, null=True, verbose_name='跳转路径')),
-                ('creator', models.ForeignKey(db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_query_name='creator_query', to=settings.AUTH_USER_MODEL, verbose_name='创建者')),
-            ],
-            options={
-                'verbose_name': '通知公告',
-                'verbose_name_plural': '通知公告',
-            },
-        ),
-        migrations.CreateModel(
-            name='WebSet',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', apps.vadmin.op_drf.fields.DescriptionField(blank=True, default='', help_text='描述', null=True, verbose_name='描述')),
-                ('modifier', apps.vadmin.op_drf.fields.ModifierCharField(blank=True, help_text='该记录最后修改者', max_length=255, null=True, verbose_name='修改者')),
-                ('update_datetime', apps.vadmin.op_drf.fields.UpdateDateTimeField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
-                ('create_datetime', apps.vadmin.op_drf.fields.CreateDateTimeField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
-                ('name', models.CharField(max_length=64, verbose_name='站点名称')),
-                ('web_site', models.CharField(blank=True, max_length=256, null=True, verbose_name='站点网址')),
-                ('logo', models.CharField(blank=True, max_length=256, null=True, verbose_name='网站Logo')),
-                ('record_info', models.TextField(blank=True, null=True, verbose_name='备案信息')),
-                ('statistics_code', models.TextField(blank=True, null=True, verbose_name='统计代码')),
-                ('copyright_info', models.TextField(blank=True, null=True, verbose_name='版权信息')),
-                ('creator', models.ForeignKey(db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_query_name='creator_query', to=settings.AUTH_USER_MODEL, verbose_name='创建者')),
-            ],
-            options={
-                'verbose_name': '站点设置',
-                'verbose_name_plural': '站点设置',
-            },
-        ),
-        migrations.CreateModel(
-            name='SaveFile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', apps.vadmin.op_drf.fields.DescriptionField(blank=True, default='', help_text='描述', null=True, verbose_name='描述')),
-                ('modifier', apps.vadmin.op_drf.fields.ModifierCharField(blank=True, help_text='该记录最后修改者', max_length=255, null=True, verbose_name='修改者')),
-                ('update_datetime', apps.vadmin.op_drf.fields.UpdateDateTimeField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
-                ('create_datetime', apps.vadmin.op_drf.fields.CreateDateTimeField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
-                ('name', models.CharField(blank=True, max_length=128, null=True, verbose_name='文件名称')),
-                ('type', models.CharField(blank=True, max_length=32, null=True, verbose_name='文件类型')),
-                ('size', models.CharField(blank=True, max_length=64, null=True, verbose_name='文件大小')),
-                ('address', models.CharField(blank=True, max_length=16, null=True, verbose_name='存储位置')),
-                ('oss_url', models.CharField(blank=True, max_length=200, null=True, verbose_name='OSS地址')),
-                ('status', models.BooleanField(default=True, verbose_name='文件是否存在')),
-                ('file', models.FileField(upload_to=apps.vadmin.system.models.save_file.files_path, verbose_name='文件URL')),
-                ('creator', models.ForeignKey(db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_query_name='creator_query', to=settings.AUTH_USER_MODEL, verbose_name='创建者')),
-            ],
-            options={
-                'verbose_name': '文件管理',
-                'verbose_name_plural': '文件管理',
-            },
-        ),
-        migrations.CreateModel(
-            name='MessagePushUser',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('is_read', models.BooleanField(default=False, verbose_name='是否已读')),
-                ('update_datetime', apps.vadmin.op_drf.fields.UpdateDateTimeField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
-                ('create_datetime', apps.vadmin.op_drf.fields.CreateDateTimeField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
-                ('message_push', models.ForeignKey(db_constraint=False, help_text='消息通知', on_delete=django.db.models.deletion.CASCADE, related_name='messagepushuser_message_push', to='system.MessagePush', verbose_name='消息通知')),
-                ('user', models.ForeignKey(db_constraint=False, help_text='用户', on_delete=django.db.models.deletion.CASCADE, related_name='messagepushuser_user', to=settings.AUTH_USER_MODEL, verbose_name='用户')),
-            ],
-            options={
-                'verbose_name': '通知公告与用户关系',
-                'verbose_name_plural': '通知公告与用户关系',
-            },
-        ),
-        migrations.AddField(
-            model_name='messagepush',
-            name='user',
-            field=models.ManyToManyField(related_name='user', related_query_name='user_query', through='system.MessagePushUser', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.CreateModel(
-            name='DictDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', apps.vadmin.op_drf.fields.DescriptionField(blank=True, default='', help_text='描述', null=True, verbose_name='描述')),
-                ('modifier', apps.vadmin.op_drf.fields.ModifierCharField(blank=True, help_text='该记录最后修改者', max_length=255, null=True, verbose_name='修改者')),
-                ('update_datetime', apps.vadmin.op_drf.fields.UpdateDateTimeField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
-                ('create_datetime', apps.vadmin.op_drf.fields.CreateDateTimeField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
-                ('dictLabel', models.CharField(max_length=64, verbose_name='字典标签')),
-                ('dictValue', models.CharField(max_length=256, verbose_name='字典键值')),
-                ('is_default', models.BooleanField(default=False, verbose_name='是否默认')),
-                ('status', models.CharField(max_length=2, verbose_name='字典状态')),
-                ('sort', models.CharField(max_length=256, verbose_name='字典排序')),
-                ('remark', models.CharField(blank=True, max_length=256, null=True, verbose_name='备注')),
-                ('creator', models.ForeignKey(db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_query_name='creator_query', to=settings.AUTH_USER_MODEL, verbose_name='创建者')),
-                ('dict_data', models.ForeignKey(db_constraint=False, on_delete=django.db.models.deletion.CASCADE, to='system.DictData', verbose_name='关联字典')),
-            ],
-            options={
-                'verbose_name': '字典详情',
-                'verbose_name_plural': '字典详情',
-            },
-        ),
-        migrations.CreateModel(
-            name='ConfigSettings',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', apps.vadmin.op_drf.fields.DescriptionField(blank=True, default='', help_text='描述', null=True, verbose_name='描述')),
-                ('modifier', apps.vadmin.op_drf.fields.ModifierCharField(blank=True, help_text='该记录最后修改者', max_length=255, null=True, verbose_name='修改者')),
-                ('update_datetime', apps.vadmin.op_drf.fields.UpdateDateTimeField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
-                ('create_datetime', apps.vadmin.op_drf.fields.CreateDateTimeField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
-                ('configName', models.CharField(max_length=64, verbose_name='参数名称')),
-                ('configKey', models.CharField(max_length=256, verbose_name='参数键名')),
-                ('configValue', models.CharField(max_length=256, verbose_name='参数键值')),
-                ('configType', models.CharField(max_length=8, verbose_name='是否内置')),
-                ('status', models.CharField(max_length=8, verbose_name='参数状态')),
-                ('remark', models.CharField(blank=True, max_length=256, null=True, verbose_name='备注')),
-                ('creator', models.ForeignKey(db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_query_name='creator_query', to=settings.AUTH_USER_MODEL, verbose_name='创建者')),
-            ],
-            options={
-                'verbose_name': '参数设置',
-                'verbose_name_plural': '参数设置',
-            },
-        ),
-    ]