From cb1ee767754b907ecb068fda2f45419e958c2795 Mon Sep 17 00:00:00 2001
From: yongzy <635602689@qq.com>
Date: Fri, 12 Jul 2019 18:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=94=9F=E6=88=90=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea/workspace.xml"                      | 316 +++++++++++-------
 .../__pycache__/manage.cpython-36.pyc"        | Bin 0 -> 642 bytes
 .../db.sqlite3"                               | Bin 62464 -> 65536 bytes
 .../rbac/__pycache__/admin.cpython-36.pyc"    | Bin 553 -> 566 bytes
 .../rbac/__pycache__/models.cpython-36.pyc"   | Bin 1393 -> 1507 bytes
 .../rbac/admin.py"                            |   4 +-
 .../__pycache__/middleware.cpython-36.pyc"    | Bin 1088 -> 1075 bytes
 .../rbac/middlewares/middleware.py"           |   2 +-
 .../migrations/0002_permission_is_menu.py"    |  20 ++
 .../rbac/migrations/0003_permission_icon.py"  |  21 ++
 .../0002_permission_is_menu.cpython-36.pyc"   | Bin 0 -> 669 bytes
 .../0003_permission_icon.cpython-36.pyc"      | Bin 0 -> 705 bytes
 .../rbac/models.py"                           |   2 +
 .../web/templates/layout.html"                |  13 +-
 .../views/__pycache__/auth.cpython-36.pyc"    | Bin 922 -> 1198 bytes
 .../web/views/auth.py"                        |  23 +-
 16 files changed, 268 insertions(+), 133 deletions(-)
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/__pycache__/manage.cpython-36.pyc"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0002_permission_is_menu.py"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0003_permission_icon.py"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0002_permission_is_menu.cpython-36.pyc"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0003_permission_icon.cpython-36.pyc"

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml"
index beb1ffe..f3af2a2 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml"
@@ -68,77 +68,124 @@
     <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/views/auth.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="14" column="36" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="36" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="529">
-              <caret line="23" column="48" selection-start-line="23" selection-start-column="48" selection-end-line="23" selection-end-column="48" />
-              <folding>
-                <element signature="e#0#52#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2944">
-              <caret line="128" column="15" selection-start-line="128" selection-start-column="15" selection-end-line="128" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/rbac/models.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/templates/login.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/views/customer.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/urls.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="23">
-              <caret line="4" selection-start-line="4" selection-end-line="4" />
-              <folding>
-                <element signature="e#0#32#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/web/views/auth.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="65">
+                  <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="245">
+                  <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+                  <folding>
+                    <element signature="e#0#52#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/rbac/models.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="138">
+                  <caret line="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/rbac/admin.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="138">
+                  <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
+                  <folding>
+                    <element signature="e#0#32#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="226">
+                  <caret line="163" column="98" selection-start-line="163" selection-start-column="98" selection-end-line="163" selection-end-column="98" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/rbac/urls.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="92">
+                  <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/web/templates/index.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="46">
+                  <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/web/templates/login.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="281">
+                  <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="-1118">
+                  <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/web/urls.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="23">
+                  <caret line="4" selection-start-line="4" selection-end-line="4" />
+                  <folding>
+                    <element signature="e#0#32#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/web/views/auth.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="111">
+                  <caret line="28" column="49" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -156,22 +203,23 @@
       <list>
         <option value="$PROJECT_DIR$/rbac/views/login.py" />
         <option value="$PROJECT_DIR$/web/models.py" />
-        <option value="$PROJECT_DIR$/rbac/admin.py" />
         <option value="$PROJECT_DIR$/rbac/urls.py" />
         <option value="$PROJECT_DIR$/web/templates/login.py" />
         <option value="$PROJECT_DIR$/web/templates/login.html" />
-        <option value="$PROJECT_DIR$/rbac/models.py" />
         <option value="$PROJECT_DIR$/web/templates/index.html" />
         <option value="$PROJECT_DIR$/web/urls.py" />
