diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/vcs.xml" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/vcs.xml"
index 6c0b8635858dc7ad44b93df54b762707ce49eefc..64713b81f3557f6879e5fe4965dcc1348e60fb9c 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/vcs.xml"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/vcs.xml"
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
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 f3af2a2ffae0eeb1979a676186ae09c5982e40c0..b2e3ab23b351616211b8087e4ec535962f86999e 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,31 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2bd9986f-9fd5-4cdf-a330-5da7c76a6a75" name="默认更改列表" comment="">
-      <change afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/templates/consult_record.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/templates/enrollment.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/templates/form.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/templatetags/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/templatetags/my_tags.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/dictionaries/63560.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/rbac/middlewares/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/rbac/middlewares/middleware.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/rbac/migrations/0001_initial.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/rbac/urls.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/templates/index.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/templates/login.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/views/auth.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/Dynamics_crm/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/Dynamics_crm/settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/crm/forms.py" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/forms.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/crm/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/models.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/crm/templates/customer_form.html" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/templates/customer_form.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/crm/templates/customer_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/templates/customer_list.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/crm/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/urls.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/crm/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/crm/views.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/templates/layout.html" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/templates/layout.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Dynamics_crm/utils/pagination.py" beforeDir="false" afterPath="$PROJECT_DIR$/../Dynamics_crm/utils/pagination.py" afterDir="false" />
+      <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 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$/web/views/auth.py" beforeDir="false" afterPath="$PROJECT_DIR$/web/views/auth.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -68,135 +48,97 @@
     <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5">
-      <split-first>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/web/views/auth.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="65">
-                  <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="245">
-                  <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
-                  <folding>
-                    <element signature="e#0#52#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/rbac/models.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="138">
-                  <caret line="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/rbac/admin.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="138">
-                  <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
-                  <folding>
-                    <element signature="e#0#32#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="226">
-                  <caret line="163" column="98" selection-start-line="163" selection-start-column="98" selection-end-line="163" selection-end-column="98" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/rbac/urls.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="92">
-                  <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/web/templates/index.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="46">
-                  <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/web/templates/login.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="281">
-                  <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/web/views/customer.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-1118">
-                  <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/web/urls.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="23">
-                  <caret line="4" selection-start-line="4" selection-end-line="4" />
-                  <folding>
-                    <element signature="e#0#32#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/web/views/auth.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="111">
-                  <caret line="28" column="49" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <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="207">
+              <caret line="33" column="49" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" />
+              <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$/web/templates/layout.html">
+          <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>
+          </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">
+          <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" />
+              <folding>
+                <element signature="e#0#27#0" expanded="true" />
+              </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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="46">
+              <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+          <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>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="HTML File" />
         <option value="Python Script" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -208,19 +150,21 @@
         <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$/luffy_permission/settings.py" />
         <option value="$PROJECT_DIR$/rbac/admin.py" />
         <option value="$PROJECT_DIR$/rbac/models.py" />
         <option value="$PROJECT_DIR$/rbac/middlewares/middleware.py" />
-        <option value="$PROJECT_DIR$/web/templates/layout.html" />
+        <option value="$PROJECT_DIR$/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" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1154" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="876" />
+    <option name="y" value="2" />
+    <option name="width" value="1047" />
     <option name="height" value="1045" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -231,6 +175,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -238,11 +183,6 @@
               <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
-              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
-              <item name="luffy_permission" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
@@ -259,17 +199,10 @@
               <item name="web" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
-              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -279,7 +212,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <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="preferences.intentionPowerPack" />
+    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -332,22 +265,23 @@
       <workItem from="1562827785852" duration="8595000" />
       <workItem from="1562836703031" duration="41000" />
       <workItem from="1562921631604" duration="4949000" />
+      <workItem from="1562930125078" duration="2590000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13585000" />
+    <option name="totallyTimeSpent" value="16175000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
+    <frame x="701" y="2" width="837" height="836" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49364406" visible="true" weight="0.1735925" />
+      <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 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.24655436" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3046252" />
       <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" />
@@ -355,7 +289,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" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50067025" side_tool="true" weight="0.24655436" />
       <window_info anchor="bottom" id="调试" order="11" weight="0.32843652" />
       <window_info anchor="bottom" id="Terminal" order="12" weight="0.32376397" />
       <window_info anchor="bottom" id="Python Console" order="13" weight="0.3923445" />
@@ -390,13 +324,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/rbac/views/login.py" />
     <entry file="file://$PROJECT_DIR$/web/templates/login.py" />
     <entry file="file://$PROJECT_DIR$/luffy_permission/urls.py">
@@ -409,51 +336,64 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
+    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2944">
-          <caret line="128" column="15" selection-start-line="128" selection-start-column="15" selection-end-line="128" selection-end-column="15" />
+        <state relative-caret-position="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$/web/urls.py">
+    <entry file="file://$PROJECT_DIR$/rbac/admin.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        <state relative-caret-position="115">
+          <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
           <folding>
             <element signature="e#0#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+    <entry file="file://$PROJECT_DIR$/rbac/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1118">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="92">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/admin.py">
+    <entry file="file://$PROJECT_DIR$/web/templatetags/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/models.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#32#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="322">
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
         </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="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
+        <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$/rbac/urls.py">
+    <entry file="file://$PROJECT_DIR$/web/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        <state relative-caret-position="23">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+          <folding>
+            <element signature="e#0#32#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/templates/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
         </state>
       </provider>
     </entry>
@@ -464,34 +404,51 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/login.html">
+    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+        <state 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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
+    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+        <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$/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" />
           <folding>
