From cc30e9939a6385f244b193751a112b435a7f3e75 Mon Sep 17 00:00:00 2001
From: yongzy <635602689@qq.com>
Date: Mon, 15 Jul 2019 21:38:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9D=9E=E8=8F=9C=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=9A=84=E5=BD=92=E5=B1=9E=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea/workspace.xml"                      | 168 ++++++++++--------
 .../db.sqlite3"                               | Bin 69632 -> 71680 bytes
 .../rbac/__pycache__/models.cpython-36.pyc"   | Bin 1950 -> 1981 bytes
 .../__pycache__/middleware.cpython-36.pyc"    | Bin 1103 -> 1191 bytes
 .../rbac/middlewares/middleware.py"           |  10 ++
 .../migrations/0006_permission_parent.py"     |  21 +++
 .../0006_permission_parent.cpython-36.pyc"    | Bin 0 -> 765 bytes
 .../rbac/models.py"                           |   1 +
 .../init_permission.cpython-36.pyc"           | Bin 962 -> 1086 bytes
 .../rbac/service/init_permission.py"          |  10 +-
 .../__pycache__/my_tags.cpython-36.pyc"       | Bin 1007 -> 966 bytes
 .../rbac/templatetags/my_tags.py"             |   4 +-
 12 files changed, 137 insertions(+), 77 deletions(-)
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0006_permission_parent.py"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0006_permission_parent.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 5899d81..8960d53 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,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2bd9986f-9fd5-4cdf-a330-5da7c76a6a75" name="默认更改列表" comment="">
-      <change afterPath="$PROJECT_DIR$/rbac/static/rbac/js/menu.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/rbac/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/models.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -63,8 +61,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1035">
-              <caret line="45" column="22" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
+            <state relative-caret-position="372">
+              <caret line="48" column="26" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
             </state>
           </provider>
         </entry>
@@ -72,8 +70,8 @@
       <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="230">
-              <caret line="10" selection-start-line="10" selection-end-line="10" />
+            <state relative-caret-position="184">
+              <caret line="29" column="58" selection-start-line="29" selection-start-column="58" selection-end-line="29" selection-end-column="58" />
             </state>
           </provider>
         </entry>
@@ -90,41 +88,53 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="189">
-              <caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
+            <state relative-caret-position="216">
+              <caret line="129" column="17" selection-start-line="129" selection-start-column="17" selection-end-line="129" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/rbac/static/rbac/js/menu.js">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="69">
-              <caret line="3" column="2" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="2" />
+            <state relative-caret-position="182">
+              <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="50" />
+              <folding>
+                <element signature="e#0#27#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
+        <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="356">
-              <caret line="23" column="30" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
+            <state relative-caret-position="253">
+              <caret line="20" column="32" lean-forward="true" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
               <folding>
-                <element signature="e#0#27#0" expanded="true" />
+                <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="144">
+              <caret line="127" selection-start-line="127" selection-end-line="127" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/rbac/templates/rbac/menu.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
-              <caret line="5" column="10" lean-forward="true" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
+              <caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -162,7 +172,6 @@
         <option value="$PROJECT_DIR$/web/templates/login.html" />
         <option value="$PROJECT_DIR$/web/templates/index.html" />
         <option value="$PROJECT_DIR$/web/urls.py" />
-        <option value="$PROJECT_DIR$/rbac/middlewares/middleware.py" />
         <option value="$PROJECT_DIR$/luffy_permission/settings.py" />
         <option value="$PROJECT_DIR$/web/templatetags/my_tags.py" />
         <option value="$PROJECT_DIR$/web/templates/menu.html" />
@@ -170,19 +179,20 @@
         <option value="$PROJECT_DIR$/rbac/admin.py" />
         <option value="$PROJECT_DIR$/rbac/static/rbac/css/menu.css" />
         <option value="$PROJECT_DIR$/web/views/auth.py" />
+        <option value="$PROJECT_DIR$/rbac/templates/rbac/menu.html" />
+        <option value="$PROJECT_DIR$/rbac/static/rbac/js/menu.js" />
+        <option value="$PROJECT_DIR$/web/templates/layout.html" />
         <option value="$PROJECT_DIR$/rbac/models.py" />
         <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
         <option value="$PROJECT_DIR$/rbac/service/init_permission.py" />
         <option value="$PROJECT_DIR$/rbac/templatetags/my_tags.py" />
-        <option value="$PROJECT_DIR$/rbac/templates/rbac/menu.html" />
-        <option value="$PROJECT_DIR$/rbac/static/rbac/js/menu.js" />
-        <option value="$PROJECT_DIR$/web/templates/layout.html" />
+        <option value="$PROJECT_DIR$/rbac/middlewares/middleware.py" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="1">
     <option name="x" value="875" />
-    <option name="width" value="1054" />
+    <option name="width" value="1055" />
     <option name="height" value="1090" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -211,6 +221,12 @@
               <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="middlewares" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
@@ -340,22 +356,23 @@
       <workItem from="1563189552446" duration="270000" />
       <workItem from="1563190004562" duration="1390000" />
       <workItem from="1563193147448" duration="613000" />
+      <workItem from="1563194258944" duration="2998000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="30712000" />
+    <option name="totallyTimeSpent" value="33710000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="700" y="0" width="843" height="872" extended-state="0" />
+    <frame x="700" y="0" width="844" height="872" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4894068" visible="true" weight="0.27515924" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4894068" visible="true" weight="0.03816794" />
       <window_info id="Structure" order="1" sideWeight="0.51059324" side_tool="true" weight="0.26785713" />
       <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" sideWeight="0.49930844" visible="true" weight="0.28657618" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49930844" visible="true" weight="0.2850679" />
       <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" />