-        <option value="$PROJECT_DIR$/web/views/auth.py" />
         <option value="$PROJECT_DIR$/luffy_permission/settings.py" />
+        <option value="$PROJECT_DIR$/rbac/admin.py" />
+        <option value="$PROJECT_DIR$/rbac/models.py" />
         <option value="$PROJECT_DIR$/rbac/middlewares/middleware.py" />
+        <option value="$PROJECT_DIR$/web/templates/layout.html" />
+        <option value="$PROJECT_DIR$/web/views/auth.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="640" />
-    <option name="y" value="50" />
+    <option name="x" value="-9" />
+    <option name="y" value="-9" />
     <option name="width" value="1154" />
     <option name="height" value="1045" />
   </component>
@@ -203,8 +251,19 @@
             <path>
               <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
-              <item name="rbac" type="462c0819:PsiDirectoryNode" />
-              <item name="middlewares" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
+              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
+              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -272,21 +331,23 @@
       <updated>1562827776331</updated>
       <workItem from="1562827785852" duration="8595000" />
       <workItem from="1562836703031" duration="41000" />
+      <workItem from="1562921631604" duration="4949000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="8636000" />
+    <option name="totallyTimeSpent" value="13585000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="513" y="40" width="922" height="835" extended-state="0" />
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49364406" visible="true" weight="0.27430555" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49364406" visible="true" weight="0.1735925" />
       <window_info id="Structure" order="1" sideWeight="0.50635594" side_tool="true" weight="0.29975125" />
       <window_info id="Favorites" order="2" sideWeight="0.50345784" side_tool="true" weight="0.211126" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.28354082" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3616" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.24655436" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.36507937" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -296,8 +357,8 @@
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="bottom" id="调试" order="11" weight="0.32843652" />
-      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32617188" />
-      <window_info anchor="bottom" id="Python Console" order="13" weight="0.39330545" />
+      <window_info anchor="bottom" id="Terminal" order="12" weight="0.32376397" />
+      <window_info anchor="bottom" id="Python Console" order="13" weight="0.3923445" />
       <window_info anchor="bottom" id="Concurrent Activities Diagram" order="14" weight="0.32780084" />
       <window_info anchor="bottom" id="manage.py@luffy_permission-空白版" order="15" weight="0.6329114" />
       <window_info anchor="bottom" id="Database Console" order="16" weight="0.2780269" />
@@ -336,94 +397,101 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/admin.py">
+    <entry file="file://$PROJECT_DIR$/rbac/views/login.py" />
+    <entry file="file://$PROJECT_DIR$/web/templates/login.py" />
+    <entry file="file://$PROJECT_DIR$/luffy_permission/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
+        <state relative-caret-position="138">
+          <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
           <folding>
-            <element signature="e#0#32#0" expanded="true" />
+            <element signature="e#650#690#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/urls.py">
+    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
+        <state relative-caret-position="2944">
+          <caret line="128" column="15" selection-start-line="128" selection-start-column="15" selection-end-line="128" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/views/login.py" />
-    <entry file="file://$PROJECT_DIR$/web/templates/login.py" />
-    <entry file="file://$PROJECT_DIR$/web/templates/index.html">
+    <entry file="file://$PROJECT_DIR$/web/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+        <state relative-caret-position="23">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+          <folding>
+            <element signature="e#0#32#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/luffy_permission/urls.py">
+    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1118">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/rbac/admin.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
-          <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
+          <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
           <folding>
-            <element signature="e#650#690#0" expanded="true" />
+            <element signature="e#0#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/views/auth.py">
+    <entry file="file://$PROJECT_DIR$/rbac/models.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="14" column="36" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="36" />
+        <state relative-caret-position="138">
+          <caret line="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
+    <entry file="file://$PROJECT_DIR$/rbac/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2944">
-          <caret line="128" column="15" selection-start-line="128" selection-start-column="15" selection-end-line="128" selection-end-column="15" />
+        <state relative-caret-position="92">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/models.py">
+    <entry file="file://$PROJECT_DIR$/web/templates/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
+        <state relative-caret-position="46">
+          <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/web/templates/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
+        <state relative-caret-position="281">
           <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="245">