-            <element signature="e#0#52#0" expanded="true" />
+            <element signature="e#0#54#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="226">
-          <caret line="163" column="98" selection-start-line="163" selection-start-column="98" selection-end-line="163" selection-end-column="98" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/views/auth.py">
+    <entry file="file://$PROJECT_DIR$/web/templatetags/my_tags.py">
+      <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" />
+          <folding>
+            <element signature="e#0#27#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/templates/menu.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="111">
-          <caret line="28" column="49" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
+        <state 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>
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/__pycache__/settings.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/__pycache__/settings.cpython-36.pyc"
index 07ae84cae1aa0405c1f8940e8fbd30a1b7957f85..9e9fb4abb911cf9eff85db2af789d3c441acd5e1 100644
Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/__pycache__/settings.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/__pycache__/settings.cpython-36.pyc" differ
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/settings.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/settings.py"
index 1aa00dc3b1b3976b9e94baec2e766ff3e1dbef3d..6c8ba115f6515303abe7ec833bbc1ef4cd650510 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/settings.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/luffy_permission/settings.py"
@@ -128,3 +128,9 @@ WHITE_LIST = [
 NO_PERMISSION_LIST = [
     r'/index/',
 ]
+
+# 权限的session的key
+PERMISSION_SESSION_KEY = 'permissions'
+
+# 菜单的session的key
+MENU_SESSION_KEY = 'menus'
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 d332164eab3a2c3bc033f9ebf6edb02222e17fe9..63c28873cfe23508b7eea44b7b144cd518c6c78a 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"
@@ -154,18 +154,13 @@
 <div class="pg-body">
     <div class="left-menu">
         <div class="menu-body">
-            <div class="static-menu">
-{#                <a href="/customer/list/" class="active">#}
-{#                    <span class="icon-wrap"><i class="fa fa-connectdevelop"></i></span> 客户管理</a>#}
-{#                <a href="/payment/list/">#}
-{#                    <span class="icon-wrap"><i class="fa fa-code-fork"></i></span> 账单管理</a>#}
-                {% for menu in request.session.menus %}
-                     <a href="{{ menu.url}}" class="active">
-                    <span class="icon-wrap"><i class="fa {{ menu.icon }}"></i></span>{{ menu.title }}</a>
-                {% endfor %}
-                
-            </div>
 
+            {#                <a href="/customer/list/" class="active">#}
+            {#                    <span class="icon-wrap"><i class="fa fa-connectdevelop"></i></span> 客户管理</a>#}
+            {#                <a href="/payment/list/">#}
+            {#                    <span class="icon-wrap"><i class="fa fa-code-fork"></i></span> 账单管理</a>#}
+            {% load my_tags %}
+            {% menu request %}
         </div>
     </div>
     <div class="right-body">
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/web/templates/menu.html"
new file mode 100644
index 0000000000000000000000000000000000000000..2cbdf6f4d0f0d6e5e715673fa94194aff1af34dd
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/menu.html"
@@ -0,0 +1,6 @@
+<div class="static-menu">
+    {% for menu in menu_list %}
+        <a href="{{ menu.url }}" class="{{ menu.class }}">
+            <span class="icon-wrap"><i class="fa {{ menu.icon }}"></i></span>{{ menu.title }}</a>
+    {% endfor %}
+</div>
\ No newline at end of file
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/web/templatetags/__init__.py"
new file mode 100644
index 0000000000000000000000000000000000000000..9169e026eff1b0523f3dcfdf6ea749240198fa4f
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__init__.py"
@@ -0,0 +1,11 @@
+#!/user/bin/env python
+# -*- encoding:utf-8 -*-
+'''
+# @Time    : 2019/7/12 19:25
+# @Author  : John Wang
+# @Site    : 
+# @File    : __init__.py.py
+# @Software: PyCharm
+# @Contact : 635602689@qq.com
+# @License :   (C)Copyright 2019-2020, John Wang
+'''
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/web/templatetags/__pycache__/__init__.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..7ab8148e15a3173f39756350eec0b0c0ddbb60e4
Binary files /dev/null and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/__init__.cpython-36.pyc" differ
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"
new file mode 100644
index 0000000000000000000000000000000000000000..95f9fed4cb7d13c1443018e10a5ddf38551fba0b
Binary files /dev/null and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/my_tags.cpython-36.pyc" differ
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/web/templatetags/my_tags.py"
new file mode 100644
index 0000000000000000000000000000000000000000..03793c2624f6268bbb1f8b986429883cd18203c4
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py"
@@ -0,0 +1,18 @@
+from django import template
+
+from django.conf import settings
+import re
+
+register = template.Library()
+
+
+@register.inclusion_tag('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):
+            i['class'] = 'active'
+            break
+    return {'menu_list': menu_list}
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 5b222d42c8882d281c2d1abd7bd16024df800e5e..9419b79ba54d9b63a848373cf362fd8827842465 100644
Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/__pycache__/auth.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/__pycache__/auth.cpython-36.pyc" differ
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 de02322bc0e7063abd03357a2804e98b7f75f72d..d0a65a57fd403de114fd86fe9e0c83ea1121cd41 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 import models
 
 
@@ -30,8 +30,8 @@ def login(request):
                     'icon': i['permissions__icon'],
                 })
         print(menu_list)
-        request.session['permissions'] = permissions_list
-        request.session['menus'] = menu_list
+        request.session[settings.PERMISSION_SESSION_KEY] = permissions_list
+        request.session[settings.MENU_SESSION_KEY] = menu_list
         request.session['is_login'] = True
         return redirect(reverse('index'))
     return render(request, 'login.html')