@@ -363,7 +380,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5006916" side_tool="true" weight="0.28290468" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5006916" side_tool="true" weight="0.2820513" />
       <window_info anchor="bottom" id="调试" order="11" weight="0.32843652" />
       <window_info anchor="bottom" id="Terminal" order="12" weight="0.3237519" />
       <window_info anchor="bottom" id="Python Console" order="13" weight="0.3923445" />
@@ -445,23 +462,6 @@
         </state>
       </provider>
     </entry>
-    <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>
-    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <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="das://5e282b7b-a0d3-4235-bf1c-e245c3112180/schema/main/table/rbac_role" />
     <entry file="das://84e0f050-fef9-4f9c-92b2-1117ecff9437/schema/main/table/rbac_menu">
       <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
@@ -487,20 +487,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1035">
-          <caret line="45" column="22" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/rbac/admin.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
@@ -511,13 +497,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
+    <entry file="file://$PROJECT_DIR$/rbac/templates/rbac/menu.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="23" column="30" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#27#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="115">
+          <caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
         </state>
       </provider>
     </entry>
@@ -528,10 +511,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/templates/rbac/menu.html">
+    <entry file="das://84e0f050-fef9-4f9c-92b2-1117ecff9437/schema/main/table/rbac_permission">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/rbac/models.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" column="10" lean-forward="true" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
+        <state relative-caret-position="184">
+          <caret line="29" column="58" selection-start-line="29" selection-start-column="58" selection-end-line="29" selection-end-column="58" />
         </state>
       </provider>
     </entry>
@@ -542,10 +532,44 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="372">
+          <caret line="48" column="26" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="20" column="32" lean-forward="true" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+          <folding>
+            <element signature="e#0#52#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="127" selection-start-line="127" selection-end-line="127" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
+        <state relative-caret-position="216">
+          <caret line="129" column="17" selection-start-line="129" selection-start-column="17" selection-end-line="129" selection-end-column="17" />
+        </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="182">
+          <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="50" />
+          <folding>
+            <element signature="e#0#27#0" expanded="true" />
+          </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 2ceaa5e902a7fef4dd442c3dd97df7913fbba5f7..18475a44f538a5b94ba0f29f27925224697fd0d8 100644
GIT binary patch
delta 1269
zcmZvcZ%i9y9LJwOcWn>Yk||B0n@j0r8+NpJ*A^^>MW}QuvBe6MwnnkEWn5`Xr68rr
z%rHig&4lh**7(Y9F=p|FV!8yK%ls4Ln`Mhxe6bhmj0uA!!vG28#SHpfn~p8>lKVZ+
z-S_u=zQ23^+^IZsYJr*GyJrCa;GlQqdMkUx3>Ut7^O{nDZej;^6a>{gVlf0-NaoMg
zLKV4LH4W>@@#@o1UHG;7hwq*?w+YX;39Uw}O*EU$?0(z<bDt}rw(#S1`?D-Q3-DP|
zwH9Llz;lJnS{+u-+F8~$uO=tg8od6#6M`%59&yJVBmPW>80ZU(%5Bd}p0q2|8TCg)
z>7HYrv^&$E@%Q!f{^$wOA5FG86P>Y8Tu6q@w06fXco8sQ65yj?5`BrZ*=(fh-RF9h
z8iN78S52hN1F(yHwE6WOz3#AH3hSGW==90pcqB1F_7@L4lZ=eVrBq59OH}kGN=<8A
zRyfm2UN2h6C+Ap_En0<{r}~u|j{(kDr9?QA9v=#Z26sjemYIW6cyK5*WD$hOFgdxY
zA&0kW9`X3UtnZ8UyB`kLH_g=a5pVGfIlA@pZWi4E_$PcC_h2o$QxIxypciav7N~6<
zvOUl9El-vp@`A0IZ*3N=Izeo+TI2;X+k{qLB-#hd8v1oAd>h~gxQN&BeY}kS!oTC&
zbhSHCA+Y@pe38MBLk#91%U}Ria!|@aAqPedSPrNP|3Oi=0R9KB;4Qp?S1IaN3H2db
zynvtpjdcG&R#}QF>dcgSB@l&kGL4gI97Grc?lT6~)a^p|fC|k4{2RW4=kROThBaso
zU7;0@Bb8C90QN=z$@cakj%`*cKnH!wT}SXB$5IC)6#*3ws&onkI3#Bp{;fB#I#vOi
z8aZG}2B+h6@l7!)HDOx5dU@sYH%qg*l?#`enG%^Jf4;xBc4;<$@8eIGzPNaIcF~9x
zpsNvZMEGD|%ktIpE7!7RL5E}};7p;()WldkGHwcn!=}57-!9GN%Ncs80ER{ga+eU?
zcb<X9x|i+U$$;J2;_97}LdRmG&S-KnJdjS2{QU;CG$jQGJW@~8nWCG#oaf8E!a$3f
zzKP4(V;M@ADrY%JaNWG4@Q*5n)rN;&?kBufwd9v|MQx=RH#II7GbWHc71!3aJL2?X
zqPSyd*)jBz_Kh22h3E1K;bCg(>UFk6rn~u|@6}X*_MNe`Ku`3vi?;5*?h%)lBsUr~
z(V@hsM8}!~1F=N#xI6(}Q!YE%{`-y23eqhjeY`vi8K0PbJ0Qj;>D=+5gf}+qX>YIW
PdeNp69{(+6v%3EPQ-z7t

delta 550
zcmZqJz|ydQWrDQe8U_Xi7a)d#oQXQdjB7R~>|<wRc4IonbZ)aD&wM6sW<~}n#-gOe
z<oJTg=eQ~v#U^`jcQcA?zQTQQzp#;&k(rgLp`N9=fw6@-s~oc<<MdVRj8dBqopx4X
zWhi4{D4WdnA%~@%ot1TS)dvY?_LPu}Y~QM!$@%YO<C5LoOq0UHN>iLIixVUK416lR
zEF&TeEq$E53X%;ii<68}3X(EC%~CwP45K0pY>f;IEp-jdb&V_)3{h?7WqQQG%oxwW
z7|#^UY{zT|^wYx0h8z<n8?0c}0m^L?*VJTeQY=YK%1H(LB{wy%G(J8*Ck2&fJ2~OI
z_~iLhtR}DdZo#eDSQx-AuC2}3EIGOUi!!gHbC9cJh^s<~qmz&8WQFgdlT#-cOujM2
za<cAMJqfUJN(vfEnJG$|nvFbx?Bc%KjE%aJ*L*dZ{PtTQ3(!$9lS>~&Ot$-ejE99;
zih=nEb2qa;v(#om87}6@Qoo;zGyh@WV7|h@{GIs|^IPV}%=egYGQVKHve}TsiD`4x
zzdA+-CKhG}Mh+0c4kFlCm^m3)K`a&!!3-jpfEKavGT&q1U|Pt)w2*l(b02d8vpuss
w(?_Nwz)0<6+P;v9(U4L2+4kK}yB0iMx9C~NcAy?5ZB>TJ6aGmrV`1b00KD&@c>n+a

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 052cc42fae91c50d04ad86a4381fb10a0039a989..033a499821ab7151effcb1d0566a5b4f19db5579 100644
GIT binary patch
delta 151
zcmbQozn7oan3tD}tz0MeIST{B<B1bQH!A&MW(=7u&tff?%96#A!j-}Sgq*$1QCun9
zDLgF<QQRrK!3>&wlQURmvlekPFfdHkV^*E4!K%QhFxeAG@=VTRwPU}<R*+bfnm5^j
xNm@(_s7MTmi+O+q2MY@$9}o&mzQ+2NQDgEEHd98$$-mf)8C53hvF9`L0RXO%A`t)p

