正式发布v0.0.5版本

1. 新增docker部署
2. 新增添加线上静态文件转发模块
3. 新增是否使用插件功能配置项功能
4. 修复权限管理中自定义权限时,无部门的bug
5. 修复无效路由导致系统无法进入及添加校验路由是否有效

Author: Tylerlog

README.md

@@ -115,7 +115,7 @@ npm run build:prod
 7. 启动项目
 	python3 manage.py runserver 127.0.0.1:8000
 或使用 daphne :
-  daphne -b 0.0.0.0 application.asgi:application
+  daphne -b 0.0.0.0 -8000 application.asgi:application
 初始账号：superadmin 密码：admin123456
 后端接口文档地址：http://127.0.0.1:8000/swagger
 ~~~
@@ -125,7 +125,26 @@ npm run build:prod
 ### docker-compose 运行
 
 ~~~shell
-待完善
+# 先安装docker-compose (自行百度安装),执行此命令等待安装，如有使用celery插件请打开docker-compose.yml中celery 部分注释
+docker-compose up -d
+# 初始化后端数据(第一次执行即可)
+docker exec -ti dvadmin-pro-django bash
+python manage.py makemigrations 
+python manage.py migrate
+python manage.py init -y
+exit
+
+前端地址：http://127.0.0.1:8080
+后端地址：http://127.0.0.1:8000
+# 在服务器上请把127.0.0.1 换成自己公网ip
+账号：superadmin 密码：admin123456
+
+# docker-compose 停止
+docker-compose down
+#  docker-compose 重启
+docker-compose restart
+#  docker-compose 启动时重新进行 build
+docker-compose up -d --build
 ~~~
 
 

backend/application/settings.py

@@ -29,9 +29,8 @@
 SECRET_KEY = 'django-insecure--z8%exyzt7e_%i@1+#1mm=%lb5=^fx_57=1@a+_y7bg5-w%)sm'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = ['*']
+DEBUG = locals().get('DEBUG', True)
+ALLOWED_HOSTS = locals().get('ALLOWED_HOSTS', ['*'])
 
 # Application definition
 
@@ -52,6 +51,7 @@
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',  # 跨域中间件
     'django.middleware.common.CommonMiddleware',
@@ -91,7 +91,7 @@
         'NAME': DATABASE_NAME,
         'USER': DATABASE_USER,
         'PASSWORD': DATABASE_PASSWORD,
-        'HOST': DATABASE_HOST,
+        'HOST': os.getenv('DATABASE_HOST') or DATABASE_HOST,
         'PORT': DATABASE_PORT,
     }
 }
@@ -138,7 +138,6 @@
     os.path.join(BASE_DIR, "static"),
 ]
 
-
 MEDIA_ROOT = 'media'  # 项目下的目录
 MEDIA_URL = "/media/"  # 跟STATIC_URL类似，指定用户可以通过这个url找到文件
 
@@ -279,12 +278,12 @@
 
 # ====================================#
 # ****************swagger************#
