From 665c53a29066330e36f20d025aa8eb61892b8a97 Mon Sep 17 00:00:00 2001
From: yongzy <635602689@qq.com>
Date: Fri, 12 Jul 2019 20:49:29 +0800
Subject: [PATCH] =?UTF-8?q?rbac=E7=BB=84=E4=BB=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea/workspace.xml"                      | 192 ++++++++++--------
 .../db.sqlite3"                               | Bin 65536 -> 65536 bytes
 .../init_permission.cpython-36.pyc"           | Bin 0 -> 789 bytes
 .../rbac/service/init_permission.py"          |  25 +++
 .../rbac/static/rbac/css/menu.css"            |  35 ++++
 .../rbac/templates/rbac/menu.html"            |   0
 .../rbac/templatetags/__init__.py"            |   0
 .../__pycache__/__init__.cpython-36.pyc"      | Bin 375 -> 376 bytes
 .../__pycache__/my_tags.cpython-36.pyc"       | Bin 0 -> 632 bytes
 .../rbac/templatetags/my_tags.py"             |   3 +-
 .../web/templates/layout.html"                |  35 +---
 .../__pycache__/my_tags.cpython-36.pyc"       | Bin 643 -> 0 bytes
 .../views/__pycache__/auth.cpython-36.pyc"    | Bin 1290 -> 860 bytes
 .../web/views/auth.py"                        |  26 +--
 14 files changed, 171 insertions(+), 145 deletions(-)
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css"
 rename "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/menu.html" => "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html" (100%)
 rename "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__init__.py" => "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__init__.py" (100%)
 rename "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/__init__.cpython-36.pyc" => "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/__init__.cpython-36.pyc" (65%)
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc"
 rename "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py" => "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" (86%)
 delete mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/my_tags.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 b2e3ab2..661dca5 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"
@@ -2,10 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2bd9986f-9fd5-4cdf-a330-5da7c76a6a75" name="默认更改列表" comment="">
-      <change afterPath="$PROJECT_DIR$/web/templatetags/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/rbac/service/init_permission.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/luffy_permission/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/luffy_permission/settings.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/templates/layout.html" beforeDir="false" afterPath="$PROJECT_DIR$/web/templates/layout.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/templates/menu.html" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/templates/menu.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/templatetags/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/templatetags/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/templatetags/my_tags.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/templatetags/my_tags.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web/views/auth.py" beforeDir="false" afterPath="$PROJECT_DIR$/web/views/auth.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -52,8 +55,8 @@
       <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="207">
-              <caret line="33" column="49" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" />
+            <state relative-caret-position="184">
+              <caret line="14" column="37" lean-forward="true" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
               <folding>
                 <element signature="e#0#54#0" expanded="true" />
               </folding>
@@ -62,58 +65,34 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
+        <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2250">
-              <caret line="162" column="27" selection-start-line="162" selection-start-column="27" selection-end-line="162" selection-end-column="27" />
+            <state relative-caret-position="299">
+              <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
             </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="69">
-              <caret line="3" column="25" lean-forward="true" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/templatetags/my_tags.py">
+      <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="207">
-              <caret line="13" column="9" lean-forward="true" selection-start-line="13" selection-start-column="8" selection-end-line="13" selection-end-column="9" />
+              <caret line="129" column="15" lean-forward="true" selection-start-line="129" selection-start-column="15" selection-end-line="129" selection-end-column="15" />
               <folding>
-                <element signature="e#0#27#0" expanded="true" />
+                <element signature="n#head#0;n#html#0;n#!!top" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/web/templates/menu.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="46">
-              <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
-            </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="328">
-              <caret line="135" column="14" lean-forward="true" selection-start-line="135" selection-start-column="14" selection-end-line="135" selection-end-column="14" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/templates/index.html">
+        <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.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="261">
+              <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+              <folding>
+                <element signature="e#0#27#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -121,7 +100,7 @@
       <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="23">
+            <state relative-caret-position="-1073">
               <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
             </state>
           </provider>
@@ -132,8 +111,9 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Python Script" />
         <option value="HTML File" />
+        <option value="Python Script" />
+        <option value="CSS File" />
       </list>
     </option>
   </component>
@@ -154,14 +134,17 @@
         <option value="$PROJECT_DIR$/rbac/models.py" />
         <option value="$PROJECT_DIR$/rbac/middlewares/middleware.py" />
         <option value="$PROJECT_DIR$/luffy_permission/settings.py" />