delta 114
zcmdnXKaZc+n3tE!!9yo@6$=By<B1bQH!A&MW^|b>&tlD&!j;0^!Vtxk!V}D($ve4%
zW%gt}X4T2ItO|_sljDFS_vCt3yUC7BQj_nqa&mJqFfeeiurTs5@=gBA`j%0B@?$nr
SMuo|e?8c1BlYQCq8F>M1svAB4

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 754fb57f474c9c43d80d87c2a297f546cd995055..8313077af18cfe4e8e25c2b88b2412839157689a 100644
GIT binary patch
delta 396
zcmZWl%}T>S7~G#^vm2W#QV)eT_mm2XFCeH;@KPyQ5K0iYVgtsy-9jlFRPqS>3?kkX
zd<H#w&)Em?=G89&57NUo!|=`QEZ--868>Hg_~xNI`f^|W8om<<As6NVX7&zXaDp--
zfn&S~HA(0p8Z|Pioy0ZNkesN7L<4l&7?xg^coOG0bBr_VX|9DNIp_hZvi?f8UuFA$
z*)vHY>@Ir71?zss${Oh;Ylca;iE>;OE<v#-$~<5Xm>aHM3@^W!GUJt8J-ZwtU6Z`5
zkA(fektoPS7IZq1_8V`vgF;Nt^;JAcFK>$Vi@8$cRL9rjbRL5vBBxl`d$Lnk0UScr
y0iKa+**Bti2LvJv+b(VTgkz2!!YQ*y^mr>Q-L3!7wvY4#Z`vQ)*;rZaI^i!PEn1QQ

delta 326
zcmZ3^d7gvIn3tC;)lnx_pJgK#4`V$$0|Nsq5IX~L@jM_=!<fZT%Tys(!kES6!VoJ`
z%Ur^o#Ztpu!_>@F#FxSl%uvV|4pPOM#g@X@%vj4(!&2;2!d}9W!qg1p2Qz^6a$@N9
z0_*jH>tzP&Wi_f$t6>Eym8)d~S(Cz&#Z|+W!Yawo%m}uy1gxnfoS}p}g$-o5Ci~>~
zjGB`bnRI!0ZgCbQmSn_d=B4FN&SnZ@WS@M9$$(`gLy_bp<|27Hpl2AE*qC@2c^El>
rBnu-CjLpQwC^mU6v$v=;P)U&_Dj_xbFLNLx|73p_EddOvP8K-;cjiK8

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 c4a67d5..6fa4436 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"
@@ -8,6 +8,7 @@ class AuthMiddleWare(MiddlewareMixin):
     def process_request(self, request):
         # 获取当前访问的URL
         path = request.path_info
+        request.current_menu_id = None
         # 白名单
         for url in settings.WHITE_LIST:
             if re.match(url, path):
@@ -25,5 +26,14 @@ class AuthMiddleWare(MiddlewareMixin):
         # 权限的校验
         for permission in permissions:
             if re.match(r"{}$".format(permission['url']), path):
