项目打包

longkex · Dec 13, 2019 · db81eb4 · db81eb4
1 parent bd551be
commit db81eb4
Show file tree

Hide file tree

Showing 136 changed files with 23,191 additions and 112 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -1 +1,36 @@
-> Django 2
+> 这是对之前一个项目的升级 [旧版项目地址](https://github.com/wkunzhi/rbac-stark-crm)
+包含可拆卸 权限组件rbac 与 stark插件 可以单独取出代码并运用到任意后端开发项目中。 该套CRM系统就是用rbac组件+stark组件开发的实例项目
+
+# 开发环境
+- Django 2.2.1
+- Python 3.6
+
+# 目录
+- rbac **权限与菜单组件**
+- stark **路由组件**
+- web **业务逻辑**
+- static **静态文件**
+
+
+# 截图
+**菜单分配**
+![](https://zok-blog.oss-cn-hangzhou.aliyuncs.com/images/20191213/WX20191213-110528.png)
+**用户管理**
+![](https://zok-blog.oss-cn-hangzhou.aliyuncs.com/images/20191213/WX20191213-110557.png)
+**权限分配**
+![](https://zok-blog.oss-cn-hangzhou.aliyuncs.com/images/20191213/WX20191213-110617.png)
+**菜单路由**
+![](https://zok-blog.oss-cn-hangzhou.aliyuncs.com/images/20191213/WX20191213-110714.png)
+**信息管理**
+![](https://zok-blog.oss-cn-hangzhou.aliyuncs.com/images/20191213/WX20191213-110731.png)
+
+
+# rbac 组件使用
+[**rbac 说明文档**](https://blog.zhangkunzhi.com/2019/12/13/crm%E7%BB%84%E4%BB%B6%E4%BD%BF%E7%94%A8/index.html)
+
+# stark 组件使用说明
+
+[**stark 说明文档**](https://blog.zhangkunzhi.com/2019/12/13/stark%E7%BB%84%E4%BB%B6%E4%BD%BF%E7%94%A8/index.html)
+
+# QQ群
+![](https://zok-blog.oss-cn-hangzhou.aliyuncs.com/2019/11/18/wx201911181627012x.png)
diff --git a/rbac/__pycache__/models.cpython-37.pyc b/rbac/__pycache__/models.cpython-37.pyc
diff --git a/rbac/__pycache__/urls.cpython-37.pyc b/rbac/__pycache__/urls.cpython-37.pyc
diff --git a/rbac/forms/__pycache__/menu.cpython-37.pyc b/rbac/forms/__pycache__/menu.cpython-37.pyc
diff --git a/rbac/forms/menu.py b/rbac/forms/menu.py
@@ -16,10 +16,11 @@ class MenuModelForm(forms.ModelForm):
     """一级菜单FORM"""
     class Meta:
         model = models.Menu
-        fields = ['title', 'icon']
+        fields = ['title', 'sort', 'icon']
         # 给标签加上boot样式
         widgets = {
             'title': forms.TextInput(attrs={'class': 'layui-input'}),  # 渲染的时候添加class属性
+            'sort': forms.TextInput(attrs={'class': 'layui-input'}),
             'icon': forms.RadioSelect(  # 转换成单选框 Radio
                 choices=icon_list,
                 attrs={'class': 'clearfix'}  # boot中清除浮动

diff --git a/rbac/middlewares/__pycache__/rbac.cpython-37.pyc b/rbac/middlewares/__pycache__/rbac.cpython-37.pyc
diff --git a/rbac/middlewares/rbac.py b/rbac/middlewares/rbac.py
@@ -73,4 +73,4 @@ def process_request(self, request):
                 break
 
         if not flag:
-            return HttpResponse('你的账户无权访问该页面')
+            return HttpResponse('你的账户无权访问该页面<a href="/login">点击登录</a>')
diff --git a/rbac/migrations/__pycache__/0001_initial.cpython-37.pyc b/rbac/migrations/__pycache__/0001_initial.cpython-37.pyc
diff --git a/rbac/models.py b/rbac/models.py
@@ -7,6 +7,9 @@ class Menu(models.Model):
     """
     title = models.CharField(verbose_name='菜单名称', max_length=32)
     # 图标http://fontawesome.dashgame.com/
+
+    sort = models.IntegerField(verbose_name='显示顺序', default=1)
+
     icon = models.CharField(verbose_name='菜单图标', max_length=32)  # blank 为admin后台可以空
 
     def __str__(self):

diff --git a/rbac/service/__pycache__/init_permission.cpython-37.pyc b/rbac/service/__pycache__/init_permission.cpython-37.pyc
diff --git a/rbac/service/init_permission.py b/rbac/service/init_permission.py
@@ -13,17 +13,19 @@ def init_permission(current_user, request):
     """
     # 取用户【权限+菜单信息】放入session。
     # __多对多跨表 _单跨表查询 distinct()去重 isnull==False不为空
-    permission_queryset = current_user.roles.filter(permissions__isnull=False).values("permissions__id",
-                                                                                      "permissions__url",
-                                                                                      "permissions__title",
-                                                                                      "permissions__name",
-                                                                                      "permissions__pid__id",
-                                                                                      "permissions__pid__title",
-                                                                                      "permissions__pid__url",
-                                                                                      "permissions__menu_id",
-                                                                                      "permissions__menu__icon",
-                                                                                      "permissions__menu__title",
-                                                                                      ).distinct()
+    permission_queryset = current_user.roles.filter(permissions__isnull=False).order_by(
+        'permissions__menu__sort').values("permissions__id",
+                                          "permissions__url",
+                                          "permissions__title",
+                                          "permissions__name",
+                                          "permissions__pid__id",
+                                          "permissions__pid__title",
+                                          "permissions__pid__url",
+                                          "permissions__menu_id",
+                                          "permissions__menu__icon",
+                                          "permissions__menu__title",
+                                          "permissions__menu__sort",
+                                          ).distinct()
     # 取菜单+权限
     permission_dict = {}  # 储存权限信息（包含对应归属菜单 id，自己本身是菜单就为null）key 就是权限表中的别名name
     menu_dict = {}  # 储存（一二级）菜单信息 字典
@@ -44,7 +46,8 @@ def init_permission(current_user, request):
         if not menu_id:  # null则不是菜单
             continue
 
-        node = {'id': item['permissions__id'], 'title': item['permissions__title'], 'url': item['permissions__url']}  # 当前二级菜单信息存遍历node，便于调用
+        node = {'id': item['permissions__id'], 'title': item['permissions__title'],
+                'url': item['permissions__url']}  # 当前二级菜单信息存遍历node，便于调用
         if menu_id in menu_dict:
             # 有1级菜单id就添加append
             menu_dict[menu_id].get('children').append(node)
@@ -53,9 +56,11 @@ def init_permission(current_user, request):
             menu_dict[menu_id] = {
                 'title': item['permissions__menu__title'],  # 取menu表内对应一级菜单名
                 'icon': item['permissions__menu__icon'],
+                'sort': item['permissions__menu__sort'],
                 'children': [node, ]
             }
 
     print('权限', permission_dict)
+    print('菜单', menu_dict)
     request.session[settings.MENU_SESSION_KEY] = menu_dict
     request.session[settings.PERMISSION_SESSION_KEY] = permission_dict
diff --git a/rbac/templates/layout.html b/rbac/templates/layout.html
@@ -101,7 +101,7 @@
             <a href="javascript:;"> <cite><i class="layui-icon layui-icon-username"></i> 用户</cite> <span
                     class="layui-nav-more"></span></a>
             <dl class="layui-nav-child layui-anim layui-anim-upbit">
-                <dd layadmin-event="logout" style="text-align: center;"><a>退出</a></dd>
+                <dd layadmin-event="logout" style="text-align: center;"><a href="\logout">退出</a></dd>
             </dl>
         </li>
         <li class="layui-nav-item layui-hide-xs" lay-unselect="">

diff --git a/rbac/templates/rbac/menu_list.html b/rbac/templates/rbac/menu_list.html
@@ -22,7 +22,7 @@
                     <div class="layui-card">
                         <div class="layui-card-header">菜单说明</div>
                         <div class="layui-card-body">
-                            后台左侧菜单可以在此处进行配置 | 图标设置清空缓存才生效<br>
+                            修改菜单后需要重新登录才生效！！<br>
                             可进行操作右包含: 增加、删除、修改一级二级菜单
                         </div>
                     </div>

diff --git a/rbac/templatetags/__pycache__/rbac.cpython-37.pyc b/rbac/templatetags/__pycache__/rbac.cpython-37.pyc
diff --git a/rbac/templatetags/rbac.py b/rbac/templatetags/rbac.py
@@ -21,11 +21,9 @@ def multi_menu(request):
     :return:
     """
     menu_dict = request.session[settings.MENU_SESSION_KEY]
-
     '''必须排序，因为dict 是无序的，可能后台显示菜单每次顺序不同'''
     # 对字典的key进行排序
-    key_list = sorted(menu_dict)
-
+    key_list = menu_dict
     # 空的有序字典
     ordered_dict = OrderedDict()
 

diff --git a/rbac/urls.py b/rbac/urls.py
@@ -13,14 +13,6 @@
     url(r'^role/edit/(?P<pk>\d+)/$', role.role_edit, name='role_edit'),  # {% url 'rbac:role_edit' %}
     url(r'^role/del/(?P<pk>\d+)/$', role.role_del, name='role_del'),  # {% url 'rbac:role_edit' %}
 
-    # 用户管理
-    # path('user/list/', user.user_list, name='user_list'),
-    # path('user/add/', user.user_add, name='user_add'),
-    # url(r'^user/edit/(?P<pk>\d+)/$', user.user_edit, name='user_edit'),  # {% url 'rbac:user_edit' %}
-    # url(r'^user/del/(?P<pk>\d+)/$', user.user_del, name='user_del'),  # {% url 'rbac:user_edit' %}
-    # url(r'^user/reset/password/(?P<pk>\d+)/$', user.user_reset_pwd, name='user_reset_pwd'),  # {% url 'rbac:user_edit' %}
-
-
     # 权限分配菜单（一级菜单）
     path('menu/list/', menu.menu_list, name='menu_list'),
     path('menu/add/', menu.menu_add, name='menu_add'),

diff --git a/rbac/views/__pycache__/menu.cpython-37.pyc b/rbac/views/__pycache__/menu.cpython-37.pyc
diff --git a/rbac/views/menu.py b/rbac/views/menu.py
@@ -22,8 +22,7 @@ def menu_list(request):
     :param request:
     :return:
     """
-    menus = models.Menu.objects.all()
-
+    menus = models.Menu.objects.order_by('sort')
     menu_id = request.GET.get('mid')  # 这是str类型 用户选择的一级菜单
     second_sid = request.GET.get('sid')  # 用户选择的二级菜单，做选中状态
     # print('second_sid', second_sid)

diff --git a/stark/__init__.py b/stark/__init__.py
diff --git a/stark/__pycache__/__init__.cpython-37.pyc b/stark/__pycache__/__init__.cpython-37.pyc
diff --git a/stark/__pycache__/admin.cpython-37.pyc b/stark/__pycache__/admin.cpython-37.pyc
diff --git a/stark/__pycache__/apps.cpython-37.pyc b/stark/__pycache__/apps.cpython-37.pyc
diff --git a/stark/__pycache__/models.cpython-37.pyc b/stark/__pycache__/models.cpython-37.pyc
diff --git a/stark/admin.py b/stark/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/stark/apps.py b/stark/apps.py
@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+from django.utils.module_loading import autodiscover_modules
+
+
+class StarkConfig(AppConfig):
+    name = 'stark'
+
+    def ready(self):
+        autodiscover_modules('stark')
diff --git a/stark/forms/__init__.py b/stark/forms/__init__.py
@@ -0,0 +1 @@
+# by [email protected]  
diff --git a/stark/forms/forms单独渲染插件.md b/stark/forms/forms单独渲染插件.md
diff --git a/stark/forms/widgets.py b/stark/forms/widgets.py
@@ -0,0 +1,6 @@
+# by [email protected]
+from django import forms
+
+
+class DateTimePickerInput(forms.TextInput):
+    template_name = 'stark/forms/widgets/datetime_picker.html'
diff --git a/stark/migrations/__init__.py b/stark/migrations/__init__.py
diff --git a/stark/migrations/__pycache__/__init__.cpython-37.pyc b/stark/migrations/__pycache__/__init__.cpython-37.pyc
diff --git a/stark/models.py b/stark/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/stark/service/__pycache__/v1.cpython-37.pyc b/stark/service/__pycache__/v1.cpython-37.pyc
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.contrib import admin

		# Register your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.db import models

		# Create your models here.