-#====================================#
+# ====================================#
 SWAGGER_SETTINGS = {
     # 基础样式
     'SECURITY_DEFINITIONS': {
-    "basic":{
-        'type': 'basic'
+        "basic": {
+            'type': 'basic'
         }
     },
     # 如果需要登录才能够查看接口文档, 登录的链接使用restframework自带的.
@@ -303,7 +302,7 @@
     # 方法列表字母排序
     'OPERATIONS_SORTER': 'alpha',
     'VALIDATOR_URL': None,
-    'AUTO_SCHEMA_TYPE': 2, # 分组根据url层级分，0、1 或 2 层
+    'AUTO_SCHEMA_TYPE': 2,  # 分组根据url层级分，0、1 或 2 层
     'DEFAULT_AUTO_SCHEMA_CLASS': 'dvadmin.utils.swagger.CustomSwaggerAutoSchema',
 }
 
@@ -319,12 +318,11 @@
 CAPTCHA_FOREGROUND_COLOR = '#0033FF'  # 前景色
 CAPTCHA_BACKGROUND_COLOR = '#F5F7F4'  # 背景色
 CAPTCHA_NOISE_FUNCTIONS = (
-    'captcha.helpers.noise_arcs', # 线
-    'captcha.helpers.noise_dots', # 点
+    'captcha.helpers.noise_arcs',  # 线
+    'captcha.helpers.noise_dots',  # 点
 )
 # CAPTCHA_CHALLENGE_FUNCT = 'captcha.helpers.random_char_challenge' #字母验证码
-CAPTCHA_CHALLENGE_FUNCT = 'captcha.helpers.math_challenge' # 加减乘除验证码
-
+CAPTCHA_CHALLENGE_FUNCT = 'captcha.helpers.math_challenge'  # 加减乘除验证码
 
 # ================================================= #
 # ******************** 其他配置 ******************** #
@@ -346,6 +344,8 @@
 TABLE_PREFIX = "dvadmin_"
 DJANGO_CELERY_BEAT_TZ_AWARE = False
 CELERY_TIMEZONE = 'Asia/Shanghai'  # celery 时区问题
+# 静态页面压缩
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedStaticFilesStorage'
 # 初始化需要执行的列表，用来初始化后执行
 INITIALIZE_LIST = []
 INITIALIZE_RESET_LIST = []

backend/application/urls.py

@@ -72,15 +72,15 @@ def get_classes(arg):
             return name
     return ""
 
-
-with open(yamlPath, 'r', encoding='utf-8') as doc:
-    plugins_dict = json.load(doc)
-    # 进行排序
-    plugins_dict = dict(sorted(plugins_dict.items(), key=lambda x: x[1]['priority'], reverse=True))
-    for plugins_name, plugins_values in plugins_dict.items():
-        # 校验插件是否
-        if plugins_values.get('enable', None):
-            exec(f"""
+if getattr(settings, 'ENABLE_PLUGINS', True):
+    with open(yamlPath, 'r', encoding='utf-8') as doc:
+        plugins_dict = json.load(doc)
+        # 进行排序
+        plugins_dict = dict(sorted(plugins_dict.items(), key=lambda x: x[1]['priority'], reverse=True))
+        for plugins_name, plugins_values in plugins_dict.items():
+            # 校验插件是否
+            if plugins_values.get('enable', None):
+                exec(f"""
 # 获取 url_prefix 前缀
 from plugins.{plugins_name} import apps
 

backend/conf/env.example.py

@@ -3,7 +3,7 @@
 # ================================================= #
 # 数据库地址
 DATABASE_ENGINE = "django.db.backends.mysql"
-# 数据库地址
+# 数据库地址 改为自己数据库地址
 DATABASE_HOST = "127.0.0.1"
 # 数据库端口
 DATABASE_PORT = 3306
@@ -13,3 +13,10 @@
 DATABASE_PASSWORD = "123456"
 # 数据库名
 DATABASE_NAME = "dvadmin_pro"
+# ================================================= #
+# ************** 其他 配置  ************** #
+# ================================================= #
+DEBUG = True  # 线上环境请设置为True
+# 是否启用插件，不需要可以设置为False
+ENABLE_PLUGINS = True
+ALLOWED_HOSTS = ["*"]

backend/docker_start.sh

@@ -0,0 +1,4 @@
+# python manage.py makemigrations
+# python manage.py migrate
+# python manage.py init -y
+daphne -b 0.0.0.0 -p 8000 application.asgi:application

backend/dvadmin/system/initialize.py

@@ -9,6 +9,7 @@
 django.setup()
 
 from dvadmin.system.models import Dept, Button, Menu, MenuButton, Role, Users
+from dvadmin.system.util import init_area
 
 
 class Initialize(CoreInitialize):
@@ -77,6 +78,9 @@ def init_menu(self):
             {"id": "97b8fd88-0510-4db7-8d53-983a04843c4c", "name": "字典管理", "sort": 1, "web_path": "/dictionary",
              "icon": "clock-o", "parent_id": "54f769b0-3dff-416c-8102-e55ec44827cc", "component": "system/dictionary",
              "component_name": "dictionary"},
+            {"id": "97b8fd88-0510-4db7-8d53-983a04844c4c", "name": "地区管理", "sort": 6, "web_path": "/area",
+             "icon": "area-chart", "parent_id": "54f769b0-3dff-416c-8102-e55ec44827cc", "component": "system/area",
+             "component_name": "dictionary"},
             {"id": "805390f3-a6e6-411e-9798-eebd34b76204", "name": "附件管理", "sort": 7, "web_path": "",
              "icon": "envelope", "parent_id": "54f769b0-3dff-416c-8102-e55ec44827cc", },
             {"id": "ac956a17-87d3-4b61-8f72-44a97b9fbcd1", "name": "图片管理", "sort": 1, "web_path": "/img",
@@ -264,6 +268,7 @@ def run(self):
         self.init_menu_button()
         self.init_role()
         self.init_users()
+        init_area.main()  # 初始化地区数据
 
 
 # 项目init 初始化，默认会执行 main 方法进行初始化

backend/dvadmin/system/models.py

@@ -127,7 +127,7 @@ class Menu(CoreModel):
         (1, "是"),
     )
     is_link = models.IntegerField(choices=ISLINK_CHOICES, default=0, verbose_name="是否外链", help_text="是否外链")
-    is_catalog = models.IntegerField(choices=ISLINK_CHOICES,default=0,verbose_name="是否目录",help_text="是否目录")
+    is_catalog = models.IntegerField(choices=ISLINK_CHOICES, default=0, verbose_name="是否目录", help_text="是否目录")
     web_path = models.CharField(max_length=128, verbose_name="路由地址", null=True, blank=True, help_text="路由地址")
     component = models.CharField(max_length=128, verbose_name="组件地址", null=True, blank=True, help_text="组件地址")
     component_name = models.CharField(max_length=50, verbose_name="组件名称", null=True, blank=True, help_text="组件名称")
@@ -263,3 +263,23 @@ class Meta:
         verbose_name = '文件管理'
         verbose_name_plural = verbose_name
         ordering = ('-create_datetime',)
+
+
+class Area(CoreModel):
+    name = models.CharField(max_length=100, verbose_name="名称", help_text="名称")
+    code = models.CharField(max_length=20, verbose_name="地区编码", help_text="地区编码", unique=True, db_index=True)
+    level = models.BigIntegerField(verbose_name="地区层级(1省份 2城市 3区县 4乡级)", help_text="地区层级(1省份 2城市 3区县 4乡级)")
+    pinyin = models.CharField(max_length=255, verbose_name="拼音", help_text="拼音")
+    initials = models.CharField(max_length=20, verbose_name="首字母", help_text="首字母")
+    enable = models.BooleanField(default=True, verbose_name="是否启用", help_text="是否启用")
+    pcode = models.ForeignKey(to='self', verbose_name='父地区编码', to_field="code", on_delete=models.CASCADE,
+                              db_constraint=False, null=True, blank=True, help_text="父地区编码")
+
+    class Meta:
+        db_table = table_prefix + "area"
+        verbose_name = '地区表'
+        verbose_name_plural = verbose_name
+        ordering = ('code',)
+
+    def __str__(self):
+        return f"{self.name}"

backend/dvadmin/system/urls.py

@@ -9,6 +9,7 @@
 from django.urls import path, re_path
 from rest_framework import routers
 
+from dvadmin.system.views.area import AreaViewSet
 from dvadmin.system.views.button import ButtonViewSet
 from dvadmin.system.views.dept import DeptViewSet
 from dvadmin.system.views.dictionary import DictionaryViewSet
@@ -28,16 +29,15 @@
 system_url.register(r'dept', DeptViewSet)
 system_url.register(r'user', UserViewSet)
 system_url.register(r'operation_log', OperationLogViewSet)
-system_url.register(r'dictionary',DictionaryViewSet)
-system_url.register(r'img',ImgViewSet)
-system_url.register(r'file',FileViewSet)
-
-
+system_url.register(r'dictionary', DictionaryViewSet)
+system_url.register(r'area', AreaViewSet)
+system_url.register(r'img', ImgViewSet)
+system_url.register(r'file', FileViewSet)
 
 urlpatterns = [
     re_path('role/role_id_to_menu/(?P<pk>.*?)/', RoleViewSet.as_view({'get': 'roleId_to_menu'})),
     path('menu/web_router/', MenuViewSet.as_view({'get': 'web_router'})),
-    path('user/user_info/',UserViewSet.as_view({'get':'user_info','put':'update_user_info'})),
-    re_path('user/change_password/(?P<pk>.*?)/',UserViewSet.as_view({'put':'change_password'})),
+    path('user/user_info/', UserViewSet.as_view({'get': 'user_info', 'put': 'update_user_info'})),
+    re_path('user/change_password/(?P<pk>.*?)/', UserViewSet.as_view({'put': 'change_password'})),
 ]
 urlpatterns += system_url.urls

backend/dvadmin/system/util/init_area.py

@@ -0,0 +1,58 @@
+# 城市联动
+"""
+到乡级 使用方法
+1. https://www.npmjs.com/package/china-division 下载数据，把对应的json放入对应目录
+2. 修改此文件中对应json名
+3. 右击执行此py文件进行初始化
+"""
+import json
+import os
+
+import django
+import pypinyin
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
+django.setup()
+from application.settings import BASE_DIR
+from dvadmin.system.models import Area
+
+area_code_list = []
+
+
+def area_list(code_list, pcode=None, depth=1):
+    """
+    递归获取所有列表
+    """
+    for code_dict in code_list:
+        code = code_dict.get('code', None)
+        name = code_dict.get('name', None)
+        children = code_dict.get('children', None)
+        pinyin = ''.join([''.join(i) for i in pypinyin.pinyin(name, style=pypinyin.NORMAL)])
+        area_code_list.append(
+            {
+                "name": name,
+                "code": code,
+                "level": depth,
+                "pinyin": pinyin,
+                "initials": pinyin[0].upper() if pinyin else "#",
+                "pcode_id": pcode,
+            }
+        )
+        if children:
+            area_list(code_list=children, pcode=code, depth=depth + 1)
+
+
+def main():
+    with open(os.path.join(BASE_DIR, 'dvadmin', 'system', 'util', 'pca-code.json'), 'r') as load_f:
+        code_list = json.load(load_f)
+    area_list(code_list)
+    if Area.objects.count() == 0:
+        Area.objects.bulk_create([Area(**ele) for ele in area_code_list])
+    else:
+        for ele in area_code_list:
+            code = ele.pop("code")
+            Area.objects.update_or_create(code=code, defaults=ele)
+
+
+if __name__ == '__main__':
+    main()