+                # 记录二级菜单的id(父权限)
+                id = permission['id']
+                pid = permission['pid']
+                if pid:
+                    # 当前访问的是一个子权限
+                    request.current_menu_id = pid
+                else:
+                    # 当前访问的是一个父权限
+                    request.current_menu_id = id
                 return
         return HttpResponse('没有访问权限，请联系管理员')
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0006_permission_parent.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0006_permission_parent.py"
new file mode 100644
index 0000000..a315d87
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0006_permission_parent.py"
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-07-15 12:53
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rbac', '0005_menu_weight'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='permission',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='rbac.Permission'),
+        ),
+    ]
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0006_permission_parent.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0006_permission_parent.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..7c40277bad11ff212288bb393ef856e8abcfc9b1
GIT binary patch
literal 765
zcmYjP&5qMB5O(7HZ!3C3NbmrWpsIx6utKY?wk!u=g|wWaAS>;--DDl7IEkuqg##S+
z0eFOc1tea?R}K{qz@2fTZr7GaV|!-&ec$-`a2Ubn>8BH$kU!+!aL_-+RUe}P0+t}9
zl~|VXZDE%*p{0{J-JS|J@!k+{!2L$R<+Sj>(!>XPNn-CW=9AdcqgLjN3OEya!&N5g
z*w#^*uT<9Lm8`W_;-#oB7AAf_LUc}XbtpJVEFg&u(aK6FcM2CMINU3IaPifk2n(->
ziX-sAzi}YAp%^!S5K$cI@csTN?WlRS(4)y@@`9CIwrs=m)m5XTHCJU`*9b>@>r8Rk
zeEjmj1dl)5-NcS|=OUBW+L5ggI;<o^+`Qr1ZmO6fC&PoutmGJCth>y)fQ#5x9#T<0
zns}%K*2OTUBgQbN6&(EmW1rhhm^`xszUC6RT;#k~6ccqY1voeLl<AO;&MSrJ<y*eh
z9u%2eRoaHR4mwPRiGMb|Je$s5>!?D0z1X)zJvLB``Nz=Aj?=5E<eN%er?algJDw?-
z%T+4c<#Njo(mdPU{@VTgz5DS!HPWPq7N)4^%X^Wm*KoYvDi_}{y{scN0recmvT=6j
zabOf!woR*$v%-%^bl6iF!@OhNbA5DoIPU+-cu!J2#H6m+fmiQ6G1Y=sy}l<#!P+!o
JV2`YT{s*9n+_C@w

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 e0a4e49..2e34d84 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"
@@ -27,6 +27,7 @@ class Permission(models.Model):
     url = models.CharField('url地址', max_length=128)
     title = models.CharField('标题', max_length=32)
     menu = models.ForeignKey('Menu', blank=True, null=True)
+    parent = models.ForeignKey('self',blank=True,null=True)
 
     def __str__(self):
         return self.title
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"
index 46bd343bb467b00ea7d5067cbc81fc55ac643078..ac6abbe54af2905d28f1c84e4fb567240617eedf 100644
GIT binary patch
delta 525
zcmY*V%Sr<=6umdeOf!A>1no$5?TD_du8JGQr6?*wp%x*fr1qJaLKhjj=oggfa+ZFF
z3x7iBpSUxVicl^&_uS_R_bd0wz4KBjkMU{aXYM^0JOH>hFC;jZm8tMVe#Sd=1~HKk
z(>BCxl4^1TjYaHe)?wNa)CYr}#k>!qkkT1qmg7FC>dI^So>L!&JGRfYn6t<%{%;Y*
zl(tcnQl_VLHC%&HRsV4#u;GIh{vQ;ZDaj;9)fb2yZRL$;_8Uw?$Bl9wUIVjZ#l0Gc
zt&EFp!{8Buox9rr>*Zlf^<)^zK|gFZ$4LVh_w~)Sq!jhNwZ!mEwfa$0ihwTZSap{~
ziX|P|*okD+Z7FIls+fU*DL3Jya+uvYAj-`OS@o&TW!UTv+Oi+ylM8a<IzuJ<QSwSA
zxSxEJuyASG05^~zNgn9#5yJ!ISR^hQBgbqD%Y<hcW6Do7_0Rll{r)<XO}ON>-aw4I
Mtt&K9NDLI|FVXsP`2YX_

delta 438
zcmY+AO-sW-5Qb+z^3f!%B2_GS@)jvl5O2YY_29*eiXaq`ZcR7Fgl<yWLyBN;9)yx>
z4<7v$9{dMhgFnVeii!+7^US{UGVH#aA4ct<Ubhm_?j0^_m$m@_$9R%2Sje5nxgM}N
z%&3GJ^I^uP&l&AP?`fuGJm8|1X@a#tk~txOY_>pkRyAYyhI&EPTBV{_*{CwFGWvwI
zq&^Y$l4oq?@?g~YVbo8Y76crnf0lCDsB;Aw&mhoJJuo~#(~3<GM7?CuK!S5{*YcRW
zbqh9Dp-T%bm1#Io4BzN-#jzAz_T#9~Cj;pZ)57czWhm4jQsrM<T$?hv31eSIZY_VM
zd-*4wkY;|$l4%=tAPqu)!(yCs+aeppBo5UH2HoZBWScp}A!-Zf&s<j6BDjtGcpul^
dDT<esqM9ZBrA=%L(|d@;I2;@i?2>ZUVc&$WTNwZV

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"
index 0508e17..0e50822 100644
--- "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"
@@ -9,6 +9,8 @@ def init_permission(request, obj):
         'permissions__menu__icon',
         'permissions__menu__weight',
         'permissions__menu_id',
+        'permissions__id',
+        'permissions__parent_id',
     ).distinct()
     # print(permissions)
     menu_dict = {}
@@ -27,7 +29,8 @@ def init_permission(request, obj):
     #
     #         })
     for i in permissions:
-        permissions_list.append({'url': i['permissions__url']})
+        permissions_list.append(
+            {'url': i['permissions__url'], 'id': i['permissions__id'], 'pid': i['permissions__parent_id']})
         if i['permissions__menu_id']:
             if i['permissions__menu_id'] not in menu_dict:
                 menu_dict[i['permissions__menu_id']] = {
@@ -35,14 +38,15 @@ def init_permission(request, obj):
                     'icon': i['permissions__menu__icon'],
                     'weight': i['permissions__menu__weight'],
                     'children': [
-                        {'title': i['permissions__title'], 'url': i['permissions__url']}
+                        {'title': i['permissions__title'], 'url': i['permissions__url'], 'id': i['permissions__id']}
                     ]
                 }
             else:
                 menu_dict[i['permissions__menu_id']]['children'].append(
                     {'title': i['permissions__title'], 'url': i['permissions__url']}
                 )
-    # print(menu_dict)
+    print(menu_dict)
+    print(permissions_list)
     request.session[settings.PERMISSION_SESSION_KEY] = permissions_list
     request.session[settings.MENU_SESSION_KEY] = menu_dict
     request.session['is_login'] = True
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"
index 33f203b378caff776a2e8a8ef4d337006cc777b6..7e26c6c43ac7cc3e54cbd02e362043d4a37c919e 100644
GIT binary patch
delta 337
zcmX9(yGjF55S_V?-OZY4s*spQM2mok-~*AA7FISE0Wkz|R@haedvhZx?wVp1V__i|
zf5Flpu=gYOC#<aXE-B8LVdk7U%#Z)=hugJU*qm<k|JYmjIrRWQI&g>4ha&?CB&b=!
zb9@0Ua>!8289c)!5)yk1h?98b8Jjc>JA{5c<1;Y41qKc8Lb}z1$<YiFF9)~nW`d*<
z<aJ@P>8jr<r>mKCIlhqx6tv)qDWZyzrHI10IHew>$34)2!SYm&2(&QoV?2RQ)lTtO
z6f7qDz#3Sw?`(Zv3HL$ajc%2WsPOL3ugB5obm?NOR5a9sn`k&5#8k*T6%TdCD|{8D
sPNA*fdn?P%3v7{l*uW6$xQKy6$#qsm)wXAR%>}B+KJi^_+b_QJ5A7yUYybcN

delta 395
zcmX9(Jxc>Y5S`h*+e<DVrV0rNL5W4gPED0Eg;)s+0WpM-y_h@lb(>8Hx`)UK#==7H
ze^~h&?EC{;_!q3~-6O?&^JeC~f%$TN9rw6UaKCSlx=7#Lj|T?;m;p6dd>T>^K!B12
zG{%>-vm%ss3=xrR1J5u-j+{JYIOWzWjp(|fXdAkv$l8Fis-TFnS`aonu)f$p;KX3I
z?a1b~vN>zPx@oFYO{a$uJCm6p%QJzi7|&KAMujmE0Z)5l=DBSs3_1{AbwK76Nl(Uz
z!1G(}<0Ui-Nr-=Ycl180Yq}I;&H4lBuRIOc*@-t@_Qw7~HuA|MIXKtZd0&ot{&YAK
zmibt-#Y{+#Yqsi-m)=4X;c0u)mxGaJ#$%MW=fa=LhNB(fg~lVrj!7mzq`ALq1dt*!
i!mx}kmavE!gR<cg$)l(xC$w&hN*cJKr&vqg>B&C^A!9@U

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
index 88612c9..2bc1d3a 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
@@ -10,7 +10,7 @@ register = template.Library()
 @register.inclusion_tag('rbac/menu.html')
 def menu(request):
     menu_dict = request.session.get(settings.MENU_SESSION_KEY)
-    url = request.path_info
+    # url = request.path_info
 
     od = OrderedDict()
     keys_list = sorted(menu_dict, key=lambda x: menu_dict[x]['weight'], reverse=True)
@@ -19,7 +19,7 @@ def menu(request):
     for i in menu_dict.values():
         i['class'] = 'hide'
         for m in i['children']:
-            if re.match(r'{}$'.format(m['url']), url):
+            if request.current_menu_id == m['id']:
                 m['class'] = 'active'
                 i['class'] = ''
 
-- 
Gitee


From 3f6ff5d78af9560848212ea95a1eb16026eef28c Mon Sep 17 00:00:00 2001
From: yongzy <635602689@qq.com>
Date: Mon, 15 Jul 2019 22:05:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea/workspace.xml"                      | 114 ++++++++++--------
 .../db.sqlite3"                               | Bin 71680 -> 72704 bytes
 .../__pycache__/middleware.cpython-36.pyc"    | Bin 1191 -> 1426 bytes
 .../rbac/middlewares/middleware.py"           |  12 +-
 .../init_permission.cpython-36.pyc"           | Bin 1086 -> 1101 bytes
 .../rbac/service/init_permission.py"          |  13 +-
 .../rbac/templates/rbac/breadcrumb.html"      |  14 +++
 .../__pycache__/my_tags.cpython-36.pyc"       | Bin 966 -> 1137 bytes
 .../rbac/templatetags/my_tags.py"             |   6 +
 .../web/templates/layout.html"                |   9 +-
 10 files changed, 106 insertions(+), 62 deletions(-)
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/breadcrumb.html"

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 8960d53..92aedae 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"
@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="2bd9986f-9fd5-4cdf-a330-5da7c76a6a75" name="默认更改列表" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rbac/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/models.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/rbac/middlewares/middleware.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/middlewares/middleware.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/rbac/service/init_permission.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/service/init_permission.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -46,23 +48,11 @@
   </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="184">
-              <caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
-              <folding>
-                <element signature="e#0#54#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="372">
-              <caret line="48" column="26" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+            <state relative-caret-position="52">
+              <caret line="44" column="17" lean-forward="true" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
             </state>
           </provider>
         </entry>
@@ -91,17 +81,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="129" column="17" selection-start-line="129" selection-start-column="17" selection-end-line="129" selection-end-column="17" />
+            <state relative-caret-position="124">
+              <caret line="134" column="33" selection-start-line="134" selection-start-column="33" selection-end-line="134" selection-end-column="33" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="182">
-              <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="50" />
+            <state relative-caret-position="253">
+              <caret line="30" column="24" lean-forward="true" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="24" />
               <folding>
                 <element signature="e#0#27#0" expanded="true" />
               </folding>
@@ -109,11 +99,20 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/rbac/templates/rbac/breadcrumb.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="138">
+              <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
+            </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="253">
-              <caret line="20" column="32" lean-forward="true" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+            <state relative-caret-position="-86">
+              <caret line="32" column="37" lean-forward="true" selection-start-line="32" selection-start-column="37" selection-end-line="32" selection-end-column="37" />
               <folding>
                 <element signature="e#0#52#0" expanded="true" />
               </folding>
@@ -153,9 +152,9 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="HTML File" />
         <option value="Python Script" />
         <option value="CSS File" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
@@ -181,18 +180,19 @@
         <option value="$PROJECT_DIR$/web/views/auth.py" />
         <option value="$PROJECT_DIR$/rbac/templates/rbac/menu.html" />
         <option value="$PROJECT_DIR$/rbac/static/rbac/js/menu.js" />
-        <option value="$PROJECT_DIR$/web/templates/layout.html" />
         <option value="$PROJECT_DIR$/rbac/models.py" />
         <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
         <option value="$PROJECT_DIR$/rbac/service/init_permission.py" />
-        <option value="$PROJECT_DIR$/rbac/templatetags/my_tags.py" />
         <option value="$PROJECT_DIR$/rbac/middlewares/middleware.py" />
+        <option value="$PROJECT_DIR$/rbac/templatetags/my_tags.py" />
+        <option value="$PROJECT_DIR$/web/templates/layout.html" />
+        <option value="$PROJECT_DIR$/rbac/templates/rbac/breadcrumb.html" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="875" />
-    <option name="width" value="1055" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="948" />
+    <option name="width" value="982" />
     <option name="height" value="1090" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -246,6 +246,19 @@
               <item name="static" 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="templates" 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" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
@@ -356,18 +369,18 @@
       <workItem from="1563189552446" duration="270000" />
       <workItem from="1563190004562" duration="1390000" />
       <workItem from="1563193147448" duration="613000" />
-      <workItem from="1563194258944" duration="2998000" />
+      <workItem from="1563194258944" duration="4782000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33710000" />
+    <option name="totallyTimeSpent" value="35494000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="700" y="0" width="844" height="872" extended-state="0" />
+    <frame x="759" y="0" width="785" height="872" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4894068" visible="true" weight="0.03816794" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4894068" visible="true" weight="0.34525448" />
       <window_info id="Structure" order="1" sideWeight="0.51059324" side_tool="true" weight="0.26785713" />
       <window_info id="Favorites" order="2" sideWeight="0.50345784" side_tool="true" weight="0.211126" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -532,44 +545,51 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="127" selection-start-line="127" selection-end-line="127" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="48" column="26" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+        <state relative-caret-position="52">
+          <caret line="44" column="17" lean-forward="true" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="20" column="32" lean-forward="true" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="-86">
+          <caret line="32" column="37" lean-forward="true" selection-start-line="32" selection-start-column="37" selection-end-line="32" selection-end-column="37" />
           <folding>
             <element signature="e#0#52#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
+    <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="127" selection-start-line="127" selection-end-line="127" />
+        <state relative-caret-position="253">
+          <caret line="30" column="24" lean-forward="true" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#27#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="129" column="17" selection-start-line="129" selection-start-column="17" selection-end-line="129" selection-end-column="17" />
+        <state relative-caret-position="124">
+          <caret line="134" column="33" selection-start-line="134" selection-start-column="33" selection-end-line="134" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
+    <entry file="file://$PROJECT_DIR$/rbac/templates/rbac/breadcrumb.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="50" />
-          <folding>
-            <element signature="e#0#27#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="138">
+          <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
         </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 18475a44f538a5b94ba0f29f27925224697fd0d8..a9916497bfea781e82a6c4e2544667dfcfa80854 100644
GIT binary patch
delta 1658
zcmbVMO>g5=6s<dr+Ci!WLoyvYDjEa}B-D<dQzxWiKy5xe&lB4ub^P&GBsSC7j#Eo!
z>NpZg_iR9xuvj6Mut1<}*bEDHs2lzPe*i=&LYl=axK280+O%C@$+~_|e(#=p&pG$-
zhlRtR7CyhbJe-@G<4#}di?{RC@W+qxN3XE#RyMyu=d<tTQ0ny?+f@ABBDFgF<*4{p
zYW~*T{H@_j$4m2zpBbr?@MR<V^!N=~;%cFwifvsLSYq=oth1z~*hH=&N!A(ob|tm3
zN$hQwlt^3Rc#D+0Jnrsv3>SGuR`gm7+s8KS*=0-W`d0Mp>DsClSWUHNNp{(Xe?3yf
zxmH*4Tg4!Hda}OscsH;F3+JN4Kkf{4weD0y>|?j%V0%BT7Wv@paNRSxUI+Fq?O}r<
z97!S)+;Wga-7Sa7zF-Sk+@*bN3nLJw#>4l%Rb@nEWa|elRSBz%;xx6|!J|^4_8}*F
zq{JE;SBt;RP|HOj3@n2i0q6k$x~bKDvWs)L(?cSo_e6*ir?Y|rYn5*c$-a&IV#pV&
zMNC5nVzfZrx#19X`23%xdpCm@iQ;cE)a{+(HTTOn6e@5(bX<gZ$^B?_e~MZe^q}dr
z13YPP<6?s?lk3neu3<?QZ<w;_3jI37wj=aA5F4Q&n-KRlMSIUmh!BB@k3$|AZUATS
zfx%T+=+_goSZEV&I+yO_!6};}96X<hIK)j7HbPzA87H(!vhIs=W1J|wGEs*B=xVrk
zzftNX<iDd;dd{QJnJUy66{;punoSN>%1N@eE6J5hlS^>!iYkG!ApR;ttv!&=SVA)@
zxWH24okSI)EFf{0FFcMuI5~<p($vlP_uJIJ>1jKHSw~O&Tbg=r<cV{#MuLqKIkTdz
z)0fHm3gCWI6QOGp>m-=R)^S<X;sQT<`LFdB*y4)wv-JKycB8NVyc-?=y&8X?q0;wf
z8h61y7aA8YXQ<Z(gj4+M`QMueeU^R@wVi0rVMO~>?9<v)U@*9-0~6?UQsMECI5SH0
z>&dG*)6z%cF=(NrTTq6lGleI~7$I)?6H^mAhJ{9oG#SMsOdDLk-;3X0q263RH;Llz
z3bhtdKc@#1n^p>%mW-$Ij6Clgu%`XOIf;0$$DuPUo7jIEgHYOr3dQ}V+H(w70nA<t
zIHzN>Na5`X2n9eO7+1V!pn~6GOs@srHy`qdX!HYyMul}czs?lyq3qUXehaZ1EJ8Up
F`yZ3+FKqw-

delta 379
zcmZqJ!P2mSWr8&C1_lNOHy{Rsi5ljN8#X4GpB6N<urf5)Gqp4_Ha2FJV|HYmzKWeu
zYV)Df&MK_TlNgvMZRYyG!L)hB+fYWP5XZ^(@058{a(%0Uk~^GPS$!vnPOkl+=oA@}
zZs?oqm*JP|mJwOyXcQF^l?|f(T>>k7tDLeTvyv<P-2*H9szR$GLqZKAv(k+svkJ^T
z^PF;$a}5iUjW_@K%%L!yg@sW|!pGUGAj;X(%s03^Gub^S+cT@6G$p*Ec=CcbilUk2
znTg?nnf_Ux#X!vvbrI78SQt&F8%Qv6@>BtJmqS#zO-}r13=$P#b+h#GD4xDhoKcM*
z!_c=<lP`Q^6M@<42ebiVYrf&+1whFUAEl-jNivE6IY#0@TXR7!$~QsS6J{B)U0aOt
NBqI-USWcX%008;&eeVDO

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 8313077af18cfe4e8e25c2b88b2412839157689a..b9116d4883930c00b490afd5a5ee26256e9faa75 100644
GIT binary patch
delta 680
zcmZWlO=}cE5bf&e>G{~%FNng15OnpjK?!2~1$t62NWefKyG+s(oyqQG($g!8^st8k
zLC8TI@U$Mh_;K{$pP64^ZeBbJ*35!Q@X%G&Rqxe%-Cvyd4flSt=?>rA+5c&McRiT9
zgb)+YLp<pg5TYR>85NjEAV5%IEa(fs8=b8yBVv!p{z_&jGveCNG^esJ$PPK}?^aAJ
zvIWZ_W16MUm7`o?=8(e<skx2+xWjo(9{wY9B%8CZ+KjxMAbgSWN=jH!Q*&YWNDj5=
z8Qz>8$t=t+W?S3uKr(Gtwza8R+Rg#{4w|A-TRRmOW1~lex1c#dWtT?B?d4jGmqzgo
zZPkmG<XZSDqPBguOH@ZRtM?6BPp2He@ci?K^G`osTbp4lg4yPPmZl2TI4J2<7Qf(L
zS2~CqP}#y%*TqeG7rMnZUF+_(4`kqrLphxsjK*QAievhC{>mRugS6yFCvxJe(nyso
zxt}CKETmN}b4!*6<D=4&!6_nD$r4|^Tq-mWP<E0)PQo+|PvUeW!b4TM7aiHIoOCek
zdCBOa|Bc8#Hh&k)h#zcWMJNYOTZRW7*wh0C9>%(+Ex1l?uyM|@vkGgB!)o!-cyjGF
a66-~m!mZ+u@eEdqZMM;=G_H)^vh}}pL!iC@