+          <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#52#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/urls.py">
+    <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="e#0#32#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="226">
+          <caret line="163" column="98" selection-start-line="163" selection-start-column="98" selection-end-line="163" selection-end-column="98" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
+    <entry file="file://$PROJECT_DIR$/web/views/auth.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="23" column="48" selection-start-line="23" selection-start-column="48" selection-end-line="23" selection-end-column="48" />
-          <folding>
-            <element signature="e#0#52#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="111">
+          <caret line="28" column="49" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
         </state>
       </provider>
     </entry>
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/__pycache__/manage.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/__pycache__/manage.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..942b45765490f2c961ade0088224f6e41c7d1036
GIT binary patch
literal 642
zcmZ8d(P|Sx6rI^@lQpKHz7#4x%v*_I`XKlqVjE0oD>W%5qK(2bX6}YbXJ^99?Bez@
z0ntwo{DJ<0;E&9!Lhu88carTxafZ3~z&-cex##ircK!G3hws}Jgnpr0=bpz${+Z7{
zFvPGx<1*thhJXc^fnETbRc0Zpuy7e*RP1=(me@+G<0?jPkvs|!)Gq5f$7p?v#zrR^
zN51yprY6f8)L3<i7x)6n;2m0^GD8*c?9LKnKYxf?wLktZsPCdUPAQjh>~^~^JN@H9
zJnW4|r~Tt${A$pBbJn}s6IqfJ@f>u@jp0hR4Oq+N)U>eMgHJHYEX0XcX*^MBN+pX0
zmvHs{g~|kz`<C!@uCyiH8I@DjCLIl=P#H0q2i)!(!lkiP2w=o_6Pi;l=tluW$u&`v
z^NZ2Rpnu*Ooe+>Y*Gi@!Ey=0oYu+L0a<-97l%9emRuMX}Jf{{2CBDICRNQVoY}H+$
zjH{T!tSyi<1#dy^M%~r@iVPB(3F~%Q`R|F+(Dv)mDXgdK(EI1^o^E#QX|1%YmP{8?
zJ<YF?ZhFQh{C(n4_vu0Dz!^|2y?+P)8~bQ={bTj*=j!X159OTpyl~O8RIyCJ^T2DE
Y`#wZC3L@OZ0p7vQFu;usZiEs32WM5lw*UYD

literal 0
HcmV?d00001

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3"
index 45a20962a8733e1a701a9b7ede4738406c0ddc44..65fecdddace6a872de2fbb22c40e4ddb7633da4b 100644
GIT binary patch
delta 2966
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
aB@+EN-@UqW@wGJ$2z(E;eG|tH+y4XBfUJ7}

delta 1103
zcmb_bUrbw796tA++dn|(80#bs#(=F%?0|bOv~Wp?0;OFG_jZNS_TFer+bi_1YX=2d
z7eS2ERTEc#;)A|ydm72&!mimKHnzk+PwvIc#KeTmxv*)X*(4#F7{ODbFUA)WPjb%5
zIp;g)_x--_{1z6Ng&*+Qx;={sp}xO5MdncHXeZfhXM1&IRe|r25eX}qFs66+!5!Ro
zp^<sdSX<%5-{O7r2EC>=nO137tBm35y}RI8)!S6H_H`9&HXG^N2;arGa0#o}fi3iJ
z^lbwEgw{V}WKh2aKHqB5TMY~vw7|yJ5&Z!@gN|6BY5OT%gN{M15Z<cOTbZ5n?@rgj
z{I*Gd6f<bZ0^FPRaCzI*(m)fOr6Zb~nm&<!>10P(RXZMByS`pLxBl^k2X9?FNHNH2
zfwNn6R}M4B&DHok!oTB9{0RSu@8dQ64gN}No(|*Exu>=Bvrz_D;}tNRYSQ-9pTXM7
z{FwO(9g-0?(=F6T=zAoWN(UMGF<OWD<-<_3RIIQ+XQ;JWsl`K3zj+8=d%po**i365
zE=|@{P(z48HiT?YdC^+AxNE>r+ucpQE<onu9|UF4x3&^#?eOFhuf4L|)4ZGQ>9yH<
z*{*gwYv;Rp?b9y@%JH*^o~Eu7Z?ZUBD!mBVU*ElQuYsllgv2Oh?}L%XMTEb=MMC>k
ztQ8-gVwkH4T?Ni~$#~ku=)`vp^h5TuMw{q&cY1?zUUZG;<$@>S^~;>-A1Zi*N=yv;
zx<rSY6@&7e*RLj&gfr#!ODP#H|Fj<-t}es#tLFAlXCNOLblcr=A)$sOHo|kMXk17t
z!P%K%hu}Nzk}`_J77e+4Cx^$td9xW7AJtGE=-;ryrJqe8-P{i!{9=K7HyYvY<EmlB
z6_^^yPj-wu=4Qh|pEcy1OAhCgGwzo;b!5<!iE_eJgjX|>xZAEC^Ki=8Y&^s}In@=L
zAOup;l#o%%gc3tgy0v%S6O;MrR3z<-d*hyDIPJ_Sd{0j1g&et^k>j?Q8X7$@lKvYv
zS{O-kGi4UOv@;Rr13B{AlshHt;7Ga!CFGe1yPSn^IZ9eeNqit776y`DM<6MsrKD7d
z@=8Kvy?!F-vqV8D=;OVPNmlXuY+`zxll^jh!q?Zwvz*YzcDM2N#(!8{uCa2X3L0n3
lP{ubfG40I09n&=RhKc&$b(j9L?jiPH66hp<wX3U3_!F3tWQPC%

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/admin.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/admin.cpython-36.pyc"
index 1c9edf2f7543b333293e4486714f773652f58720..519f1c2448e3ef8f011ef7ad1b938b676874d444 100644
GIT binary patch
delta 121
zcmZ3<vW<n)n3tE!AxI-OXd>r4Lly=G1_vN6Rss^K3{i|J3{gxej44bh%qcACEK$r*
z7IPF!3TrTfCfmd-N}RXYGmGPMQ}aqEesgEz18OYdo9xUO#K<#w8e_5mL;x%bBKRkB
HGARH61|u0D

delta 108
zcmdnSvXX_<n3tE!?u}Zk?L^Lby37m=3=TkCEC(b~8KM|d7^0X`7*m*1nA4e~n87qt
v6iW(AFoP!R#2ZSJnHk;Lc!6q*cqa!i1~GC?Ud)&*01*I-f(X9JVoVAEjwBQv

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/models.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/models.cpython-36.pyc"
index 5c9022b1f6463d45bce29c490586d74a2e93f9e9..c3c251e569c4dd52673841410e9c36625f0b7bc1 100644
GIT binary patch
delta 269
zcmey!^_ZK}n3tDJI#?ri_D0TDCPtsh{Y>gwsmxjIDQqe1DIC2_Q5--XOA2QSR|+$b
z$C<*N!qdVK#g)Pv%%I6P`3RGlky|N00|Ude8S9@;SOz3t^v`+PJ5`hE7JEu+T4HHV
zNfA3xx|9t_Je|Go*@E_$Mw7oYd8G&g1&Wz~1OsE0P(W%?Zf0?DW`3Ste0*_9QGC3g
zCU+4ZP_hVQc#!~z04XjK1QNHHON(-fBtR@4r~Le!)Wkfu%+#EeDE7?a_}tXI(kPb9
y<ovuM-pP)v;*;kyb8&J3)p9WMG4f4b$NZjAdh$FLQy_VT#h6iiG6!o0BNqTe@k_4&

delta 142
zcmaFN{gI2)n3tE!_nBI(@J7y7CPstFjw~`0H?T}z&&1A`!j{6`!Vtxt!V%1%$vOD}
zli6f%W_Kk)1_p*=CLqDUSS1vYT9lhvT%4JorxzbzTv8Mt@2ANzS({ao>lSlqQBIK<
sP}$^YR;kH+ES#)tKn}-b1(x@Wl9L5kO&KL7yRjNGicYR#&0ypJ04($(K>z>%

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py"
index 316daf0..b0611a4 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py"
@@ -3,8 +3,8 @@ from rbac import models
 
 
 class PermissionConfig(admin.ModelAdmin):
-    list_display = ['id', 'url', 'title']
-    list_editable = ['url', 'title']
+    list_display = ['id', 'url', 'title', 'is_menu']
+    list_editable = ['url', 'title','is_menu']
 
 
 admin.site.register(models.Permission, PermissionConfig)
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/middlewares/__pycache__/middleware.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/middlewares/__pycache__/middleware.cpython-36.pyc"
index 9a272f3a106e48cadb3da72786bafe3d2f39cbc5..00505e820778fb1f1c7b8fdb87010e599324639c 100644
GIT binary patch
delta 133
zcmX@Wv6+L@n3tF9L8L~k!bZ*;jEu~a-!m?dFXCZfU?}1Q5!^uH7FR)PQEp~&ab|wr
zN`@kd$?KRdi%NlHB~S^;$<vr?^w0%CCUDr~=BJeAq}nk8dBq$+f`?Ink%Li$831@1
B90&ja

delta 146
zcmdnYae#x<n3tDJ`=45@?ncfVjC=wGsYSV&#l@NVdBySZlOHiIkiW%TT9i}7$-ux+
z#0?~FaUqnfWGIrHypZX#s5D4c5|xme+{s*{hb{;*fx{*@KczG$)s7L!E9L+aJd6U2
I9E>8&00I^xEC2ui

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/middlewares/middleware.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/middlewares/middleware.py"
index a18f61b..031d615 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/middlewares/middleware.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/middlewares/middleware.py"
@@ -24,6 +24,6 @@ class AuthMiddleWare(MiddlewareMixin):
         permissions = request.session.get('permissions')
         # 权限的校验
         for permission in permissions:
-            if re.match(permission['permissions__url'], path):
+            if re.match(permission['url'], path):
                 return
         return HttpResponse('没有访问权限，请联系管理员')
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0002_permission_is_menu.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0002_permission_is_menu.py"
new file mode 100644
index 0000000..5060411
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0002_permission_is_menu.py"
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-07-12 09:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rbac', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='permission',
+            name='is_menu',
+            field=models.BooleanField(default=False, verbose_name='是否是菜单'),
+        ),
+    ]
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0003_permission_icon.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0003_permission_icon.py"
new file mode 100644
index 0000000..917b9eb
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0003_permission_icon.py"
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-07-12 09:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rbac', '0002_permission_is_menu'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='permission',
+            name='icon',
+            field=models.CharField(default='', max_length=50, verbose_name='图标'),
+            preserve_default=False,
+        ),
+    ]
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0002_permission_is_menu.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0002_permission_is_menu.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..bd809d120bc8da895a1df00bcbba46809a22f428
GIT binary patch
literal 669
zcmYjOzl#(x6wXZM*N$^|mHrD(;j*5ch@5iVHF_Wx!Y~qM_hptWnarBZ99*r1S1j5H
z3fAIP_JaRNS~*uc8+%`7J@yjb<4f|rAK%N}ot^Z{(_1h8c!c~QS5|;{AI<Ec0|K5T
zjaPV{!@l$zTF@pa0*@RKpb)$!5OBH(U(q6j@EOUY-xx=7&+hh0%v#_~ijM0_n%uW(
zBj&p5M5~OA8hn&y=IECzMzD`&#^^XHJRpS+>D((Q4;G;-$fHFJAw&?bd`MOl-x3&M
z;cIsE<TASr^t77UY%-bLVM2*cRMMtPt{Y(tR=2S*tl_FZ?5|^`pC7(ny!(v)*V|7Q
ztM}Mw47{#-+1c!b>uGB^Q&q!riV9rU!^sBj&W5$%5{`3UN0>@G3Hit-Y~V0vQ^qi+
zmmG1%*vr0>F3z2RFS!D)W`Y|{G0-Lt0S;Y0?f$`LkJ?u9N)1;wZBfBydgnynaMhgq
z`yAcDz4BmDsd@XDS6T@*FJ)iXr);bF_WJzW`s4TY*_+Z0r`&!;iDTNk!esx4GhUwR
z5OXJJCUt;DLE!nghx_9^a_Z{7>ow}pK2q!mhBn499TW{Z2KKh$4Z7*r$^Ff29ys;J
JY0msz`VWOez%Kv*