-        <option value="$PROJECT_DIR$/web/views/auth.py" />
-        <option value="$PROJECT_DIR$/web/templates/layout.html" />
         <option value="$PROJECT_DIR$/web/templatetags/my_tags.py" />
         <option value="$PROJECT_DIR$/web/templates/menu.html" />
+        <option value="$PROJECT_DIR$/web/views/auth.py" />
+        <option value="$PROJECT_DIR$/rbac/static/css/menu.css" />
+        <option value="$PROJECT_DIR$/rbac/service/init_permission.py" />
+        <option value="$PROJECT_DIR$/rbac/templatetags/my_tags.py" />
+        <option value="$PROJECT_DIR$/web/templates/layout.html" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="876" />
     <option name="y" value="2" />
     <option name="width" value="1047" />
@@ -188,6 +171,18 @@
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
               <item name="rbac" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
+              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
+              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" 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" />
@@ -210,10 +205,19 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="database.console.LAST_STATE" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="list.type.of.created.stylesheet" value="CSS" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\static" />
+      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\static\css\rbac" />
+      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\templates" />
+      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -265,23 +269,22 @@
       <workItem from="1562827785852" duration="8595000" />
       <workItem from="1562836703031" duration="41000" />
       <workItem from="1562921631604" duration="4949000" />
-      <workItem from="1562930125078" duration="2590000" />
+      <workItem from="1562930125078" duration="4989000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="16175000" />
+    <option name="totallyTimeSpent" value="18574000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="701" y="2" width="837" height="836" extended-state="0" />
-    <editor active="true" />
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49364406" visible="true" weight="0.03851091" />
-      <window_info id="Structure" order="1" sideWeight="0.50635594" side_tool="true" weight="0.29975125" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49134198" visible="true" weight="0.23927614" />
+      <window_info id="Structure" order="1" sideWeight="0.508658" side_tool="true" weight="0.23927614" />
       <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 active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3046252" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.29249617" />
       <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" />
@@ -336,16 +339,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="21" column="22" 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$/rbac/admin.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -363,7 +356,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/templatetags/__init__.py">
+    <entry file="file://$PROJECT_DIR$/rbac/templatetags/__init__.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/web/models.py">
@@ -373,13 +366,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="3" column="25" lean-forward="true" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/web/urls.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="23">
@@ -404,10 +390,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+    <entry file="file://$PROJECT_DIR$/rbac/static/rbac/menu.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <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="97">
+          <caret line="24" selection-start-line="23" selection-start-column="8" selection-end-line="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/rbac/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-138">
+          <caret line="3" column="25" lean-forward="true" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
         </state>
       </provider>
     </entry>
@@ -418,37 +411,64 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1073">
+          <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/middlewares/middleware.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="169">
+          <caret line="25" column="38" lean-forward="true" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#52#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/web/views/auth.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="33" column="49" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" />
+        <state relative-caret-position="184">
+          <caret line="14" column="37" lean-forward="true" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
           <folding>
             <element signature="e#0#54#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
+    <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2250">
-          <caret line="162" column="27" selection-start-line="162" selection-start-column="27" selection-end-line="162" selection-end-column="27" />
+        <state relative-caret-position="299">
+          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/templatetags/my_tags.py">
+    <entry file="file://$PROJECT_DIR$/rbac/templates/menu.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="13" column="9" lean-forward="true" selection-start-line="13" selection-start-column="8" selection-end-line="13" selection-end-column="9" />
+        <state relative-caret-position="46">
+          <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
           <folding>
             <element signature="e#0#27#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/menu.html">
+    <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
+        <state relative-caret-position="207">
+          <caret line="129" column="15" lean-forward="true" selection-start-line="129" selection-start-column="15" selection-end-line="129" selection-end-column="15" />
+          <folding>
+            <element signature="n#head#0;n#html#0;n#!!top" />
+          </folding>
         </state>
       </provider>
     </entry>
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 65fecdddace6a872de2fbb22c40e4ddb7633da4b..8169a0391af5c4557d351d9a5332ec0b2077ddb9 100644
GIT binary patch
delta 57
zcmZo@U}<PznIO$LWulBT<CKjFA*cC_tW3<Uj4kyn4NWW!3^pG+ZJ>fCw&;TZ003DL
A6aWAK