delta 464
zcmZWlO-sW-5Z&2ql1-Y3NEHgP_tp;(Zz3Y-p;(Yg4?Rec!lu~J&rJ%YY$%e8XY(V(
zoBjkZ{)pTJ58nI>P68g(!@M_dXWq>2K9n9U`_Of5b+_C7&|ho^Ru&;d$2h|X-w+f8
zB&GuS1{T$b2HH94mSZhqfvz+~6DrGsw8^a8$$O2!6p%p76bl;>k1RnG)NN9D?SI}@
z;cfkRuZ4zYebG=lww}gDzDBU1qzs`~NCL&eB`TvrViVa!=8DT_#q%qU4Q1wBj9qp}
z<OrUxuUVJriXNn|bPwG0i+ZW2T{Qa>IqF5y#CO)LjD`NNpPAC1&HXUS*t8ejN(XB)
z{}ow6$n2>vM}sgNOvcj9PuCEhi1gBTP43iD5Nd!y9dLjnGH`x!YQq-gz=2V&8R<Q1
qZdUUN-f!4WKiL&*q(^#v|8EI9Gk!dpi22Yz0aPJJa9|y$mbGt<!C`>_

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 6fa4436..a1055c6 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"
@@ -9,6 +9,9 @@ class AuthMiddleWare(MiddlewareMixin):
         # 获取当前访问的URL
         path = request.path_info
         request.current_menu_id = None
+        request.breadcrumb_list = [
+            {'title': '首页', 'ur': '/index/'}
+        ]
         # 白名单
         for url in settings.WHITE_LIST:
             if re.match(url, path):
@@ -22,9 +25,9 @@ class AuthMiddleWare(MiddlewareMixin):
             if re.match(url, path):
                 return
         # 获取权限信息
-        permissions = request.session.get('permissions')
+        permissions_dict = request.session.get('permissions')
         # 权限的校验
-        for permission in permissions:
+        for permission in permissions_dict.values():
             if re.match(r"{}$".format(permission['url']), path):
                 # 记录二级菜单的id(父权限)
                 id = permission['id']
@@ -32,8 +35,13 @@ class AuthMiddleWare(MiddlewareMixin):
                 if pid:
                     # 当前访问的是一个子权限
                     request.current_menu_id = pid
+                    p_permission = permissions_dict[str(pid)]
+                    request.breadcrumb_list.append({'url': p_permission['url'], 'title': p_permission['title']})
+                    request.breadcrumb_list.append({'url': permission['url'], 'title': permission['title']})
+
                 else:
                     # 当前访问的是一个父权限
                     request.current_menu_id = id
+                    request.breadcrumb_list.append({'url': permission['url'], 'title': permission['title']})
                 return
         return HttpResponse('没有访问权限，请联系管理员')
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"
index ac6abbe54af2905d28f1c84e4fb567240617eedf..26acd17e0a3e8c643fc8a14a0e45bc8b24e115ac 100644
GIT binary patch
delta 142
zcmdnTah8M2n3tDJu2m<tnPVbXEF;&%3|-?)hFX@2B{fVg46$=+S!-BRm?as2Bqx~U
z0+TF~3@O}mSZY`x;x-cxh%m0%cr}MnmgN?6X;IECrp%OE%mqM#wIs77CsmWVh>d}P
iVR9tXQ|6S+<jIcA)r=OC_cF_}@-VV7icG%CoCpAasV4UT

delta 143
zcmX@hv5$kxn3tD}u~sMcC;LRMSVpFa8M+SX47Ds3b847e7-FZ?vevL<vDC1pFiSE3
zNlq}yCCQM&J%_oOkr5=uA<0l=0-<Y|v)PN5Y`mMpD8YP-xwI(f7E@-*E#`vE6iwz^
ltR<NxIjNJ=n4U7{WEM~MW3Fa2n|z8{mYIc7YVsTAL;#t@C|Lji

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"
index 0e50822..70c5aa7 100644
--- "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"
@@ -16,8 +16,8 @@ def init_permission(request, obj):
     menu_dict = {}
 
     # print(menu_dict)
-    # 权限信息的列表
-    permissions_list = []
+    # 权限信息的字典
+    permissions_dict = {}
     # # 菜单信息的列表
     # menu_list = []
     # for i in permissions:
@@ -29,8 +29,9 @@ def init_permission(request, obj):
     #
     #         })
     for i in permissions:
-        permissions_list.append(
-            {'url': i['permissions__url'], 'id': i['permissions__id'], 'pid': i['permissions__parent_id']})
+        permissions_dict[i['permissions__id']] = {'url': i['permissions__url'], 'id': i['permissions__id'],
+                                                  'pid': i['permissions__parent_id'],
+                                                  'title': i['permissions__title']}
         if i['permissions__menu_id']:
             if i['permissions__menu_id'] not in menu_dict:
                 menu_dict[i['permissions__menu_id']] = {
@@ -46,7 +47,7 @@ def init_permission(request, obj):
                     {'title': i['permissions__title'], 'url': i['permissions__url']}
                 )
     print(menu_dict)
-    print(permissions_list)
-    request.session[settings.PERMISSION_SESSION_KEY] = permissions_list
+    print(permissions_dict)
+    request.session[settings.PERMISSION_SESSION_KEY] = permissions_dict
     request.session[settings.MENU_SESSION_KEY] = menu_dict
     request.session['is_login'] = True
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/breadcrumb.html" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/breadcrumb.html"
new file mode 100644
index 0000000..c4d9dd2
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/breadcrumb.html"
@@ -0,0 +1,14 @@
+<ol class="breadcrumb no-radius no-margin" style="border-bottom: 1px solid #ddd;">
+
+    {#                <li><a href="#">首页</a></li>#}
+    {#                <li class="active">客户管理</li>#}
+    {% for breadcrumb in breadcrumb_list %}
+        {% if forloop.last %}
+            <li class="active">{{ breadcrumb.title }}</li>
+        {% else %}
+            <li><a href="{{ breadcrumb.url }}">{{ breadcrumb.title }}</a></li>
+        {% endif %}
+    {% endfor %}
+
+
+</ol>
\ No newline at end of file
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"
index 7e26c6c43ac7cc3e54cbd02e362043d4a37c919e..8703488e6e739e8710d46411c0546a70f0797a86 100644
GIT binary patch
delta 249
zcmX@c{*go3n3tC;v0W#29Ww*NV+JGu<TE$`adFH<WlxDzjx5d;j%LOb&J?Z|hGxbn
z?iA)=22JjbMMs(Ht3-;D5|j0lic%9(l8Z`nlk_r5a&wXyp{6kbX%Kb>nZ^esY8bK@
zY8g`)YZx;bfrc>o-Qq{+jnBy}F41Hxk^w5zWGa#XQebuw8;AuaIDxENTyQO-Npe7e
sViq95z{JK_BnzZ9c_v#j$1=)Jp2VyszylQEVd7!rVB}%qU=|Vq094v9-2eap

delta 80
zcmey!ag1Hrn3tDJqFyKVKNADPV+JI^3}ib1ak1A#Wly#g=3oX*j*TrxnV2-WC*Ng`
Xoovsd#K#4c=V9Vu<Y44s;$Q{<W>yV?

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
index 2bc1d3a..2e358e0 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
@@ -25,3 +25,9 @@ def menu(request):
 
     print(od.values())
     return {'menu_list': od.values()}
+
+
+@register.inclusion_tag('rbac/breadcrumb.html')
+def breadcrumb(request):
+    breadcrumb_list = request.breadcrumb_list
+    return {'breadcrumb_list': breadcrumb_list}
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 0429ce2..fd07c94 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,7 +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' %}">
+    <link rel="stylesheet" href="{% static 'rbac/css/menu.css' %}">
     <style>
         body {
             margin: 0;
@@ -132,12 +132,7 @@
     </div>
     <div class="right-body">
         <div>
-            <ol class="breadcrumb no-radius no-margin" style="border-bottom: 1px solid #ddd;">
-
-                <li><a href="#">首页</a></li>
-                <li class="active">客户管理</li>
-
-            </ol>
+            {% breadcrumb request %}
         </div>
         {% block content %} {% endblock %}
     </div>
-- 
Gitee