literal 0
HcmV?d00001

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0003_permission_icon.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0003_permission_icon.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..d669cf4437aa5fea7a4df1860e1e70632c43d39b
GIT binary patch
literal 705
zcmYjP&2G~`5MF!Nj$;y(8xn{+K2SyN4IxxSRW8s2<zxk|oXpsDwBCf>xT0r}fI}Yu
zapBrmK!OL^D}tyGz@1r#Dp_ksGdn-ud^0{64%1hs58m7l8T-X{jv)PzuH7dA3<AZP
zAP)kshbnA%&Kr@7fIVlxL405!kk6y{JdYqcWm$Ypc`OUusMYms0Vq|yLQ^Q4g)VLC
z$`q@5p{<J>aw<FX;WsBC<&bU%jw}y=<sl5JAm=FNkq5+h-h&8Y=s|MHp%3Y$Ab$e4
z2z==JFK-Z>Fw<h@?u^IdeYr%_)YcNPtgUQNw=UhjIYFIj$F4o+HYV}=>(4*mK4#qY
z0L!9PD{8%XCl%^yb>;@=Xr>E`QWp&#XM&ubOJ_RaA6-<|sKAYu1}&O%l>h6TWTEi@
zrbi;{yF_+bQo2-1s?sVXeIVuAwoty3w*Z%@0rjj#Yd9sk<SD?hM=*Y0uK(<;FrDqv
z1@YR9_==gk9?FZquSpy|njFmwT`gW<VRWsliE7L8VrM!J*H_=yUw*7Vf13E|O}6`*
z&>RnTBBdYM-txjkRM_v$4!pu+A%c*;+d=0!$zso}Y*(!zE{1+LY8SdL_F&qv={R)J
Y+kQ9NJs+Js-pu8RXKp>;K{(?70AG;FO8@`>

literal 0
HcmV?d00001

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py"
index 2514b4d..312309f 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py"
@@ -13,6 +13,8 @@ class User(models.Model):
 class Permission(models.Model):
     url = models.CharField('url地址', max_length=128)
     title = models.CharField('标题', max_length=32)
+    is_menu = models.BooleanField(default=False, verbose_name='是否是菜单')
+    icon = models.CharField('图标', max_length=50)
 
     def __str__(self):
         return self.title
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html"
index 1e0b4cb..d332164 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html"
@@ -155,10 +155,15 @@
     <div class="left-menu">
         <div class="menu-body">
             <div class="static-menu">
-                <a href="/customer/list/" class="active">
-                    <span class="icon-wrap"><i class="fa fa-connectdevelop"></i></span> 客户管理</a>
-                <a href="/payment/list/">
-                    <span class="icon-wrap"><i class="fa fa-code-fork"></i></span> 账单管理</a>
+{#                <a href="/customer/list/" class="active">#}
+{#                    <span class="icon-wrap"><i class="fa fa-connectdevelop"></i></span> 客户管理</a>#}
+{#                <a href="/payment/list/">#}
+{#                    <span class="icon-wrap"><i class="fa fa-code-fork"></i></span> 账单管理</a>#}
+                {% for menu in request.session.menus %}
+                     <a href="{{ menu.url}}" class="active">
+                    <span class="icon-wrap"><i class="fa {{ menu.icon }}"></i></span>{{ menu.title }}</a>
+                {% endfor %}
+                
             </div>
 
         </div>
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/__pycache__/auth.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/__pycache__/auth.cpython-36.pyc"
index d60db7acfd43541cf0b6c657a031f2ea9192e0d1..5b222d42c8882d281c2d1abd7bd16024df800e5e 100644
GIT binary patch
delta 574
zcmY*U!D`z;5S?A^%8D#0wwo4ILlO!F`_Mz1oPrC5=F)3YD5#{OWJOrlk=@-5_#h_-
zL2?edh5kUH^h??w*iR@u_5(WFLUDM^<L&I5dAoO=?;GJ>9EU&Ok4}E`+wf)>0DzD6
z8cY8{s$dF&e4^^t?YE;V(G`)1Yc}oHuwrMh;#mIjuwsXBGFf#hK8-|DbwrqgBsC#`
zI!-|?D}NgO>mzs5wjZS+HothS>+|v*n7H!Y1jo!o^d?aGPW2}s22KqhOu%fKp4h5!
z`7xNF0>Nu~4C9B*3vzvx4Hktums-ntsq@@OGb^(Gy`DUsm)X|+md?+M^1^x-YBu&%
zh~Ku{&05ylZFkL{@z$%~W`WfCY<?z7%VjBw<+yJfOWr&Sgw#fsr^fmp7mK14mM@en
zjqT{dJxqBRpcv9PXkOBE6r;>~YZ>_rS7aM)kdv0kub{S@5A^6@AI(5Q5+NQDMtdY7
z)FJd3Wq30n0b#^P3}}Go77<aq%@6wO=@6&Y_J7)GRf06a(i91ZN}A{1-s4@=?rP2M
M26viEZ%Cf}1z^XHGynhq

delta 338
zcmYj~%}T>S6ov22OiavA>!Oxg-MCQbx*~!>1aafC?Me_qW{}i0(U~c95pfaGolvq7
z@dX6&fwJ-;d;o8<5E;(LId{(GeyzSa-Y^Wkho9Yx1Ge;@H*El@bwbiFgdC<I@WxV)
z%g@nXf%n|_IWLgrf$$>`LF2**OlVr7RbYW*Fm4XQF03&O+T|-gZCC!SRI^y?I7{{9
z+>P~Rl3mAXWyh(I3u?VvXNNqAwW%B}o1S8HUva{~t{f%r=29Ew)I*n0vFvK9JaQkP
zdgX+Twz?DmJq+k|ky~rn!B&%1zx-y$J9R<z{;*LypRi8S76DNC<tZQT_sKV3|LV<R
Wy;Hf-EEDrY9w8;YLg-ilbKAf77)D(H

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py"
index 0c2f117..de02322 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py"
@@ -11,8 +11,27 @@ def login(request):
         if not obj:
             # 验证不通过
             return render(request, 'login.html', {'error': '用户名或密码错误'})
-        permissions = obj.roles.filter(permissions__url__isnull=False).values('permissions__url')
-        request.session['permissions'] = list(permissions)
+        permissions = obj.roles.filter(permissions__url__isnull=False).values(
+            'permissions__url',
+            'permissions__title',
+            'permissions__icon',
+            'permissions__is_menu',
+        ).distinct()
+        # 权限信息的列表
+        permissions_list = []
+        # 菜单信息的列表
+        menu_list = []
+        for i in permissions:
+            permissions_list.append({'url': i['permissions__url']})
+            if i['permissions__is_menu']:
+                menu_list.append({
+                    'url': i['permissions__url'],
+                    'title': i['permissions__title'],
+                    'icon': i['permissions__icon'],
+                })
+        print(menu_list)
+        request.session['permissions'] = permissions_list
+        request.session['menus'] = menu_list
         request.session['is_login'] = True
         return redirect(reverse('index'))
     return render(request, 'login.html')
-- 
Gitee