delta 57
zcmZo@U}<PznIO$LaiWYf<HU^#A*cBatPISpjEwaREiDWTEjJ%JZJ>fCw&;TZ0R2x8
A{r~^~

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..5bdc2db4e483115a30ddd2a5bc1b082f53c585e0
GIT binary patch
literal 789
zcmZ8fO>fgc5S{g|9p|G^LWP<uCoGj-xS<FkkswvjfCv@Ba%H92O}fUh(_N=f$$>*S
zz<~=lB>q7E0up~@uN)$d9Jn)fE0J_p^LF;l?9BMd_ck_af8O6Y{6GPI!OF7Ge~6~H
z5jb!X!-V*R0Jk{(2)@NxA3XavM!_S-)gsGeGS<W5VX>S`dxWR{ijb2CBEku`zK{ru
zaK>%!ELcPrFt^4qr)cb5C$~Cq*q+-tjTo=wHm5C+WPz>GcUqu!au%@*9+9;Q-fjVR
zztbY?Waky+G>6E}oT$=<oL%~E8+f(wc?~_l@$0?E9`U!QLQSOBGEH<C&Qu(RQYW)G
z_BXFa{N@^y$t)KBjWtdV)5PCer*t?G$;?o!?NNnNgR#rEh85{AeOKx*PRBCws>W7n
zEVOY(GR}lD&gmeY;oap@qr$_?ID_d_B-~WAD2G;s<mT4%?u-4set+*-FYI?O&L`d1
zW^=#WJ6L5r$5fO!!J3(&=}~0rE5ojTa*QqgYB76QxQ57cP)+Ri_W+@DKR8Y&;%%zl
z1f6J*jMJxLpc4EGf_OF>orVAF-d&#mSbqDt{QN0UM}uLYg*uf(5y(VlD`~saGjsh4
z$FP&WjR52tvC3Ve%wnWQn#3iHIJlcugEWZR!mOT0O`VtH?4q`#Qk^nVPQC&+G26K9
QNy=xjctG%`3nd%$ALHiV<^TWy

literal 0
HcmV?d00001

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py"
new file mode 100644
index 0000000..435864c
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py"
@@ -0,0 +1,25 @@
+from django.conf import settings
+
+
+def init_permission(request, obj):
+    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'],
+            })
+    request.session[settings.PERMISSION_SESSION_KEY] = permissions_list
+    request.session[settings.MENU_SESSION_KEY] = menu_list
+    request.session['is_login'] = True
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css"
new file mode 100644
index 0000000..f952ea9
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css"
@@ -0,0 +1,35 @@
+       .left-menu .menu-body .static-menu {
+
+        }
+
+        .left-menu .menu-body .static-menu .icon-wrap {
+            width: 20px;
+            display: inline-block;
+            text-align: center;
+        }
+
+        .left-menu .menu-body .static-menu a {
+            text-decoration: none;
+            padding: 8px 15px;
+            border-bottom: 1px solid #ccc;
+            color: #333;
+            display: block;
+            background: #efefef;
+            background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efefef), color-stop(1, #fafafa));
+            background: -ms-linear-gradient(bottom, #efefef, #fafafa);
+            background: -moz-linear-gradient(center bottom, #efefef 0%, #fafafa 100%);
+            background: -o-linear-gradient(bottom, #efefef, #fafafa);
+            filter: progid:dximagetransform.microsoft.gradient(startColorStr='#e3e3e3', EndColorStr='#ffffff');
+            -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fafafa',EndColorStr='#efefef')";
+            box-shadow: inset 0px 1px 1px white;
+        }
+
+        .left-menu .menu-body .static-menu a:hover {
+            color: #2F72AB;
+            border-left: 2px solid #2F72AB;
+        }
+
+        .left-menu .menu-body .static-menu a.active {
+            color: #2F72AB;
+            border-left: 2px solid #2F72AB;
+        }
\ No newline at end of file
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/menu.html" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html"
similarity index 100%
rename from "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/menu.html"
rename to "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html"
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__init__.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__init__.py"
similarity index 100%
rename from "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__init__.py"
rename to "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__init__.py"
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/__init__.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/__init__.cpython-36.pyc"
similarity index 65%
rename from "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/__init__.cpython-36.pyc"
rename to "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/__init__.cpython-36.pyc"
index 7ab8148e15a3173f39756350eec0b0c0ddbb60e4..617de7edb5b5e27af3c7c1c508a9e45bbfbfe500 100644
GIT binary patch
delta 22
dcmey)^n+;wA0uP%WPV0VmZGG@<jLNQIsj8y28sXx

delta 21
ccmeyt^qpw~A0uPXWPV0V=JM2}$v%ua08DrWF8}}l

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..52d86c52b0655ec4562a861a58cd8c46fe740cc0
GIT binary patch
literal 632
zcmYjO&59F25bo-pzpP1c6$JOZ2Ll=p-eg&XO%CcB#UNswWtg4rBr`id+3p@SYjTiy
z&`0nQ_5r*IzDQp^1Rub=)g!_-)K^~>)Zf<+I-Q-jpYEJ|2SR?4D~}<6gr*J=IN^|!
z0ww^K)0`G;!WzzUXW|IR+zpv{!pnT_Y=FDm`%E@42{;>*p8p$rkRF&oi(-+-T3D`x
z)@eCYql>OQjg$L@DC_=Q7kPraG|xeF(T>p66NDAXNCui_Yy)e+$XU}5cULeVC;Mxr
z-OS^V`76fhZJfTM8!GoW!`L|>FUa}cYr@?Xq<}klqYL(Ny>D18bK}K{PTvXRCV8xs
zY1vhxJXN|E7+(pc(yBCUCbYD&nCs7mqgT;*I37QKK8l_W-<Z}S*7GPWr<I`+`xLQG
z=Ej>=5?RkNz7*%RP+Iy}FYR3h(n}(Dk^OmzFnAcwt3tf5<XJe#;&N6Ui&&PZPng%!
z=`vafS)|P(_qLZmw%>kkzkUg=ZsC7Tbv#pHv5c(mFP6r!SG2IV>LL)@1rK)M76j<!
zP0aLK#^cQ_Nij6n{ssM{DyPk%vTf7;ae69axio<kGt@*#(@D!DudOO}TGOmK<qF)e
XrNKc_@j4fW_D5BK(57t&Xu$pgW$3D(

literal 0
HcmV?d00001

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
similarity index 86%
rename from "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py"
rename to "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
index 03793c2..d743376 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
@@ -6,10 +6,9 @@ import re
 register = template.Library()
 
 
-@register.inclusion_tag('menu.html')
+@register.inclusion_tag('rbac/menu.html')
 def menu(request):
     menu_list = request.session.get(settings.MENU_SESSION_KEY)
-    print(menu_list)
     url = request.path_info
     for i in menu_list:
         if re.match(r'{}$'.format(i['url']), url):
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 63c2887..f578dd2 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"
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="{% static 'plugins/font-awesome/css/font-awesome.css' %} "/>
     <link rel="stylesheet" href="{% static 'css/commons.css' %} "/>
     <link rel="stylesheet" href="{% static 'css/nav.css' %} "/>
+   <link rel="stylesheet" href="{% static 'rbac/css/menu.css' %}">
     <style>
         body {
             margin: 0;
@@ -55,41 +56,7 @@
             padding: 15px;
         }
 
-        .left-menu .menu-body .static-menu {
 
-        }
-
-        .left-menu .menu-body .static-menu .icon-wrap {
-            width: 20px;
-            display: inline-block;
-            text-align: center;
-        }
-
-        .left-menu .menu-body .static-menu a {
-            text-decoration: none;
-            padding: 8px 15px;
-            border-bottom: 1px solid #ccc;
-            color: #333;
-            display: block;
-            background: #efefef;
-            background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efefef), color-stop(1, #fafafa));
-            background: -ms-linear-gradient(bottom, #efefef, #fafafa);
-            background: -moz-linear-gradient(center bottom, #efefef 0%, #fafafa 100%);
-            background: -o-linear-gradient(bottom, #efefef, #fafafa);
-            filter: progid:dximagetransform.microsoft.gradient(startColorStr='#e3e3e3', EndColorStr='#ffffff');
-            -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fafafa',EndColorStr='#efefef')";
-            box-shadow: inset 0px 1px 1px white;
-        }
-
-        .left-menu .menu-body .static-menu a:hover {
-            color: #2F72AB;
-            border-left: 2px solid #2F72AB;
-        }
-
-        .left-menu .menu-body .static-menu a.active {
-            color: #2F72AB;
-            border-left: 2px solid #2F72AB;
-        }
     </style>
 </head>
 <body>
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/my_tags.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/my_tags.cpython-36.pyc"
deleted file mode 100644
index 95f9fed4cb7d13c1443018e10a5ddf38551fba0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 643
zcmYjO%Wl&^6rDTcS4x8_KuBz>E{Fu#utQaaM6y7X@Q4s1a%H*pB(WLW>CBjt;;hU9
zK7mi@CxFD3kC-ish!0@T9V4WUbkCf7C7(I>_(8wF^R2#n@)HR8MXnr%{1KKqLP$vp
zf)p?Vu$&57uo>$(6VA-xkh?9JdECqW)M+7gQ|}XLVHTupN(TOK)F1;ef#$_Z#F|^K
zxYk*@P?L*Z!OMEM)P+dUMt2-U7wa*WdWF!CoaCTs&RW=jb{c5W3{Kq*{cx{=5ji>7
zFl`M$9yBbachEpXTPpWchP`u0UXZi>Hzai%$N+75lMD87b6{94h4JD<XYaXj6A>$A
zI!lqrlpgequeefKRT{S7TH0jH-m~%Kbu=AMr%#?wqNn4x#$Cy*)TXzJ^)kxJd1a_X
zxgyrd(s=VqA{#iym;9{eN=qMQq+QcMc1h$7WPe^Fj2?!|s^I69d>4-LxLj1nJeDOU
z6^eR3Uq>r0i>&i=e|!0T`}N26%jfW%pN9X#)$u}w#X7S0aJ4p$jkkx=Y7c?X>kxnk
zJ8-+Z<t?1yl3v<9CMmY&+P`L)ROP%|SoZDMKh92NEY~KGe1X|;Y5G~2h}x!O-|NJ>
cU9P}Q`)P1kRB0{vk^RFeK-i_b5YT}A1#kAPkpKVy

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 9419b79ba54d9b63a848373cf362fd8827842465..2af62544da1929ba07a1e1d87bf83502ed5e39a5 100644
GIT binary patch
delta 338
zcmeC;y2Hk0%*)GlrA8z6Khs36W;_1Oyv&mLg4Cki%;MtA{5(y@TWq=cDXBTd$&3sT
zzyhRLf!G;{i*tZP4MP?~3S%}?QPRXCPD&-5H4HV(%}k68C0r%kDICp=&5XeeB^)&j
zDXh&*!3>(5leaL2bKYXj%u7kF(BzrCgvm;`2xMRpGl&2gugP+Yy(qP?G_|;-hyx_Z
z2_$YY=O<;YWGE7uJefIKLI^0rz{thO1B7CXEKCASAa;@1WDOPvRgh$n2%HcFvABT*
zNT`?zNH8!KaZm1LQTL3JDN0IA)+<geD$7hx)kE_=*jcw&KuU_(fVzsrKm^DnB-6q6
Mh)#aPBFo4J0O+nsng9R*

delta 771
zcmZ8fUuzRV5Z}Fjx!fgbnwDaOJ~Tz_y;wm}DM3UVp-8J3rFf+rY4!|zUhdM}jpX4%
z9s)iHBIREF0)7_353u+dd=wv@y@({<Fu$4m?ab`X?EbJmI?kPH)%h^oJHKsRIrIBA
z4~3w~fO}Y4!<2+E?_;$1Y%mt+6HxveAVU!%_?^anUVVE!%k-!mS;QvgPdIXjLtIiJ
z)wvP5b2K#uXljC5lf%q7MCa{kDKn!AsbwYNG!eyfj1l<NCSsG!iYf~p&}}Nd(nMtK
zi>{(BC#OhMGpooj;S4pg7S-GPD6{_lthW)VE1!TT8e)Sq=CDB*2|Gi?oNHa=ZRGp-
zboSK4{<TrahLm%fCOinnEDi$7lW`pT_5WA=#tI{-h(mvUg`@p6@i$i~9t^`|EOn^u
z>CA=6NwdhkE)5m`%C{*G;&eb0Y0`v*6K^yBj1OkgWN937X}#~oW3V=%9B!vCq}3aZ
z!h}e3#AqU9iHAi4%v8m<UUXg_A9cG&&rgDGXJMap-pKlK=j8P=!*mE|27qVF5(_V3
z6T#FyvogRvsizl_beFnWok<MG@yn{YK)DjruZZpBzwp_?UC2k+!4;4#Y-n{{!&)JZ
zZfFLqG_Z{gY=Ja1yNFZKY&WOcqZ`}m3_JgzrMw!z9w^rU5N5UfyLR(|bV<}p2I(yr
e<l9C62D|9>nR=>hSAj}gDpr(j<q!33-1-A!qRrg^

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 d0a65a5..43994da 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"
@@ -1,5 +1,5 @@
 from django.shortcuts import render, redirect, reverse
-from django.conf import settings
+from rbac.service.init_permission import init_permission
 from rbac import models
 
 
@@ -11,28 +11,8 @@ def login(request):
         if not obj:
             # 验证不通过
             return render(request, 'login.html', {'error': '用户名或密码错误'})
-        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[settings.PERMISSION_SESSION_KEY] = permissions_list
-        request.session[settings.MENU_SESSION_KEY] = menu_list
-        request.session['is_login'] = True
+        # 权限信息和菜单信息的初始化
+        init_permission(request, obj)
         return redirect(reverse('index'))
     return render(request, 'login.html')
 
-- 
Gitee