device models

scan config
code management
2026-02-04 03:13:15 +08:00 · 2019-01-03 20:54:17 +08:00 · 2018-12-29 20:19:34 +08:00 · 2018-12-19 21:41:50 +08:00 · 2018-12-15 15:34:27 +08:00 · 2018-12-10 20:32:45 +08:00
77 changed files with 4322 additions and 926 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.js linguist-language=python
+*.css linguist-language=python
+*.html linguist-language=python
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
--- a/.idea/dictionaries/RobbieHan.xml
+++ b/.idea/dictionaries/RobbieHan.xml
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="RobbieHan" />
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (sandboxMP)" project-jdk-type="Python SDK" />
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/sandboxMP.iml" filepath="$PROJECT_DIR$/.idea/sandboxMP.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/sandboxMP.iml
+++ b/.idea/sandboxMP.iml
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="django" name="Django">
-      <configuration>
-        <option name="rootFolder" value="$MODULE_DIR$" />
-        <option name="settingsModule" value="sandboxMP/settings.py" />
-        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
-        <option name="environment" value="&lt;map/&gt;" />
-        <option name="doNotUseTestRunner" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/apps" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TemplatesService">
-    <option name="TEMPLATE_CONFIGURATION" value="Django" />
-    <option name="TEMPLATE_FOLDERS">
-      <list>
-        <option value="$MODULE_DIR$/../sandboxMP\templates" />
-      </list>
-    </option>
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,822 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/apps/system/urls.py" afterPath="$PROJECT_DIR$/apps/system/urls.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views_structure.py" afterPath="$PROJECT_DIR$/apps/system/views_structure.py" />
-      <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
-      <change beforePath="$PROJECT_DIR$/templates/system/structure/structure.html" afterPath="$PROJECT_DIR$/templates/system/structure/structure.html" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DjangoConsoleOptions" custom-start-script="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)">
-    <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="forms.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-              <folding>
-                <element signature="e#73#97#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="views_structure.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="486">
-              <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="42" selection-end-column="77" />
-              <folding>
-                <element signature="e#83#94#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="533">
-              <caret line="35" column="88" lean-forward="true" selection-start-line="35" selection-start-column="88" selection-end-line="35" selection-end-column="88" />
-              <folding>
-                <element signature="e#633#665#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="structure.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2091">
-              <caret line="123" column="39" lean-forward="true" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#28#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Python Script" />
-        <option value="HTML File" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/templates/base-left.html" />
-        <option value="$PROJECT_DIR$/templates/head-footer.html" />
-        <option value="$PROJECT_DIR$/apps/system/models.py" />
-        <option value="$PROJECT_DIR$/apps/system/mixin.py" />
-        <option value="$PROJECT_DIR$/apps/system/views_user.py" />
-        <option value="$PROJECT_DIR$/apps/system/tests.py" />
-        <option value="$PROJECT_DIR$/templates/system/system.html" />
-        <option value="$PROJECT_DIR$/sandboxMP/urls.py" />
-        <option value="$PROJECT_DIR$/templates/system/system_index.html" />
-        <option value="$PROJECT_DIR$/apps/system/views.py" />
-        <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
-        <option value="$PROJECT_DIR$/apps/system/forms.py" />
-        <option value="$PROJECT_DIR$/templates/system/structure/structure_create.html" />
-        <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
-        <option value="$PROJECT_DIR$/apps/system/urls.py" />
-        <option value="$PROJECT_DIR$/templates/system/structure/structure.html" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1056" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>AngularJS</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="apps" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="apps" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-              <item name="structure" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-  </component>
-  <component name="PyConsoleOptionsProvider">
-    <option name="myPythonConsoleState">
-      <console-settings is-module-sdk="true">
-        <option name="myUseModuleSdk" value="true" />
-      </console-settings>
-    </option>
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\ProjectFile\sandboxMP\apps" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\ProjectFile\sandboxMP\templates\system\structure" />
-      <recent name="D:\ProjectFile\sandboxMP\apps\system" />
-      <recent name="D:\ProjectFile\sandboxMP\templates\system" />
-      <recent name="D:\ProjectFile\sandboxMP\media" />
-      <recent name="D:\ProjectFile\sandboxMP\static" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="sandboxMP" type="Python.DjangoServer" factoryName="Django server">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-        <env name="DJANGO_SETTINGS_MODULE" value="sandboxMP.settings" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="sandboxMP" />
-      <option name="launchJavascriptDebuger" value="false" />
-      <option name="port" value="8000" />
-      <option name="host" value="" />
-      <option name="additionalOptions" value="" />
-      <option name="browserUrl" value="" />
-      <option name="runTestServer" value="false" />
-      <option name="runNoReload" value="false" />
-      <option name="useCustomRunCommand" value="false" />
-      <option name="customRunCommand" value="" />
-    </configuration>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="" />
-      <created>1539589405377</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1539589405377</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
-    <editor active="true" />
-    <layout>
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21762785" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Mongo Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17590618" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18656716" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2687704" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21762785" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="manage.py@sandboxMP" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28073993" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Mongo Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17590618" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18656716" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="2" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/urls/conf.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="11" column="15" lean-forward="true" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
-          <folding>
-            <element signature="e#78#113#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="55" lean-forward="true" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="55" />
-          <folding>
-            <element signature="e#633#665#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-          <folding>
-            <element signature="e#73#97#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="29" column="63" lean-forward="false" selection-start-line="29" selection-start-column="63" selection-end-line="29" selection-end-column="63" />
-          <folding>
-            <element signature="e#633#665#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="20" column="6" lean-forward="false" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
-          <folding>
-            <element signature="e#78#113#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#35#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#310#319#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/users/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/bootstrap/js/npm.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1420">
-          <caret line="94" column="22" lean-forward="true" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/base-layer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="476">
-          <caret line="28" column="22" lean-forward="true" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/base-left.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="36" column="13" lean-forward="true" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/mixin.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="35" lean-forward="false" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/tests.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/base.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="143" column="6" lean-forward="false" selection-start-line="143" selection-start-column="6" selection-end-line="143" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#14#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="58" lean-forward="true" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
-          <folding>
-            <element signature="e#0#35#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/system_index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/urls/conf.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="11" column="15" lean-forward="true" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
-          <folding>
-            <element signature="e#78#113#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="55" lean-forward="true" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="55" />
-          <folding>
-            <element signature="e#633#665#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding>
-            <element signature="e#73#97#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="43" column="0" lean-forward="true" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
-          <folding>
-            <element signature="e#310#319#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#28#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="29" column="63" lean-forward="false" selection-start-line="29" selection-start-column="63" selection-end-line="29" selection-end-column="63" />
-          <folding>
-            <element signature="e#633#665#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="20" column="6" lean-forward="false" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
-          <folding>
-            <element signature="e#78#113#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#35#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#310#319#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/users/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/bootstrap/js/npm.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1420">
-          <caret line="94" column="22" lean-forward="true" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/base-layer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="476">
-          <caret line="28" column="22" lean-forward="true" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/base-left.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="36" column="13" lean-forward="true" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/mixin.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="35" lean-forward="false" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/base.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="143" column="6" lean-forward="false" selection-start-line="143" selection-start-column="6" selection-end-line="143" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#14#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="58" lean-forward="true" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
-          <folding>
-            <element signature="e#0#35#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/system_index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/urls/conf.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="11" column="15" lean-forward="true" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="29" column="18" lean-forward="true" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="18" />
-          <folding>
-            <element signature="e#310#319#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding>
-            <element signature="e#73#97#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure_create.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="76" column="27" lean-forward="true" selection-start-line="76" selection-start-column="27" selection-end-line="76" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/tests.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="652">
-          <caret line="49" column="23" lean-forward="true" selection-start-line="49" selection-start-column="23" selection-end-line="49" selection-end-column="23" />
-          <folding>
-            <element signature="e#78#113#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="42" selection-end-column="77" />
-          <folding>
-            <element signature="e#83#94#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="533">
-          <caret line="35" column="88" lean-forward="true" selection-start-line="35" selection-start-column="88" selection-end-line="35" selection-end-column="88" />
-          <folding>
-            <element signature="e#633#665#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#28#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2091">
-          <caret line="123" column="39" lean-forward="true" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
--- a/apps/pycache/custom.cpython-36.pyc
+++ b/apps/pycache/custom.cpython-36.pyc
--- a/apps/cmdb/init.py
+++ b/apps/cmdb/init.py
--- a/apps/cmdb/admin.py
+++ b/apps/cmdb/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
--- a/apps/cmdb/apps.py
+++ b/apps/cmdb/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CmdbConfig(AppConfig):
+    name = 'cmdb'
--- a/apps/cmdb/forms.py
+++ b/apps/cmdb/forms.py
@@ -0,0 +1,46 @@
+# @Time   : 2018/12/19 16:13
+# @Author : RobbieHan
+# @File   : forms.py
+
+from django import forms
+
+from .models import Code
+
+
+class CodeCreateForm(forms.ModelForm):
+    class Meta:
+        model = Code
+        fields = '__all__'
+
+        error_messages = {
+            'key': {'required': 'key不能为空'},
+            'value': {'required': 'value不能为空'}
+        }
+
+    def clean(self):
+        cleaned_data = super(CodeCreateForm, self).clean()
+        key = cleaned_data.get('key')
+        value = cleaned_data.get('value')
+
+        if Code.objects.filter(key=key).count():
+            raise forms.ValidationError('key：{}已存在'.format(key))
+
+        if Code.objects.filter(value=value).count():
+            raise forms.ValidationError('value: {}已存在'.format(value))
+
+
+class CodeUpdateForm(CodeCreateForm):
+
+    def clean(self):
+        cleaned_data = self.cleaned_data
+        key = cleaned_data.get('key')
+        value = cleaned_data.get('value')
+
+        if self.instance:
+            matching_code = Code.objects.exclude(pk=self.instance.pk)
+            if matching_code.filter(key=key).exists():
+                msg = 'key：{} 已经存在'.format(key)
+                raise forms.ValidationError(msg)
+            if matching_code.filter(value=value).exists():
+                msg = 'value：{} 已经存在'.format(value)
+                raise forms.ValidationError(msg)
--- a/apps/cmdb/migrations/init.py
+++ b/apps/cmdb/migrations/init.py
--- a/apps/cmdb/models.py
+++ b/apps/cmdb/models.py
@@ -0,0 +1,118 @@
+import os
+from datetime import datetime
+
+from django.db import models
+from django.contrib.auth import get_user_model
+from django.dispatch import receiver
+
+User = get_user_model()
+
+
+class AbstractMode(models.Model):
+    parent = models.ForeignKey(
+        'self', blank=True, null=True, on_delete=models.SET_NULL, related_name='child'
+    )
+
+    class Meta:
+        abstract = True
+
+
+class Code(AbstractMode):
+    key = models.CharField(max_length=80, verbose_name='键')
+    value = models.CharField(max_length=80, verbose_name='值')
+    desc = models.BooleanField(default=True, verbose_name='备注')
+
+    class Meta:
+        verbose_name = '字典'
+        verbose_name_plural = verbose_name
+
+
+class TimeAbstract(models.Model):
+    add_time = models.DateTimeField(auto_now_add=True, verbose_name="添加时间")
+    modify_time = models.DateTimeField(auto_now=True, verbose_name="更新时间")
+
+    class Meta:
+        abstract = True
+
+
+class ConnectionAbstract(models.Model):
+    auth_method_choices = (
+        ('private_key', '密钥认证'),
+        ('password', '密码认证')
+    )
+    hostname = models.CharField(max_length=50, verbose_name='设备地址(IP或域名)')
+    port = models.IntegerField(default=22, verbose_name='SSH端口')
+    username = models.CharField(max_length=15, blank=True, default='', verbose_name='SSH用户名')
+    password = models.CharField(max_length=80, blank=True, default='', verbose_name='SSH密码')
+    private_key = models.CharField(max_length=100, blank=True, default='', verbose_name='密钥路径')
+    auth_type = models.CharField(max_length=30, choices=auth_method_choices, default='')
+    status = models.CharField(max_length=10, blank=True, default='')
+
+    class Meta:
+        abstract = True
+
+
+class DeviceAbstract(models.Model):
+    sys_hostname = models.CharField(max_length=50, blank=True, default='', verbose_name='主机名')
+    mac_address = models.CharField(max_length=50, blank=True, default='', verbose_name='MAC地址')
+    sn_number = models.CharField(max_length=50, blank=True, default='', verbose_name='SN号码')
+    os_type = models.CharField(max_length=50, blank=True, default='', verbose_name='系统类型')
+    device_type = models.CharField(max_length=50, blank=True, default='', verbose_name='设备类型')
+
+    class Meta:
+        abstract = True
+
+
+class DeviceScanInfo(ConnectionAbstract, DeviceAbstract, TimeAbstract):
+    error_message = models.CharField(max_length=80, blank=True, default='', verbose_name='错误信息')
+
+    class Meta:
+        verbose_name = '扫描信息'
+        verbose_name_plural = verbose_name
+
+
+class ConnectionInfo(ConnectionAbstract, TimeAbstract):
+
+    class Meta:
+        verbose_name = 'SSH连接信息'
+        verbose_name_plural = verbose_name
+
+
+class Cabinet(models.Model):
+    number = models.CharField(max_length=50, verbose_name='机柜编号')
+    position = models.CharField(max_length=80, verbose_name='机柜位置')
+    desc = models.TextField(blank=True, default='', verbose_name='备注信息')
+
+    class Meta:
+        verbose_name = '机柜信息'
+        verbose_name_plural = verbose_name
+
+
+class DeviceInfo(AbstractMode, DeviceAbstract, TimeAbstract):
+    hostname = models.CharField(max_length=50, verbose_name='设备地址(IP或域名)')
+    network_type = models.IntegerField(blank=True, null=True, verbose_name='网络类型')
+    service_type = models.IntegerField(blank=True, null=True, verbose_name='服务类型')
+    operation_type = models.IntegerField(blank=True, null=True, verbose_name='业务类型')
+    leader = models.IntegerField(blank=True, null=True, verbose_name='责任人')
+    dev_cabinet = models.IntegerField(blank=True, null=True, verbose_name='机柜信息')
+    dev_connection = models.IntegerField(blank=True, null=True, verbose_name='连接信息')
+    buyDate = models.DateField(default=datetime.now, verbose_name="购买日期")
+    warrantyDate = models.DateField(default=datetime.now, verbose_name="到保日期")
+    desc = models.TextField(blank=True, default='', verbose_name='备注信息')
+
+    class Meta:
+        verbose_name = '设备信息'
+        verbose_name_plural = verbose_name
+
+
+class DeviceFile(TimeAbstract):
+    device = models.ForeignKey('DeviceInfo', blank=True, null=True, on_delete=models.SET_NULL, verbose_name='设备')
+    file_content = models.FileField(upload_to="asset_file/%Y/%m", null=True, blank=True, verbose_name="资产文件")
+    upload_user = models.CharField(max_length=20, verbose_name="上传人")
+
+
+@receiver(models.signals.post_delete, sender=DeviceFile)
+def auto_delete_file(sender, instance, **kwargs):
+    if instance.file_content:
+        if os.path.isfile(instance.file_content.path):
+            os.remove(instance.file_content.path)
--- a/apps/cmdb/tests.py
+++ b/apps/cmdb/tests.py
@@ -0,0 +1,22 @@
+from django.test import TestCase
+
+# Create your tests here.
+from django.views.generic.base import View
+from django.shortcuts import HttpResponse
+import logging
+from .models import Code
+
+info_logger = logging.getLogger('sandbox_info')
+error_logger = logging.getLogger('sandbox_error')
+
+
+class TestLoggingView(View):
+
+    def get(self, request):
+        print('a')
+        info_logger.info('The system print a letter "a" ')
+        try:
+            Code.objects.get(id=100)
+        except Exception as e:
+            error_logger.error(e)
+        return HttpResponse("OK!")
--- a/apps/cmdb/urls.py
+++ b/apps/cmdb/urls.py
@@ -0,0 +1,17 @@
+from django.urls import path
+
+from .views import CmdbView
+from . import views_code, views_scan
+
+app_name = 'cmdb'
+
+urlpatterns = [
+    path('', CmdbView.as_view(), name='index'),
+    path('portal/code/', views_code.CodeView.as_view(), name='portal-code'),
+    path('portal/code/create/', views_code.CodeCreateView.as_view(), name='portal-code-create'),
+    path('portal/code/list/', views_code.CodeListView.as_view(), name='portal-code-list'),
+    path('portal/code/update/', views_code.CodeUpdateView.as_view(), name='portal-code-update'),
+    path('portal/code/delete/', views_code.CodeDeleteView.as_view(), name='portal-code-delete'),
+
+    path('portal/scan_config/', views_scan.ScanConfigView.as_view(), name='portal-scan_config'),
+]
--- a/apps/cmdb/views.py
+++ b/apps/cmdb/views.py
@@ -0,0 +1,9 @@
+from django.views.generic import TemplateView
+
+from system.mixin import LoginRequiredMixin
+from custom import BreadcrumbMixin
+
+
+class CmdbView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
+
+    template_name = 'cmdb/cmdb_index.html'
--- a/apps/cmdb/views_code.py
+++ b/apps/cmdb/views_code.py
@@ -0,0 +1,53 @@
+# @Time   : 2018/12/19 13:31
+# @Author : RobbieHan
+# @File   : views_code.py.py
+
+from django.views.generic import TemplateView
+
+from system.mixin import LoginRequiredMixin
+from custom import (BreadcrumbMixin, SandboxCreateView,
+                    SandboxListView, SandboxUpdateView, SandboxDeleteView)
+from .models import Code
+from .forms import CodeCreateForm, CodeUpdateForm
+
+
+class CodeView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
+    template_name = 'cmdb/code.html'
+
+    def get_context_data(self):
+        self.kwargs['code_parent'] = Code.objects.filter(parent=None)
+        return super().get_context_data(**self.kwargs)
+
+
+class CodeCreateView(SandboxCreateView):
+    model = Code
+    form_class = CodeCreateForm
+    template_name_suffix = '_create'
+
+    def get_context_data(self, **kwargs):
+        kwargs['code_parent'] = Code.objects.filter(parent=None)
+        return super().get_context_data(**kwargs)
+
+
+class CodeListView(SandboxListView):
+    model = Code
+    fields = ['id', 'key', 'value', 'parent__value']
+
+    def get(self, request):
+        if 'parent' in request.GET and request.GET['parent']:
+            self.filters = dict(parent__key=request.GET['parent'])
+        return super().get(request)
+
+
+class CodeUpdateView(SandboxUpdateView):
+    model = Code
+    form_class = CodeUpdateForm
+    template_name_suffix = '_update'
+
+    def get_context_data(self, **kwargs):
+        kwargs['code_parent'] = Code.objects.filter(parent=None)
+        return super().get_context_data(**kwargs)
+
+
+class CodeDeleteView(SandboxDeleteView):
+    model = Code
--- a/apps/cmdb/views_scan.py
+++ b/apps/cmdb/views_scan.py
@@ -0,0 +1,54 @@
+# @Time   : 2018/12/29 19:25
+# @Author : RobbieHan
+# @File   : views_scan.py
+
+import ast
+import logging
+from ruamel import yaml
+
+from django.views.generic import View
+from django.http import JsonResponse
+from django.shortcuts import render
+
+
+from system.mixin import LoginRequiredMixin
+from custom import BreadcrumbMixin
+from utils.sandbox_utils import ConfigFileMixin
+from system.models import Menu
+
+error_logger = logging.getLogger('sandbox_error')
+
+
+class ScanConfigView(LoginRequiredMixin, BreadcrumbMixin, ConfigFileMixin, View):
+
+    def get(self, request):
+        menu = Menu.get_menu_by_request_url(request.path_info)
+        template_name = 'cmdb/scan_config.html'
+        context = self.get_conf_content()
+        context.update(menu)
+        return render(request, template_name, context)
+
+    def post(self, request):
+        ret = dict(result=False)
+        config = dict()
+        hosts = request.POST
+        try:
+            config['net_address'] = ast.literal_eval(hosts['net_address'])
+            config['ssh_username'] = hosts['ssh_username']
+            config['ssh_port'] = hosts['ssh_port']
+            config['ssh_password'] = hosts['ssh_password']
+            config['ssh_private_key'] = hosts['ssh_private_key']
+            config['commands'] = ast.literal_eval(hosts['commands'])
+            config['auth_type'] = hosts['auth_type']
+            config['scan_type'] = hosts['scan_type']
+            config['email'] = hosts['email']
+            config['send_email'] = hosts['send_email']
+            data = dict(hosts=config)
+            config_file = self.get_config_file()
+            with open(config_file, 'w', encoding='utf-8') as f:
+                yaml.dump(data, f, Dumper=yaml.RoundTripDumper, indent=4)
+                ret['result'] = True
+        except Exception as e:
+            error_logger.error(e)
+
+        return JsonResponse(ret)
--- a/apps/custom.py
+++ b/apps/custom.py
@@ -0,0 +1,162 @@
+# @Time   : 2018/11/9 22:06
+# @Author : RobbieHan
+# @File   : custom.py
+
+import json
+import re
+
+from django.views.generic import CreateView, UpdateView, View
+from django.shortcuts import HttpResponse
+from django.http import Http404, JsonResponse
+from django.db.models.query import QuerySet
+from django.core.exceptions import ImproperlyConfigured
+
+from system.mixin import LoginRequiredMixin
+from system.models import Menu
+
+
+class BreadcrumbMixin:
+
+    def get_context_data(self, **kwargs):
+        menu = Menu.get_menu_by_request_url(url=self.request.path_info)
+        if menu is not None:
+            kwargs.update(menu)
+        return super().get_context_data(**kwargs)
+
+
+class SandboxGetObjectMixin:
+
+    def get_object(self, queryset=None):
+
+        if queryset is None:
+            queryset = self.get_queryset()
+        if 'id' in self.request.GET and self.request.GET['id']:
+            queryset = queryset.filter(id=int(self.request.GET['id']))
+        elif 'id' in self.request.POST and self.request.POST['id']:
+            queryset = queryset.filter(id=int(self.request.POST['id']))
+        else:
+            raise AttributeError("Generic detail view %s must be called with id. "
+                                 % self.__class__.__name__)
+        try:
+            obj = queryset.get()
+        except queryset.model.DoesNotExist:
+            raise Http404("No %(verbose_name)s found matching the query" %
+                          {'verbose_name': queryset.model._meta.verbose_name})
+        return obj
+
+
+class SandboxMultipleObjectMixin:
+
+    filters = {}
+    fields = []
+    queryset = None
+    model = None
+
+    def get_queryset(self):
+        if self.queryset is not None:
+            queryset = self.queryset
+            if isinstance(queryset, QuerySet):
+                queryset = queryset.all()
+        elif self.model is not None:
+            queryset = self.model._default_manager.all()
+        else:
+            raise ImproperlyConfigured(
+                "%(cls)s is missing a QuerySet. Define "
+                "%(cls)s.model, %(cls)s.queryset."
+                % {'cls': self.__class__.__name__}
+            )
+        return queryset
+
+    def get_datatables_paginator(self, request):
+        datatables = request.GET
+        draw = int(datatables.get('draw'))
+        start = int(datatables.get('start'))
+        length = int(datatables.get('length'))
+        order_column = datatables.get('order[0][column]')
+        order_dir = datatables.get('order[0][dir]')
+        order_field = datatables.get('columns[{}][data]'.format(order_column))
+        queryset = self.get_queryset()
+        if order_dir == 'asc':
+            queryset = queryset.order_by(order_field)
+        else:
+            queryset = queryset.order_by('-{0}'.format(order_field))
+        record_total_count = queryset.count()
+        filters = self.get_filters()
+        fields = self.get_fields()
+        if filters:
+            queryset = queryset.filter(**self.filters)
+        if fields:
+            queryset = queryset.values(*self.fields)
+
+        record_filter_count = queryset.count()
+
+        object_list = queryset[start:(start + length)]
+
+        data = list(object_list)
+
+        return {
+            'draw': draw,
+            'recordsTotal': record_total_count,
+            'recordsFiltered': record_filter_count,
+            'data': data,
+        }
+
+    def get_filters(self):
+        return self.filters
+
+    def get_fields(self):
+        return self.fields
+
+
+class SandboxEditViewMixin:
+
+    def post(self, request, *args, **kwargs):
+        res = dict(result=False)
+        form = self.get_form()
+        if form.is_valid():
+            form.save()
+            res['result'] = True
+        else:
+            pattern = '<li>.*?<ul class=.*?><li>(.*?)</li>'
+            form_errors = str(form.errors)
+            errors = re.findall(pattern, form_errors)
+            res['error'] = errors[0]
+        return HttpResponse(json.dumps(res), content_type='application/json')
+
+
+class SandboxCreateView(LoginRequiredMixin, SandboxEditViewMixin, CreateView):
+    """"
+    View for create an object, with a response rendered by a template.
+    Returns information with Json when the data is created successfully or fails.
+    """
+
+
+class SandboxUpdateView(LoginRequiredMixin, SandboxEditViewMixin, SandboxGetObjectMixin, UpdateView):
+    """View for updating an object, with a response rendered by a template."""
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        return super().post(request, *args, **kwargs)
+
+
+class SandboxListView(LoginRequiredMixin, SandboxMultipleObjectMixin, View):
+    """
+    JsonResponse some json of objects, set by `self.model` or `self.queryset`.
+    """
+    def get(self, request):
+        context = self.get_datatables_paginator(request)
+        return JsonResponse(context)
+
+
+class SandboxDeleteView(LoginRequiredMixin, SandboxMultipleObjectMixin, View):
+
+    def post(self, request):
+        context = dict(result=False)
+        queryset = self.get_queryset()
+        if 'id' in request.POST and request.POST['id']:
+            id_list = map(int, request.POST['id'].split(','))
+            queryset.filter(id__in=id_list).delete()
+            context['result'] = True
+        else:
+            raise AttributeError("Sandbox delete view %s must be called with id. "
+                                 % self.__class__.__name__)
+        return JsonResponse(context)
--- a/apps/system/pycache/forms.cpython-36.pyc
+++ b/apps/system/pycache/forms.cpython-36.pyc
--- a/apps/system/pycache/middleware.cpython-36.pyc
+++ b/apps/system/pycache/middleware.cpython-36.pyc
--- a/apps/system/pycache/models.cpython-36.pyc
+++ b/apps/system/pycache/models.cpython-36.pyc
--- a/apps/system/pycache/urls.cpython-36.pyc
+++ b/apps/system/pycache/urls.cpython-36.pyc
--- a/apps/system/pycache/views.cpython-36.pyc
+++ b/apps/system/pycache/views.cpython-36.pyc
--- a/apps/system/pycache/views_menu.cpython-36.pyc
+++ b/apps/system/pycache/views_menu.cpython-36.pyc
--- a/apps/system/pycache/views_role.cpython-36.pyc
+++ b/apps/system/pycache/views_role.cpython-36.pyc
--- a/apps/system/pycache/views_structure.cpython-36.pyc
+++ b/apps/system/pycache/views_structure.cpython-36.pyc
--- a/apps/system/pycache/views_user.cpython-36.pyc
+++ b/apps/system/pycache/views_user.cpython-36.pyc
--- a/apps/system/forms.py
+++ b/apps/system/forms.py
@@ -2,8 +2,13 @@
 # @Author : RobbieHan
 # @File   : forms.py

+import re
 from django import forms
-from .models import Structure
+from django.contrib.auth import get_user_model
+
+from .models import Structure, Menu
+
+User = get_user_model()


 class LoginForm(forms.Form):
@@ -15,3 +20,108 @@ class StructureForm(forms.ModelForm):
    class Meta:
        model = Structure
        fields = ['type', 'name', 'parent']
+
+
+class UserCreateForm(forms.ModelForm):
+    password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": "密码不能为空",
+            "min_length": "密码长度最少6位数",
+        }
+    )
+
+    confirm_password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": "确认密码不能为空",
+            "min_length": "密码长度最少6位数",
+        }
+    )
+
+    class Meta:
+        model = User
+        fields = [
+            'name', 'gender', 'birthday', 'username', 'mobile', 'email',
+            'department', 'post', 'superior', 'is_active', 'roles', 'password'
+        ]
+
+        error_messages = {
+            "name": {"required": "姓名不能为空"},
+            "username": {"required": "用户名不能为空"},
+            "email": {"required": "邮箱不能为空"},
+            "mobile": {
+                "required": "手机号码不能为空",
+                "max_length": "输入有效的手机号码",
+                "min_length": "输入有效的手机号码"
+            }
+         }
+
+    def clean(self):
+        cleaned_data = super(UserCreateForm, self).clean()
+        username = cleaned_data.get("username")
+        mobile = cleaned_data.get("mobile", "")
+        email = cleaned_data.get("email")
+        password = cleaned_data.get("password")
+        confirm_password = cleaned_data.get("confirm_password")
+
+        if User.objects.filter(username=username).count():
+            raise forms.ValidationError('用户名：{}已存在'.format(username))
+
+        if password != confirm_password:
+            raise forms.ValidationError("两次密码输入不一致")
+
+        if User.objects.filter(mobile=mobile).count():
+            raise forms.ValidationError('手机号码：{}已存在'.format(mobile))
+
+        REGEX_MOBILE = "^1[3578]\d{9}$|^147\d{8}$|^176\d{8}$"
+        if not re.match(REGEX_MOBILE, mobile):
+            raise forms.ValidationError("手机号码非法")
+
+        if User.objects.filter(email=email).count():
+            raise forms.ValidationError('邮箱：{}已存在'.format(email))
+
+
+class UserUpdateForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = [
+            'name', 'gender', 'birthday', 'username', 'mobile', 'email',
+            'department', 'post', 'superior', 'is_active', 'roles'
+        ]
+
+
+class PasswordChangeForm(forms.Form):
+
+    password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": u"密码不能为空"
+        })
+
+    confirm_password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": u"确认密码不能为空"
+        })
+
+    def clean(self):
+        cleaned_data = super(PasswordChangeForm, self).clean()
+        password = cleaned_data.get("password")
+        confirm_password = cleaned_data.get("confirm_password")
+        if password != confirm_password:
+            raise forms.ValidationError("两次密码输入不一致")
+
+
+class MenuForm(forms.ModelForm):
+    class Meta:
+        model = Menu
+        fields = '__all__'
--- a/apps/system/middleware.py
+++ b/apps/system/middleware.py
@@ -0,0 +1,100 @@
+import re
+
+from django.utils.deprecation import MiddlewareMixin
+from django.conf import settings
+from django.shortcuts import render
+
+
+class MenuCollection(MiddlewareMixin):
+
+    def get_user(self, request):
+        return request.user
+
+    def get_menu_from_role(self, request, user=None):
+        if user is None:
+            user = self.get_user(request)
+        try:
+            menus = user.roles.values(
+                'permissions__id',
+                'permissions__name',
+                'permissions__url',
+                'permissions__icon',
+                'permissions__code',
+                'permissions__parent'
+            ).distinct()
+            return [menu for menu in menus if menu['permissions__id'] is not None]
+        except AttributeError:
+            return None
+
+    def get_permission_url(self, request):
+        role_menus = self.get_menu_from_role(request)
+        if role_menus is not None:
+            permission_url_list = [menu['permissions__url'] for menu in role_menus]
+            return permission_url_list
+
+    def get_permission_menu(self, request):
+        permission_menu_list = []
+        role_menus = self.get_menu_from_role(request)
+        if role_menus is not None:
+            for item in role_menus:
+                menu = {
+                    'id': item['permissions__id'],
+                    'name': item['permissions__name'],
+                    'url': item['permissions__url'],
+                    'icon': item['permissions__icon'],
+                    'code': item['permissions__code'],
+                    'parent': item['permissions__parent'],
+                    'status': False,
+                    'sub_menu': [],
+                }
+                permission_menu_list.append(menu)
+            return permission_menu_list
+
+    def get_top_reveal_menu(self, request):
+        top_menu = []
+        permission_menu_dict = {}
+        request_url = request.path_info
+        permission_menu_list = self.get_permission_menu(request)
+        if permission_menu_list is not None:
+            for menu in permission_menu_list:
+
+                url = menu['url']
+                if url and re.match(url, request_url):
+                    menu['status'] = True
+                if menu['parent'] is None:
+                    top_menu.insert(0, menu)
+                permission_menu_dict[menu['id']] = menu
+
+            menu_data = []
+            for i in permission_menu_dict:
+                if permission_menu_dict[i]['parent']:
+                    pid = permission_menu_dict[i]['parent']
+                    parent_menu = permission_menu_dict[pid]
+                    parent_menu['sub_menu'].append(permission_menu_dict[i])
+                else:
+                    menu_data.append(permission_menu_dict[i])
+            if [menu['sub_menu'] for menu in menu_data if menu['url'] in request_url]:
+                reveal_menu = [menu['sub_menu'] for menu in menu_data if menu['url'] in request_url][0]
+            else:
+                reveal_menu = None
+            return top_menu, reveal_menu
+
+    def process_request(self, request):
+        if self.get_top_reveal_menu(request):
+            request.top_menu, request.reveal_menu = self.get_top_reveal_menu(request)
+            request.permission_url_list = self.get_permission_url(request)
+
+
+class RbacMiddleware(MiddlewareMixin):
+
+    def process_request(self, request):
+        if hasattr(request, 'permission_url_list'):
+            request_url = request.path_info
+            permission_url = request.permission_url_list
+            for url in settings.SAFE_URL:
+                if re.match(url, request_url):
+                    return None
+            if request_url in permission_url:
+                return None
+            else:
+                return render(request, 'page404.html')
--- a/apps/system/migrations/0002_auto_20181115_2124.py
+++ b/apps/system/migrations/0002_auto_20181115_2124.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.1.2 on 2018-11-15 21:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='menu',
+            options={'ordering': ['number'], 'verbose_name': '菜单', 'verbose_name_plural': '菜单'},
+        ),
+        migrations.AddField(
+            model_name='menu',
+            name='number',
+            field=models.FloatField(blank=True, null=True, verbose_name='编号'),
+        ),
+    ]
--- a/apps/system/migrations/pycache/0002_auto_20181115_2124.cpython-36.pyc
+++ b/apps/system/migrations/pycache/0002_auto_20181115_2124.cpython-36.pyc
--- a/apps/system/models.py
+++ b/apps/system/models.py
@@ -11,6 +11,7 @@ class Menu(models.Model):
    icon = models.CharField(max_length=50, null=True, blank=True, verbose_name="图标")
    code = models.CharField(max_length=50, null=True, blank=True, verbose_name="编码")
    url = models.CharField(max_length=128, unique=True, null=True, blank=True)
+    number = models.FloatField(null=True, blank=True, verbose_name="编号")

    def __str__(self):
        return self.name
@@ -18,10 +19,14 @@ class Menu(models.Model):
    class Meta:
        verbose_name = '菜单'
        verbose_name_plural = verbose_name
+        ordering = ['number']

    @classmethod
    def get_menu_by_request_url(cls, url):
-        return dict(menu=Menu.objects.get(url=url))
+        try:
+            return dict(menu=Menu.objects.get(url=url))
+        except:
+            None


 class Role(models.Model):
--- a/apps/system/tests.py
+++ b/apps/system/tests.py
@@ -1,3 +1,4 @@
 from django.test import TestCase

 # Create your tests here.
+
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path

 from .views import SystemView
-from . import views_structure
+from . import views_structure, views_user, views_menu, views_role

 app_name = 'system'

@@ -10,5 +10,29 @@ urlpatterns = [
    path('basic/structure/', views_structure.StructureView.as_view(), name='basic-structure'),
    path('basic/structure/create/', views_structure.StructureCreateView.as_view(), name='basic-structure-create'),
    path('basic/structure/list/', views_structure.StructureListView.as_view(), name='basic-structure-list'),
-]
+    path('basic/structure/delete/', views_structure.StructureDeleteView.as_view(), name='basic-structure-delete'),
+    path('basic/structure/add_user/', views_structure.Structure2UserView.as_view(), name='basic-structure-add_user'),

+    path('basic/user/', views_user.UserView.as_view(), name='basic-user'),
+    path('basic/user/list/', views_user.UserListView.as_view(), name='basic-user-list'),
+    path('basic/user/create/', views_user.UserCreateView.as_view(), name='basic-user-create'),
+    path('basic/user/detail/', views_user.UserDetailView.as_view(), name='basic-user-detail'),
+    path('basic/user/update/', views_user.UserUpdateView.as_view(), name='basic-user-update'),
+    path('basic/user/password_change/', views_user.PasswordChangeView.as_view(), name='basic-user-password_change'),
+    path('basic/user/delete/', views_user.UserDeleteView.as_view(), name='basic-user-delete'),
+    path('basic/user/enable/', views_user.UserEnableView.as_view(), name='basic-user-enable'),
+    path('basic/user/disable/', views_user.UserDisableView.as_view(), name='basic-user-disable'),
+
+    path('rbac/menu/', views_menu.MenuListView.as_view(), name='rbac-menu'),
+    path('rbac/menu/create/', views_menu.MenuCreateView.as_view(), name='rbac-menu-create'),
+    path('rbac/menu/update/', views_menu.MenuUpdateView.as_view(), name='rbac-menu-update'),
+
+    path('rbac/role/', views_role.RoleView.as_view(), name='rbac-role'),
+    path('rbac/role/create/', views_role.RoleCreateView.as_view(), name='rbac-role-create'),
+    path('rbac/role/list/', views_role.RoleListView.as_view(), name='rbac-role-list'),
+    path('rbac/role/update/', views_role.RoleUpdateView.as_view(), name='rbac-role-update'),
+    path('rbac/role/delete/', views_role.RoleDeleteView.as_view(), name='rbac-role-delete'),
+    path('rbac/role/role2user/', views_role.Role2UserView.as_view(), name="rbac-role-role2user"),
+    path('rbac/role/role2menu/', views_role.Role2MenuView.as_view(), name="rbac-role-role2menu"),
+    path('rbac/role/role2menu_list/', views_role.Role2MenuListView.as_view(), name="rbac-role-role2menu_list"),
+]
--- a/apps/system/views.py
+++ b/apps/system/views.py
@@ -1,11 +1,10 @@
-from django.shortcuts import render
-from django.views.generic.base import View
+from django.views.generic import TemplateView

 from .mixin import LoginRequiredMixin
+from custom import BreadcrumbMixin


-class SystemView(LoginRequiredMixin, View):
+class SystemView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):

-    def get(self, request):
-        return render(request, 'system/system_index.html')
+    template_name = 'system/system_index.html'

--- a/apps/system/views_menu.py
+++ b/apps/system/views_menu.py
@@ -0,0 +1,29 @@
+from django.views.generic import ListView
+
+from .mixin import LoginRequiredMixin
+from apps.custom import SandboxCreateView, SandboxUpdateView, BreadcrumbMixin
+from .models import Menu
+
+
+class MenuCreateView(SandboxCreateView):
+    model = Menu
+    fields = '__all__'
+
+    def get_context_data(self, **kwargs):
+        kwargs['menu_all'] = Menu.objects.all()
+        return super().get_context_data(**kwargs)
+
+
+class MenuListView(LoginRequiredMixin, BreadcrumbMixin, ListView):
+    model = Menu
+    context_object_name = 'menu_all'
+
+
+class MenuUpdateView(SandboxUpdateView):
+    model = Menu
+    fields = '__all__'
+    template_name_suffix = '_update'
+
+    def get_context_data(self, **kwargs):
+        kwargs['menu_all'] = Menu.objects.all()
+        return super().get_context_data(**kwargs)
--- a/apps/system/views_role.py
+++ b/apps/system/views_role.py
@@ -0,0 +1,118 @@
+# @Time   : 2018/11/13 23:25
+# @Author : RobbieHan
+# @File   : views_role.py
+
+import json
+
+from django.views.generic.base import View
+from django.shortcuts import HttpResponse, get_object_or_404
+from django.views.generic import TemplateView
+from django.contrib.auth import get_user_model
+from django.shortcuts import render
+
+from .mixin import LoginRequiredMixin
+from .models import Role, Menu
+from custom import SandboxCreateView, SandboxUpdateView, BreadcrumbMixin
+
+User = get_user_model()
+
+
+class RoleView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
+    template_name = 'system/role.html'
+
+
+class RoleCreateView(SandboxCreateView):
+    model = Role
+    fields = '__all__'
+
+
+class RoleListView(LoginRequiredMixin, View):
+
+    def get(self, reqeust):
+        fields = ['id', 'name', 'desc']
+        ret = dict(data=list(Role.objects.values(*fields)))
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class RoleUpdateView(SandboxUpdateView):
+    model = Role
+    fields = '__all__'
+    template_name_suffix = '_update'
+
+
+class RoleDeleteView(LoginRequiredMixin, View):
+
+    def post(self, request):
+        ret = dict(result=False)
+        if 'id' in request.POST and request.POST['id']:
+            id_list = map(int, request.POST['id'].split(','))
+            Role.objects.filter(id__in=id_list).delete()
+            ret['result'] = True
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class Role2UserView(LoginRequiredMixin, View):
+    """
+    角色关联用户
+    """
+
+    def get(self, request):
+        if 'id' in request.GET and request.GET['id']:
+            role = get_object_or_404(Role, pk=int(request.GET.get('id')))
+            added_users = role.userprofile_set.all()
+            all_users = User.objects.all()
+            un_add_users = set(all_users).difference(added_users)
+            ret = dict(role=role, added_users=added_users, un_add_users=list(un_add_users))
+        return render(request, 'system/role_role2user.html', ret)
+
+    def post(self, request):
+        res = dict(result=False)
+        id_list = None
+        role = get_object_or_404(Role, pk=int(request.POST.get('id')))
+        if 'to' in request.POST and request.POST['to']:
+            id_list = map(int, request.POST.getlist('to', []))
+        role.userprofile_set.clear()
+        if id_list:
+            for user in User.objects.filter(id__in=id_list):
+                role.userprofile_set.add(user)
+        res['result'] = True
+        return HttpResponse(json.dumps(res), content_type='application/json')
+
+
+class Role2MenuView(LoginRequiredMixin, View):
+    """
+    角色绑定菜单
+    """
+    def get(self, request):
+        if 'id' in request.GET and request.GET['id']:
+            role = get_object_or_404(Role, pk=request.GET['id'])
+            ret = dict(role=role)
+            return render(request, 'system/role_role2menu.html', ret)
+
+    def post(self, request):
+        res = dict(result=False)
+        role = get_object_or_404(Role, pk=request.POST['id'])
+        tree = json.loads(self.request.POST['tree'])
+        role.permissions.clear()
+        for menu in tree:
+            if menu['checked'] is True:
+                menu_checked = get_object_or_404(Menu, pk=menu['id'])
+                role.permissions.add(menu_checked)
+        res['result'] = True
+        return HttpResponse(json.dumps(res), content_type='application/json')
+
+
+class Role2MenuListView(LoginRequiredMixin, View):
+    """
+    获取zTree菜单列表
+    """
+    def get(self, request):
+        fields = ['id', 'name', 'parent']
+        if 'id' in request.GET and request.GET['id']:
+            role = Role.objects.get(id=request.GET.get('id'))
+            role_menus = role.permissions.values(*fields)
+            ret = dict(data=list(role_menus))
+        else:
+            menus = Menu.objects.all()
+            ret = dict(data=list(menus.values(*fields)))
+        return HttpResponse(json.dumps(ret), content_type='application/json')
--- a/apps/system/views_structure.py
+++ b/apps/system/views_structure.py
@@ -8,13 +8,18 @@ from django.views.generic.base import TemplateView
 from django.views.generic.base import View
 from django.shortcuts import render
 from django.shortcuts import HttpResponse
+from django.shortcuts import get_object_or_404
+from django.contrib.auth import get_user_model

 from .mixin import LoginRequiredMixin
 from .models import Structure
 from .forms import StructureForm
+from apps.custom import BreadcrumbMixin
+
+User = get_user_model()


-class StructureView(LoginRequiredMixin, TemplateView):
+class StructureView(LoginRequiredMixin,  BreadcrumbMixin, TemplateView):

    template_name = 'system/structure/structure.html'

@@ -23,11 +28,17 @@ class StructureCreateView(LoginRequiredMixin, View):

    def get(self, request):
        ret = dict(structure_all=Structure.objects.all())
+        if 'id' in request.GET and request.GET['id']:
+            structure = get_object_or_404(Structure, pk=request.GET['id'])
+            ret['structure'] = structure
        return render(request, 'system/structure/structure_create.html', ret)

    def post(self, request):
        res = dict(result=False)
-        structure = Structure()
+        if 'id' in request.POST and request.POST['id']:
+            structure = get_object_or_404(Structure, pk=request.POST['id'])
+        else:
+            structure = Structure()
        structure_form = StructureForm(request.POST, instance=structure)
        if structure_form.is_valid():
            structure_form.save()
@@ -40,4 +51,40 @@ class StructureListView(LoginRequiredMixin, View):
    def get(self, request):
        fields = ['id', 'name', 'type', 'parent__name']
        ret = dict(data=list(Structure.objects.values(*fields)))
-        return HttpResponse(json.dumps(ret), content_type='application/json')
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class StructureDeleteView(LoginRequiredMixin, View):
+
+    def post(self, request):
+        ret = dict(result=False)
+        if 'id' in request.POST and request.POST['id']:
+            id_list = map(int, request.POST['id'].split(','))
+            Structure.objects.filter(id__in=id_list).delete()
+            ret['result'] = True
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class Structure2UserView(LoginRequiredMixin, View):
+
+    def get(self, request):
+        if 'id' in request.GET and request.GET['id']:
+            structure = get_object_or_404(Structure, pk=int(request.GET['id']))
+            added_users = structure.userprofile_set.all()
+            all_users = User.objects.all()
+            un_add_users = set(all_users).difference(added_users)
+            ret = dict(structure=structure, added_users=added_users, un_add_users=list(un_add_users))
+        return render(request, 'system/structure/structure_user.html', ret)
+
+    def post(self, request):
+        res = dict(result=False)
+        id_list = None
+        structure = get_object_or_404(Structure, pk=int(request.POST['id']))
+        if 'to' in request.POST and request.POST.getlist('to', []):
+            id_list = map(int, request.POST.getlist('to', []))
+        structure.userprofile_set.clear()
+        if id_list:
+            for user in User.objects.filter(id__in=id_list):
+                structure.userprofile_set.add(user)
+        res['result'] = True
+        return HttpResponse(json.dumps(res), content_type='application/json')
--- a/apps/system/views_user.py
+++ b/apps/system/views_user.py
@@ -2,14 +2,24 @@
 # @Author : RobbieHan
 # @File   : views_user.py

-from django.shortcuts import render
-from django.views.generic.base import View
-from django.http import HttpResponseRedirect
-from django.contrib.auth import authenticate, login, logout
-from django.urls import reverse
+import re
+import json

-from .forms import LoginForm
+from django.shortcuts import render, HttpResponse
+from django.views.generic.base import View, TemplateView
+from django.http import HttpResponseRedirect
+from django.contrib.auth import authenticate, login, logout, get_user_model
+from django.urls import reverse
+from django.contrib.auth.hashers import make_password
+from django.shortcuts import get_object_or_404
+from django.db.models import Q
+
+from .forms import LoginForm, UserCreateForm, UserUpdateForm, PasswordChangeForm
 from .mixin import LoginRequiredMixin
+from .models import Structure, Role
+from apps.custom import BreadcrumbMixin
+
+User = get_user_model()


 class IndexView(LoginRequiredMixin, View):
@@ -51,4 +61,159 @@ class LogoutView(View):

    def get(self, request):
        logout(request)
-        return HttpResponseRedirect(reverse('login'))
+        return HttpResponseRedirect(reverse('login'))
+
+
+class UserView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
+    template_name = 'system/users/user.html'
+
+
+class UserListView(LoginRequiredMixin, View):
+    def get(self, request):
+        fields = ['id', 'name', 'gender', 'mobile', 'email', 'department__name', 'post', 'superior__name', 'is_active']
+        filters = dict()
+        if 'select' in request.GET and request.GET['select']:
+            filters['is_active'] = request.GET['select']
+        ret = dict(data=list(User.objects.filter(**filters).values(*fields)))
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserCreateView(LoginRequiredMixin, View):
+    """
+    添加用户
+    """
+
+    def get(self, request):
+        users = User.objects.exclude(username='admin')
+        structures = Structure.objects.values()
+        roles = Role.objects.values()
+
+        ret = {
+            'users': users,
+            'structures': structures,
+            'roles': roles,
+        }
+        return render(request, 'system/users/user_create.html', ret)
+
+    def post(self, request):
+        user_create_form = UserCreateForm(request.POST)
+        if user_create_form.is_valid():
+            new_user = user_create_form.save(commit=False)
+            new_user.password = make_password(user_create_form.cleaned_data['password'])
+            new_user.save()
+            user_create_form.save_m2m()
+            ret = {'status': 'success'}
+        else:
+            pattern = '<li>.*?<ul class=.*?><li>(.*?)</li>'
+            errors = str(user_create_form.errors)
+            user_create_form_errors = re.findall(pattern, errors)
+            ret = {
+                'status': 'fail',
+                'user_create_form_errors': user_create_form_errors[0]
+            }
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserDetailView(LoginRequiredMixin, View):
+
+    def get(self, request):
+        user = get_object_or_404(User, pk=int(request.GET['id']))
+        users = User.objects.exclude(Q(id=int(request.GET['id'])) | Q(username='admin'))
+        structures = Structure.objects.values()
+        roles = Role.objects.values()
+        user_roles = user.roles.values()
+        ret = {
+            'user': user,
+            'structures': structures,
+            'users': users,
+            'roles': roles,
+            'user_roles': user_roles
+        }
+        return render(request, 'system/users/user_detail.html', ret)
+
+
+class UserUpdateView(LoginRequiredMixin, View):
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            user = get_object_or_404(User, pk=int(request.POST['id']))
+        else:
+            user = get_object_or_404(User, pk=int(request.user.id))
+        user_update_form = UserUpdateForm(request.POST, instance=user)
+        if user_update_form.is_valid():
+            user_update_form.save()
+            ret = {"status": "success"}
+        else:
+            ret = {"status": "fail", "message": user_update_form.errors}
+        return HttpResponse(json.dumps(ret), content_type="application/json")
+
+
+class PasswordChangeView(LoginRequiredMixin, View):
+
+    def get(self, request):
+        ret = dict()
+        if 'id' in request.GET and request.GET['id']:
+            user = get_object_or_404(User, pk=int(request.GET.get('id')))
+            ret['user'] = user
+        return render(request, 'system/users/passwd_change.html', ret)
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            user = get_object_or_404(User, pk=int(request.POST['id']))
+            form = PasswordChangeForm(request.POST)
+            if form.is_valid():
+                new_password = request.POST['password']
+                user.set_password(new_password)
+                user.save()
+                ret = {'status': 'success'}
+            else:
+                pattern = '<li>.*?<ul class=.*?><li>(.*?)</li>'
+                errors = str(form.errors)
+                password_change_form_errors = re.findall(pattern, errors)
+                ret = {
+                    'status': 'fail',
+                    'password_change_form_errors': password_change_form_errors[0]
+                }
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserDeleteView(LoginRequiredMixin, View):
+    """
+    删除数据：支持删除单条记录和批量删除
+    """
+
+    def post(self, request):
+        ret = dict(result=False)
+        if 'id' in request.POST and request.POST['id']:
+            id_list = map(int, request.POST['id'].split(','))
+            User.objects.filter(id__in=id_list).delete()
+            ret['result'] = True
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserEnableView(LoginRequiredMixin, View):
+    """
+    启用用户：单个或批量启用
+    """
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            id_nums = request.POST.get('id')
+            queryset = User.objects.extra(where=["id IN(" + id_nums + ")"])
+            queryset.filter(is_active=False).update(is_active=True)
+            ret = {'result': 'True'}
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserDisableView(LoginRequiredMixin, View):
+    """
+    启用用户：单个或批量启用
+    """
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            id_nums = request.POST.get('id')
+            queryset = User.objects.extra(where=["id IN(" + id_nums + ")"])
+            queryset.filter(is_active=True).update(is_active=False)
+            ret = {'result': 'True'}
+        return HttpResponse(json.dumps(ret), content_type='application/json')
--- a/apps/utils/init.py
+++ b/apps/utils/init.py
@@ -0,0 +1,3 @@
+# @Time   : 2018/12/29 16:26
+# @Author : RobbieHan
+# @File   : __init__.py.py 
--- a/apps/utils/sandbox_utils.py
+++ b/apps/utils/sandbox_utils.py
@@ -0,0 +1,74 @@
+# @Time   : 2018/12/29 19:22
+# @Author : RobbieHan
+# @File   : sandbox_utils.py
+
+import os
+
+from django.conf import settings
+
+import yaml
+import logging
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'sandboxMP.settings')
+error_logger = logging.getLogger('sandbox_error')
+
+
+class ConfigFileMixin:
+    config_file = None
+
+    def get_config_file(self):
+        """
+        Return 'config_file' that will be used to look up the scan hosts IP,
+        network, range of IP, or other config settings.
+        This method is called by the default implementation of get_hosts(),
+        """
+
+        if self.config_file is None:
+            config_file = os.path.join(os.path.join(settings.BASE_DIR, 'config'), 'scanhosts.yml')
+            if os.path.exists(config_file):
+                return config_file
+            else:
+                msg = ' %(cls)s is missing a config file. Define %(cls)s.config_file, ' \
+                      'or override %(cls)s.get_config_file().' % {'cls': self.__class__.__name__}
+                error_logger.error(msg)
+                raise ValueError(msg)
+
+        return self.config_file
+
+    def get_conf_content(self, *key):
+        """
+        Get the configuration content from config file .
+        Example ssh_password, commands, email which is in the config file.
+        """
+        _config = self.get_config_file()
+        with open(_config) as f:
+            content = yaml.load(f)
+        if key is not None:
+            try:
+                num = 0
+                while num < len(key):
+                    content = content[key[num]]
+                    num += 1
+            except Exception as e:
+                msg = '%(exc)s is not in %(config)s.' % {
+                    'exc': e,
+                    'config': _config
+                }
+                error_logger.error(msg)
+                raise ValueError(msg)
+        return content
+
+    def get_commands(self):
+        """
+        Get the commands from config file.
+        """
+        key = ['hosts', 'commands']
+        return self.get_conf_content(*key)
+
+    def get_net_address(self):
+        """
+        Return the hosts that will be used to scan.
+        Subclasses can override this to return any hosts.
+        """
+        key = ['hosts', 'net_address']
+        return self.get_conf_content(*key)
--- a/config/scanhosts.yml
+++ b/config/scanhosts.yml
@@ -0,0 +1,18 @@
+hosts:
+    net_address:
+            - '172.16.3.0/24'
+            - '172.16.2.100-105'
+    ssh_username: 'root'
+    ssh_port: '22'
+    ssh_password: '1234@abcd.com'
+    ssh_private_key: '/root/.ssh/id_rsa'
+    commands:
+            sys_hostname: 'hostname'
+            mac_address: 'cat /sys/class/net/[^tsbvl]*/address'
+            sn_number: 'dmidecode -s system-serial-number'
+            os_type: 'cat /etc/redhat-release'
+            device_type: 'echo `dmidecode -s system-manufacturer &&  dmidecode -s system-product-name`'
+    email: 'robbie_han@outlook.com'
+    send_email: 'false'
+    scan_type: 'basic_scan'
+    auth_type: 'private_key'
--- a/db.sqlite3
+++ b/db.sqlite3
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -0,0 +1 @@
+-r pro.txt
--- a/requirements/pro.txt
+++ b/requirements/pro.txt
@@ -0,0 +1,14 @@
+django==2.1.2
+pillow==5.3.0
+mysqlclient==1.3.13
+ipython==7.1.1
+pyyaml==3.13
+ruamel.yaml==0.15.80
+python-nmap==0.6.1
+redis==3.0.1
+pymongo==3.7.1
+paramiko==2.4.2
+pycrypto==2.6.1
+celery==4.2.1
+celery-once==2.0.0
+flower==0.9.2
--- a/sandboxMP/pycache/settings.cpython-36.pyc
+++ b/sandboxMP/pycache/settings.cpython-36.pyc
--- a/sandboxMP/pycache/urls.cpython-36.pyc
+++ b/sandboxMP/pycache/urls.cpython-36.pyc
--- a/sandboxMP/settings.py
+++ b/sandboxMP/settings.py
@@ -27,7 +27,7 @@ SECRET_KEY = 'o6ijylqj@xxpvxzybcv2khtu5zk@y56nt4ptsb4dbgmdz8t%q='
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True

-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']


 # Application definition
@@ -40,6 +40,7 @@ INSTALLED_APPS = [
    'django.contrib.messages',
    'django.contrib.staticfiles',
    'system',
+    'cmdb',
 ]

 MIDDLEWARE = [
@@ -50,6 +51,8 @@ MIDDLEWARE = [
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'apps.system.middleware.MenuCollection',
+    'apps.system.middleware.RbacMiddleware',
 ]

 ROOT_URLCONF = 'sandboxMP.urls'
@@ -79,14 +82,24 @@ WSGI_APPLICATION = 'sandboxMP.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/2.1/ref/settings/#databases

+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#     }
+# }
+
 DATABASES = {
    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'sandboxMP',
+        'HOST': '127.0.0.1',
+        'USER': 'ddadmin',
+        'PASSWORD': '1234@abcd.com',
+        'PORT': '3306'
    }
 }

-
 # Password validation
 # https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators

@@ -132,3 +145,72 @@ MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')

 LOGIN_URL = '/login/'
+
+# safe url
+SAFE_URL = [r'^/$',
+            '/login/',
+            '/logout',
+            '/index/',
+            '/media/',
+            '/admin/',
+            '/ckeditor/',
+            '/test/',
+            ]
+
+# session timeout
+
+SESSION_COOKIE_AGE = 60 * 20
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
+SESSION_SAVE_EVERY_REQUEST = True
+
+
+# logging config
+
+BASE_LOG_DIR = os.path.join(BASE_DIR, 'slogs')
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'standard': {
+            'format': '[%(asctime)s][task_id:%(name)s][%(levelname)s]'
+                      '[%(filename)s:%(lineno)d][%(message)s]'
+        },
+        'simple': {
+            'format': '[%(levelname)s][%(asctime)s][%(filename)s:%(lineno)d]%(message)s'
+        },
+
+    },
+    'handlers': {
+        'default': {
+            'level': 'INFO',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(BASE_LOG_DIR, "sandbox_info.log"),
+            'maxBytes': 1024 * 1024 * 50,
+            'backupCount': 3,
+            'formatter': 'simple',
+            'encoding': 'utf-8',
+        },
+        'error': {
+            'level': 'ERROR',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(BASE_LOG_DIR, "sandbox_err.log"),
+            'backupCount': 5,
+            'formatter': 'standard',
+            'encoding': 'utf-8',
+        }
+
+    },
+        'loggers': {
+            'sandbox_info': {
+                'handlers': ['default'],
+                'level': 'INFO',
+                'propagate': True,
+            },
+            'sandbox_error': {
+                'handlers': ['error'],
+                'level': 'ERROR',
+            }
+    }
+
+}
--- a/sandboxMP/urls.py
+++ b/sandboxMP/urls.py
@@ -20,7 +20,7 @@ from django.urls import re_path
 from django.views.static import serve

 from system.views_user import IndexView, LoginView, LogoutView
-
+from cmdb.tests import TestLoggingView

 urlpatterns = [
    path('admin/', admin.site.urls),
@@ -28,6 +28,9 @@ urlpatterns = [
    path('login/', LoginView.as_view(), name='login'),
    path('logout/', LogoutView.as_view(), name='logout'),
    path('system/', include('system.urls', namespace='system')),
+    path('cmdb/', include('cmdb.urls', namespace='cmdb')),
+
+    path('test/', TestLoggingView.as_view()),

 ]

@@ -35,4 +38,4 @@ if settings.DEBUG:
    urlpatterns += [
        re_path(r'^media/(?P<path>.*)$', serve, {"document_root": settings.MEDIA_ROOT}),

-    ]
+    ]
--- a/static/plugins/datatables/dataTables.const-1.js
+++ b/static/plugins/datatables/dataTables.const-1.js
@@ -2,7 +2,7 @@ var DATATABLES_CONSTANT = {
          
    // datatables常量  
    DATA_TABLES : {  
-        DEFAULT_OPTION : { // DataTables初始化选项  
+        SERVER_SIDE_OPTION : { // DataTables初始化选项
        	oLanguage : {  
                sProcessing : "处理中...",  
                sLengthMenu : "每页 _MENU_ 项",//"显示 _MENU_ 项结果,",  
--- a/templates/base-left.html
+++ b/templates/base-left.html
@@ -21,20 +21,32 @@
      <!-- /.search form -->

      <!-- Sidebar Menu -->
- <ul class="sidebar-menu">
+     <ul class="sidebar-menu">
        <li class="header"></li>
        <!-- Optionally, you can add icons to the links -->
-        <li class="treeview">
-          <a href="#"><i class="fa fa-calendar"></i> <span>一级菜单</span>
-            <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="#"><i class="fa fa-caret-right"></i>二级菜单</a></li>
-            <li><a href="#"><i class="fa fa-caret-right"></i>二级菜单</a></li>
-          </ul>
-        </li>
+         {% for menu in request.reveal_menu %}
+            {% if not menu.url %}
+                <li class="treeview" id="{{ menu.code }}">
+                    <a href="">
+                        <i class="{{ menu.icon }}"></i><span>{{ menu.name }}</span>
+                        <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i>
+                        </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        {% for sub in  menu.sub_menu %}
+                            <li id="{{ sub.code }}">
+                                <a href="{{ sub.url }}"><i class="fa fa-caret-right"></i>{{ sub.name }}</a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </li>
+            {% else %}
+                <li id="{{ menu.code }}">
+                    <a href="{{ menu.url }}"><i class="{{ menu.icon }}"></i><span>{{ menu.name }}</span>
+                    </a>
+                </li>
+            {% endif %}
+        {% endfor %}
      </ul>
      <!-- /.sidebar-menu -->
    </section>
@@ -44,7 +56,14 @@

 <!-- Content Wrapper. Contains page content -->
 <div class="content-wrapper">
-
+    <section class="content-header margin-bottom">
+        <ol class="breadcrumb">
+            {% if menu.parent %}
+            <li class="active"><a href="{{ menu.parent.url | default:'' }}">{{ menu.parent.name }}</a></li>
+            {% endif %}
+            <li class="active"><a href="{{ menu.url }}">{{ menu.name }}</a></li>
+        </ol>
+    </section>
  {% block content %}


--- a/templates/base-static.html
+++ b/templates/base-static.html
@@ -8,7 +8,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
 <head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>SandBoxOA</title>
+  <title>SandBoxMP</title>
  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
  <link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
  <link rel="stylesheet" href="{% static 'plugins/font-awesome/css/font-awesome.min.css' %}">
@@ -52,7 +52,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
              <div class="menu-info">
                <h4 class="control-sidebar-subheading">SandBox</h4>

-                <p>沙盒协同办公平台</p>
+                <p>沙盒运维管理平台</p>
              </div>
            </a>
          </li>
--- a/templates/cmdb/cmdb_index.html
+++ b/templates/cmdb/cmdb_index.html
@@ -0,0 +1,20 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}{% endblock %}
+{% block content %}
+
+    <!-- Main content -->
+  <section class="content">
+    这里是配置管理首页（临时内容）
+
+  </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+
+{% block javascripts %}
+
+{% endblock %}
--- a/templates/cmdb/code.html
+++ b/templates/cmdb/code.html
@@ -0,0 +1,274 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/datatables/jquery.dataTables.min.css' %}">
+    <link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+
+{% block content %}
+
+    <!-- Main content -->
+  <section class="content">
+    <div id="devlist">
+        <div class="box box-primary" id="liebiao">
+            <div class="box-header">
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnRefresh" class="btn btn-default">
+                        <i class="glyphicon glyphicon-repeat"></i>刷新
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnCreate" class="btn btn-default">
+                        <i class="glyphicon glyphicon-plus"></i>新增
+                    </button>
+
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnDelete" class="btn btn-default">
+                        <i class="glyphicon glyphicon-trash"></i>删除
+                    </button>
+                </div>
+                <div class="pull-right">
+                    <form class="form-inline" id="queryForm">
+                       <div class="form-group searchArea margin-r-5 margin-top-5">
+                        <label>字典分类：</label>
+                        <select class="form-control inputText select2" name="parent" id="parent">
+                            <option style='text-align:center' value="">---所有---</option>
+                            {% for code in code_parent %}
+                            <option value={{ code.key}}>{{ code.value }}</option>
+                            {% endfor %}
+                        </select>
+                       </div>
+                    </form>
+                </div>
+            </div>
+
+            <div class="box-body">
+                <table id="dtbList" class="display" cellspacing="0" width="100%">
+                    <thead>
+                    <tr valign="middle">
+                        <th><input type="checkbox" id="checkAll"></th>
+                        <th>ID</th>
+                        <th>KEY</th>
+                        <th>VALUE</th>
+                        <th>所属</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+                <br> <br>
+            </div>
+        </div>
+    </div>
+
+  </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+
+{% block javascripts %}
+
+<script src="{% static 'plugins/datatables/jquery.dataTables.min.js' %}"></script>
+<script src="{% static 'plugins/datatables/dataTables.const-1.js' %}"></script>
+<script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+<script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+
+<script type="text/javascript">
+    // 菜单选中高亮
+    $(function () {
+        $('#CMDB-PORTAL').addClass('active');
+        $('#CDMB-PORTAL-CODE').addClass('active');
+    });
+
+     // datatables 初始化配置
+    var oDataTable = null;
+    $(function () {
+        oDataTable = initTable();
+
+        function initTable() {
+            var oTable = $('#dtbList').DataTable($.extend(true, {},
+                DATATABLES_CONSTANT.DATA_TABLES.SERVER_SIDE_OPTION,
+
+                {
+                    ajax: {
+                        "url": "{% url 'cmdb:portal-code-list' %}",
+                        "data": function (d) {
+                                d.parent = $("#parent").val();
+                            }
+                    },
+                    columns: [
+                        DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+                        {
+                            data: "id",
+                            width: "5%",
+                        },
+                        {
+                            data: "key",
+                            //width : "20%",
+                        },
+                        {
+                            data: "value",
+                            //width : "20%",
+                        },
+                        {
+                            data: "parent__value",
+                            //width : "20%",
+                        },
+                        {
+                            data: "id",
+                            width: "10%",
+                            bSortable: "false",
+                            render: function (data, type, row, meta) {
+                                var ret = "";
+                                var ret = "<button title='详情' onclick='doUpdate("
+                                    + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                ret = ret + "<button title='删除' onclick='doDelete("
+                                    + data + ")'><i class='glyphicon glyphicon-trash'></i></button>";
+                                return ret;
+                            }
+                        }],
+                    }));
+                return oTable;
+            }
+
+        });
+
+    //select2
+    $(function () {
+        //Initialize Select2 Elements
+        $(".select2").select2();
+    });
+
+    //过滤刷新接口获取新的数据
+    $("#parent").change(function () {
+        oDataTable.ajax.reload();
+    });
+
+
+    // 刷新数据
+    $("#btnRefresh").click(function () {
+        oDataTable.ajax.reload();
+    });
+    //新建字典
+    $("#btnCreate").click(function () {
+        layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: "{% url 'cmdb:portal-code-create' %}",
+            end: function () {
+                //关闭时做的事情
+                oDataTable.ajax.reload();
+            }
+        });
+    });
+
+    //修改字典
+    function doUpdate(id) {
+        layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'cmdb:portal-code-update' %}" + '?id=' + id, 'no'],
+            end: function () {
+                oDataTable.ajax.reload();
+            }
+        });
+    }
+
+     //checkbox全选
+    $("#checkAll").on("click", function () {
+        if ($(this).prop("checked") === true) {
+            $("input[name='checkList']").prop("checked", $(this).prop("checked"));
+            $('#example tbody tr').addClass('selected');
+        } else {
+            $("input[name='checkList']").prop("checked", false);
+            $('#example tbody tr').removeClass('selected');
+        }
+    });
+
+    //批量删除
+    $("#btnDelete").click(function () {
+        if ($("input[name='checkList']:checked").length == 0) {
+            layer.msg("请选择要删除的记录");
+            return;
+        }
+
+        var arrId = new Array();
+        $("input[name='checkList']:checked").each(function () {
+            //alert($(this).val());
+            arrId.push($(this).val());
+        });
+
+        sId = arrId.join(',');
+
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'cmdb:portal-code-delete' %}",
+                    data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert("操作成功", {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert("操作失败", {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    //删除单个数据
+    function doDelete(id) {
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'cmdb:portal-code-delete' %}",
+                    data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert('删除成功', {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert('删除失败', {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+    }
+</script>
+
+{% endblock %}
--- a/templates/cmdb/code_create.html
+++ b/templates/cmdb/code_create.html
@@ -0,0 +1,97 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+    <!-- iCheck for checkboxes and radio inputs -->
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>新建字典</h4>
+                    </legend>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">KEY</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="key" type="text"/>
+                        </div>
+                        <label class="col-sm-2 control-label">VALUE</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="value" type="text" />
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">父菜单</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" name="parent">
+                                <option value=""></option>
+                                {% for parent in code_parent %}
+                                    <option value={{ parent.id }}> {{ parent.value }} </option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                        <label class="col-sm-2 control-label">描述信息</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" id="desc" name="desc" type="text" />
+                        </div>
+                    </div>
+
+                </fieldset>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+    $("#btnSave").click(function () {
+        var data = $("#addForm").serialize();
+        $.ajax({
+            type: $("#addForm").attr('method'),
+            url: "{% url 'cmdb:portal-code-create' %}",
+            data: data,
+            cache: false,
+            success: function (msg) {
+                if (msg.result) {
+                    layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                        parent.layer.closeAll(); //关闭所有弹窗
+                    });
+                } else {
+                    layer.alert(msg.error, {icon: 5});
+                    //$('errorMessage').html(msg.message)
+                }
+                return;
+            }
+        });
+    });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+    </script>
+
+{% endblock %}
--- a/templates/cmdb/code_update.html
+++ b/templates/cmdb/code_update.html
@@ -0,0 +1,99 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+    <!-- iCheck for checkboxes and radio inputs -->
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+        <input type="hidden" name='id' type='text' value="{{ code.id }}"/>
+            {% csrf_token %}
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>修改字典</h4>
+                    </legend>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">KEY</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="key" type="text" value="{{ code.key }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">VALUE</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="value" type="text" value="{{ code.value }}"/>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">父菜单</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" name="parent">
+                                <option value={{ code.parent.id }}> {{ code.parent.value }} </option>
+                                <option value=""></option>
+                                {% for parent in code_parent %}
+                                    <option value={{ parent.id }}> {{ parent.value }} </option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                        <label class="col-sm-2 control-label">描述信息</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" id="desc" name="desc" type="text" />
+                        </div>
+                    </div>
+
+                </fieldset>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+    $("#btnSave").click(function () {
+        var data = $("#addForm").serialize();
+        $.ajax({
+            type: $("#addForm").attr('method'),
+            url: "{% url 'cmdb:portal-code-update' %}",
+            data: data,
+            cache: false,
+            success: function (msg) {
+                if (msg.result) {
+                    layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                        parent.layer.closeAll(); //关闭所有弹窗
+                    });
+                } else {
+                    layer.alert(msg.error, {icon: 5});
+                    //$('errorMessage').html(msg.message)
+                }
+                return;
+            }
+        });
+    });
+
+
+    /*点取消刷新新页面*/
+    $("#btnCancel").click(function () {
+        window.location.reload();
+
+    });
+
+    $(function () {
+        //Initialize Select2 Elements
+        $(".select2").select2();
+    });
+
+    </script>
+
+{% endblock %}
--- a/templates/cmdb/scan_config.html
+++ b/templates/cmdb/scan_config.html
@@ -0,0 +1,176 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+<link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+{% endblock %}
+
+{% block content %}
+
+    <!-- Main content -->
+    <section class="content">
+        <div class="row">
+            <div class="col-md-8">
+                <!-- Horizontal Form -->
+                <div class="box box-default">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">扫面参数配置</h3>
+                    </div>
+                    <!-- /.box-header -->
+                    <!-- form start -->
+                    <form class="form-horizontal" id="addForm" method="post">
+                        {% csrf_token %}
+                        <div class="box-body">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">扫描网段</label>
+                                <div class="col-sm-10">
+                                    <input class="form-control" id="net_address" name="net_address" value="{{ hosts.net_address }}">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">登陆用户</label>
+                                <div class="col-sm-10">
+                                    <input class="form-control" id="ssh_username" name="ssh_username" value="{{ hosts.ssh_username }}">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">SSH端口</label>
+                                <div class="col-sm-10">
+                                    <input class="form-control" id="ssh_port" name="ssh_port" value="{{ hosts.ssh_port }}">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">登陆密码</label>
+                                <div class="col-sm-10">
+                                    <input class="form-control" type="password" id="ssh_password" name="ssh_password" value="{{ hosts.ssh_password }}">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">密钥路径</label>
+                                <div class="col-sm-10">
+                                    <input class="form-control" id="ssh_private_key" name="ssh_private_key" value="{{ hosts.ssh_private_key }}">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">运行命令</label>
+                                <div class="col-sm-10">
+                                    <textarea class="form-control" rows="5" id="commands" name="commands" readonly>{{ hosts.commands }}</textarea>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">认证方式</label>
+                                <div class="col-sm-4">
+                                    <select class="form-control" name="auth_type">
+                                        <option value="password" {% ifequal hosts.auth_type 'password' %}selected="selected"{% endifequal %}>密码认证</option>
+                                        <option value="private_key" {% ifequal hosts.auth_type 'private_key' %}selected="selected"{% endifequal %}>私钥认证</option>
+                                    </select>
+                                </div>
+                                <label class="col-sm-2 control-label">扫描方式</label>
+                                <div class="col-sm-4">
+                                    <select class="form-control" name="scan_type">
+                                        <option value="basic_scan" {% ifequal hosts.scan_type 'basic_scan' %}selected="selected"{% endifequal %}>基础扫描</option>
+                                        <option value="enhanced_scan" {% ifequal hosts.scan_type 'enhanced_scan' %}selected="selected"{% endifequal %}>加强扫描</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">收件邮箱</label>
+
+                                <div class="col-sm-10">
+                                    <input class="form-control" id="email" name="email" value="{{ hosts.email }}">
+                                </div>
+
+                            </div>
+                            <div class="form-group has-feedback">
+                                <label class="col-sm-2 control-label">发送邮件</label>
+                                <div class="col-sm-10">
+                                    <label class="control-label">
+                                        <input type="radio" class="minimal" name="send_email" value="true" {% ifequal hosts.send_email 'true' %}checked{% endifequal %}>是
+                                    </label>
+                                    <label class="control-label">
+                                        <input type="radio" class="minimal" name="send_email" value="false" {% ifequal hosts.send_email 'false' %}checked{% endifequal %}>否
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                        <!-- /.box-body -->
+                        <div class="box-footer">
+                            <span class="pull-right">
+                                <button type="button" id="btnCancel" class="btn btn-default">取消</button>
+                                <button type="button" id="btnSave" class="btn btn-info">保存</button>
+                            </span>
+                        </div>
+                        <!-- /.box-footer -->
+                    </form>
+                </div>
+            </div>
+            <div class="col-sm-4">
+              <div class="box box-default">
+                <div class="box-header with-border">
+                  <h3 class="box-title">参数配置说明</h3>
+                </div><!-- /.box-header -->
+                <div class="box-body">
+                  <a class="product-title"><strong>扫描网段</strong><span class="label label-danger pull-right">必填参数</span></a>
+                  <p><small>网络扫描地址列表，列表中可以包含一个或多个网段，也可以是一个或多个地址区间，例如['192.168.100.0/24', '192.168.100.10-20']</small></p>
+                  <a class="product-title"><strong>登陆用户</strong><span class="label label-danger pull-right">必填参数</span></a>
+                  <p><small>系统登陆测试使用的用户名，默认root。</small></p>
+                  <a class="product-title"><strong>登陆密码</strong><span class="label label-danger pull-right">可选参数</span></a>
+                  <p><small>系统登陆测试使用的密码，如过认证方式为密码认证，必须填写密码信息。</small></p>
+                  <a class="product-title"><strong>密钥路径</strong><span class="label label-primary pull-right">可选参数</span></a>
+                  <p><small>系统登陆测试使用的密钥存放路径，如过认证方式为私钥认证，必须填写密钥路径。</small></p>
+                  <a class="product-title"><strong>运行命令</strong><span class="label label-default pull-right">预定义参数</span></a>
+                  <p><small>登陆系统后运行的基本命令，用来获取系统基本信息，当扫描方式为加强扫描时，才会执行运行命令，运行命令为预定义，禁止修改。</small></p>
+                  <a class="product-title"><strong>认证方式</strong><span class="label label-primary pull-right">可选参数</span></a>
+                  <p><small>系统登陆认证方式，包括密码认证和私钥认证两种方式，当扫描方式为加强扫描时，需要设定认证方式。</small></p>
+                  <a class="product-title"><strong>扫描方式</strong><span class="label label-primary pull-right">可选参数</span></a>
+                  <p><small>系统扫描方式，包括基本扫描和加强扫描，当设置为加强扫描时会登陆系统执行运行命令获取系统信息。</small></p>
+                  <a class="product-title"><strong>收件邮箱</strong><span class="label label-primary pull-right">可选参数</span></a>
+                  <p><small>用于接收扫描结果邮件，可以通过发送邮件选项设置是否发送通知邮件。</small></p>
+                </div><!-- /.box-body -->
+              </div><!-- /.box -->
+            </div>
+            <!-- /.box -->
+        </div>
+    </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+{% block javascripts %}
+<script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+<script type="text/javascript">
+// 菜单选中高亮
+$(function () {
+    $('#CMDB-PORTAL').addClass('active');
+    $('#CMDB-PORTAL-SCAN_CONFIG').addClass('active');
+
+});
+
+$("#btnSave").click(function () {
+    var hosts = $("#addForm").serialize();
+    $.ajax({
+        type: $("#addForm").attr('method'),
+        url: "{% url 'cmdb:portal-scan_config' %}",
+        cache: false,
+        data: hosts,
+        success: function (msg) {
+            if (msg.result) {
+                layer.alert('数据保存成功！', {icon: 1});
+            } else {
+                layer.alert('数据保存失败', {icon: 5});
+                //$('errorMessage').html(msg.message)
+            }
+        },
+
+    });
+});
+
+
+/*点取消刷新新页面*/
+$("#btnCancel").click(function () {
+    window.location.reload();
+
+});
+</script>
+{% endblock %}
--- a/templates/head-footer.html
+++ b/templates/head-footer.html
@@ -20,9 +20,13 @@
                <span class="sr-only">Toggle navigation</span>
            </a>
            <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                <ul class="nav navbar-nav">
-                    <li class="active" ><a href="#" id="index">头部导航</a></li>
-                </ul>
+                {% for menu in request.top_menu %}
+                    <ul class="nav navbar-nav">
+                        <li {% ifequal menu.status True %}class="active" {% endifequal %}>
+                            <a href="{{ menu.url }}" id="{{ menu.code }}">{{ menu.name | default_if_none:"" }}</a>
+                        </li>
+                    </ul>
+                {% endfor %}
            </div>
            {% if request.user.is_authenticated %}
                <div class="navbar-custom-menu">
--- a/templates/system/menu_form.html
+++ b/templates/system/menu_form.html
@@ -0,0 +1,106 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+    <!-- iCheck for checkboxes and radio inputs -->
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>添加菜单</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">名称</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text"/>
+                        </div>
+                        <label class="col-sm-2 control-label">编号</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="number" type="text"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">图标</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="icon" type="text" />
+                        </div>
+                        <label class="col-sm-2 control-label">父菜单</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" name="parent">
+                                <option value="{{ menu.parent.id }}">{{ menu.parent.name }}</option>
+                                {% for parent_menu in menu_all %}
+                                    <option value={{ parent_menu.id }}> {{ parent_menu.name }} </option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">URL</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="url" type="text" />
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">代码</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="code" type="text"/>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:rbac-menu-create' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else {
+                        layer.alert('数据保存失败', {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+    </script>
+
+{% endblock %}
--- a/templates/system/menu_list.html
+++ b/templates/system/menu_list.html
@@ -0,0 +1,164 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/datatables/jquery.dataTables.min.css' %}">
+    <link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+    <!-- iCheck for checkboxes and radio inputs -->
+{% endblock %}
+
+{% block content %}
+    <!-- Main content -->
+    <section class="content">
+        <div id="devlist">
+            <div class="box box-primary" id="liebiao">
+                <div class="box-header">
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnRefresh" class="btn btn-default">
+                            <i class="glyphicon glyphicon-repeat"></i>刷新
+                        </button>
+                    </div>
+                    <div class="btn-group pull-left">&nbsp</div>
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnCreate" class="btn btn-default">
+                            <i class="glyphicon glyphicon-plus"></i>新增
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <table id="dtbList" class="display" cellspacing="0" width="100%">
+                        <thead>
+                        <tr valign="middle">
+                            <th><input type="checkbox" id="checkAll"></th>
+                            <th>ID</th>
+                            <th>名称</th>
+                            <th>代码</th>
+                            <th>URL</th>
+                            <th>图标</th>
+                            <th>父菜单</th>
+                            <th>操作</th>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
+                    <br> <br>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/datatables/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
+    <script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+    <!-- iCheck 1.0.1 -->
+    <script type="text/javascript">
+        $(function () {
+            $('#SYSTEM-RBAC').addClass('active');
+            $('#SYSTEM-RBAC-MENU').addClass('active');
+
+        });
+    </script>
+
+    <script type="text/javascript">
+        var oDataTable = null;
+        var data = [
+            {% for menu in menu_all %}
+            {
+                "id": "{{ menu.id }}",
+                "name": "{{ menu.name }}",
+                "code": "{{ menu.code }}",
+                "url":  "{{ menu.url | default_if_none:'' }}",
+                "icon": "{{ menu.icon | default_if_none:'' }}",
+                "parent": "{{ menu.parent.name }}"
+            },
+            {% endfor %}
+        ];
+
+        $(function () {
+            oDataTable = initTable();
+
+            function initTable() {
+                var oTable = $('#dtbList').DataTable($.extend(true, {},
+                    DATATABLES_CONSTANT.DATA_TABLES.DEFAULT_OPTION,
+                    {
+                        data: data,
+                        columns: [
+                            DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+                            {
+                                data: "id",
+                                width: "5%",
+                            },
+                            {
+                                data: "name",
+                            },
+                            {
+                                data: "code",
+                            },
+                            {
+                                data: "url",
+                            },
+                            {
+                                data: "icon",
+                            },
+                            {
+                                data: "parent",
+                            },
+                            {
+                                data: "id",
+                                bSortable: "false",
+                                render: function (data, type, row, meta) {
+                                    var ret = "";
+                                    var ret = "<button title='详情-编辑' onclick='doUpdate("
+                                        + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                    return ret;
+                                }
+                            }
+                        ],
+                    }));
+                return oTable;
+            }
+
+        });
+
+    $("#btnRefresh").click(function () {
+            window.location.reload();
+        });
+
+    $("#btnCreate").click(function () {
+        layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: "{% url 'system:rbac-menu-create' %}",
+            end: function () {
+                //关闭时做的事情
+                window.location.reload();
+            }
+        });
+    });
+
+     function doUpdate(id) {
+        layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'system:rbac-menu-update' %}" + '?id=' + id, 'no'],
+            end: function () {
+                //关闭时做的事情
+                window.location.reload();
+            }
+        });
+    }
+    </script>
+{% endblock %}
--- a/templates/system/menu_update.html
+++ b/templates/system/menu_update.html
@@ -0,0 +1,107 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ menu.id }}"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>修改菜单</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">名称</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text" value="{{ menu.name }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">编号</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="number" type="text" value="{{ menu.number }}"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">图标</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="icon" type="text" value="{{ menu.icon | default:'' }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">父菜单</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" name="parent">
+                                <option value="{{ menu.parent.id }}">{{ menu.parent.name }}</option>
+                                <option value=""> </option>
+                                {% for parent_menu in menu_all %}
+                                    <option value={{ parent_menu.id }}> {{ parent_menu.name }} </option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">URL</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="url" type="text" value="{{ menu.url | default:'' }}"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">代码</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="code" type="text" value="{{ menu.code | default:'' }}"/>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:rbac-menu-update' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else {
+                        layer.alert('数据保存失败', {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+    </script>
+
+{% endblock %}
--- a/templates/system/role.html
+++ b/templates/system/role.html
@@ -0,0 +1,261 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/datatables/jquery.dataTables.min.css' %}">
+    <link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+{% endblock %}
+
+{% block content %}
+
+    <!-- Main content -->
+    <section class="content">
+        <div id="devlist">
+            <div class="box box-primary" id="liebiao">
+                <div class="box-header">
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnRefresh" class="btn btn-default">
+                            <i class="glyphicon glyphicon-repeat"></i>刷新
+                        </button>
+                    </div>
+                    <div class="btn-group pull-left">&nbsp</div>
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnCreate" class="btn btn-default">
+                            <i class="glyphicon glyphicon-plus"></i>新增
+                        </button>
+
+                    </div>
+                    <div class="btn-group pull-left">&nbsp</div>
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnDelete" class="btn btn-default">
+                            <i class="glyphicon glyphicon-trash"></i>删除
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <table id="dtbList" class="display" cellspacing="0" width="100%">
+                        <thead>
+                        <tr valign="middle">
+                            <th><input type="checkbox" id="checkAll"></th>
+                            <th>ID</th>
+                            <th>名称</th>
+                            <th>说明</th>
+                            <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
+                    <br> <br>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/datatables/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
+    <script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+    <script type="text/javascript">
+        $(function () {
+            $('#SYSTEM-RBAC').addClass('active');
+            $('#SYSTEM-RBAC-ROLE').addClass('active');
+
+        });
+    </script>
+<script type="text/javascript">
+ var oDataTable = null;
+    $(function () {
+        oDataTable = initTable();
+
+        function initTable() {
+            var oTable = $('#dtbList').DataTable($.extend(true, {},
+                DATATABLES_CONSTANT.DATA_TABLES.DEFAULT_OPTION,
+                {
+                    ajax: {
+                        "url": "{% url 'system:rbac-role-list' %}",
+                    },
+                    columns: [
+                        DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+                        {
+                            data: "id",
+                            width: "5%",
+                        },
+                        {
+                            data: "name",
+                            //width : "20%",
+                        },
+                        {
+                            data: "desc",
+                            //width : "20%",
+                        },
+
+                        {
+                            data: "id",
+                            width: "16%",
+                            bSortable: "false",
+                            render: function (data, type, row, meta) {
+                                var ret = "";
+                                var ret = "<button title='详情-编辑' onclick='doUpdate("
+                                    + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                ret = ret + "<button title='关联用户' onclick='doUpdateUser("
+                                    + data + ")'><i class='glyphicon glyphicon-user'></i></button>";
+                                ret = ret + "<button title='关联菜单' onclick='doUpdateMenu("
+                                    + data + ")'><i class='glyphicon glyphicon-tree-conifer'></i></button>";
+                                ret = ret + "<button title='删除' onclick='doDelete("
+                                    + data + ")'><i class='glyphicon glyphicon-trash'></i></button>";
+                                return ret;
+                            }
+                        }],
+                    }));
+                return oTable;
+            }
+
+        });
+
+    $("#btnCreate").click(function () {
+        layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '300px'],
+            content: "{% url 'system:rbac-role-create' %}",
+            end: function () {
+                //关闭时做的事情
+                oDataTable.ajax.reload();
+            }
+        });
+    });
+
+    $("#btnRefresh").click(function () {
+        oDataTable.ajax.reload();
+    });
+
+    function doUpdate(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        shadeClose: false,
+        maxmin: true,
+        area: ['800px', '400px'],
+        content: ["{% url 'system:rbac-role-update' %}" + '?id=' + id, 'no'],
+        end: function () {
+            oDataTable.ajax.reload();
+        }
+    });
+    }
+
+    //checkbox全选
+    $("#checkAll").on("click", function () {
+        if ($(this).prop("checked") === true) {
+            $("input[name='checkList']").prop("checked", $(this).prop("checked"));
+            $('#example tbody tr').addClass('selected');
+        } else {
+            $("input[name='checkList']").prop("checked", false);
+            $('#example tbody tr').removeClass('selected');
+        }
+    });
+
+    //批量删除
+    $("#btnDelete").click(function () {
+        if ($("input[name='checkList']:checked").length == 0) {
+            layer.msg("请选择要删除的记录");
+            return;
+        }
+
+        var arrId = new Array();
+        $("input[name='checkList']:checked").each(function () {
+            //alert($(this).val());
+            arrId.push($(this).val());
+        });
+
+        sId = arrId.join(',');
+
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'system:rbac-role-delete' %}",
+                    data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert("操作成功", {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert("操作失败", {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    //删除单个数据
+    function doDelete(id) {
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'system:rbac-role-delete' %}",
+                    data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert('删除成功', {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert('删除失败', {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+    }
+
+    //关联用户
+    function doUpdateUser(id) {
+        layer.open({
+            type: 2,
+            title: '绑定用户',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '600px'],
+            content: ["{% url 'system:rbac-role-role2user' %}" + '?id=' + id, 'no'],
+        });
+    }
+
+    //关联菜单
+    function doUpdateMenu(id) {
+        layer.open({
+            type: 2,
+            title: '权限分配',
+            shadeClose: false,
+            maxmin: true,
+            area: ['600px', '480px'],
+            content: ["{% url 'system:rbac-role-role2menu' %}" + '?id=' + id, 'no'],
+
+    });
+    }
+</script>
+
+{% endblock %}
--- a/templates/system/role_form.html
+++ b/templates/system/role_form.html
@@ -0,0 +1,80 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>新建角色</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">名称</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="name" type="text" />
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">描述</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="desc" type="text" />
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/combo-select/jquery.combo.select.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:rbac-role-create' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else {
+                        layer.alert('数据保存失败', {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+
+        /*select 支持输入检索*/
+        $(function () {
+            $('select').comboSelect();
+        });
+
+    </script>
+
+{% endblock %}
--- a/templates/system/role_role2menu.html
+++ b/templates/system/role_role2menu.html
@@ -0,0 +1,179 @@
+{% extends "base-layer.html" %} {% load static %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/zTree/css/metroStyle/metroStyle.css' %}" type="text/css">
+    <link rel="stylesheet" href="{% static 'plugins/zTree/css/zTreeStyle/zTreeStyle.css' %}" type="text/css">
+    <link rel="stylesheet" href="{% static 'plugins/zTree/css/demo.css' %}" type="text/css">
+{% endblock %}
+{% block main %}
+
+    <style type="text/css">
+        .ztree li span.button.switch.level0 {
+            visibility: hidden;
+            width: 1px;
+        }
+
+        .ztree li ul.level0 {
+            padding: 0;
+            background: none;
+        }
+
+
+    </style>
+    <div class="box box-danger">
+        <div class="box-body">
+            <form class="form-horizontal" id="addTreeForm" action="" method="post">
+                {% csrf_token %}
+                <!-- 注释1：页面实例是由Role2MenuView视图返回的，同时传递了上下文role,这里使用role.id时用来提交POST请求时向后台传递的id-->
+                <input type="hidden" name='id' value="{{ role.id }}"/>
+                <input type="hidden" name="tree" id="tree" value=""/>
+                <div class="box-body">
+                    <div class="row">
+                        <div class="col-xs-5">
+                            <div class="row span7 text-center ">
+                                <label class="control-label"><h5>所有菜单</h5></label>
+
+                            </div>
+                            <div style="zTreeDemoBackground:left">
+                                <ul id="left_tree" class="ztree"></ul>
+                            </div>
+                        </div>
+                        <div class="col-xs-2">
+                            <br><br><br><br><br><br>
+                            <div class="text-center">
+                                <button type="button" id="btnSave" class="btn btn-info margin-right ">生成</button>
+                            </div>
+                            <div class="text-center text-gray margin-top-5">{{ role.name }}权限</div>
+
+                        </div>
+                        <div class="col-xs-5">
+                            <div class="row span7 text-center">
+                                <label class="control-label"><h5>已选菜单</h5></label>
+                            </div>
+                            <ul id="right_tree" class="ztree"></ul>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+{% endblock %}
+
+{% block javascripts %}
+    <script type="text/javascript" src="{% static 'plugins/zTree/js/jquery.ztree.core.js' %}"></script>
+    <script type="text/javascript" src="{% static 'plugins/zTree/js/jquery.ztree.excheck.js' %}"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            var zTree;
+            var demoIframe;
+
+            var left_tree_setting = {
+                view: {
+                    dblClickExpand: false,
+                    showLine: true,
+                    selectedMulti: true
+                },
+                check: {
+                    enable: true,
+                    //chkboxType : { "Y" : "", "N" : "" }
+                },
+                data: {
+                    key: {
+                        name: "name",
+                        //title:"title",
+                    },
+                    simpleData: {
+                        enable: true,
+                        idKey: "id",
+                        pIdKey: "parent",
+                        rootPId: ""
+                    },
+                }
+            };
+
+            var right_tree_setting = {
+                view: {
+                    dblClickExpand: false,
+                    showLine: true,
+                    selectedMulti: true
+                },
+                check: {
+                    enable: false,
+                    //chkboxType : { "Y" : "", "N" : "" }
+                },
+                data: {
+                    key: {
+                        name: "name",
+                        //title:"title",
+                    },
+                    simpleData: {
+                        enable: true,
+                        idKey: "id",
+                        pIdKey: "parent",
+                        rootPId: ""
+                    },
+                }
+            };
+
+            $.ajax({
+                type: "GET",
+                url: "{% url 'system:rbac-role-role2menu_list' %}",
+                cache: false,
+                success: function (msg) {
+                    layer.close();
+                    var t = $("#left_tree");
+                    t = $.fn.zTree.init(t, left_tree_setting, msg.data);
+                    var treeObj = $.fn.zTree.getZTreeObj("left_tree");
+                    treeObj.expandAll(true);
+                    return;
+                }
+            });
+
+            $.ajax({
+                type: "GET",
+                url: "{% url 'system:rbac-role-role2menu_list' %}",
+                data: {"id":{{role.id}}},
+                cache: false,
+                success: function (msg) {
+                    layer.close();
+                    var t = $("#right_tree");
+                    t = $.fn.zTree.init(t, right_tree_setting, msg.data);
+                    var treeObj = $.fn.zTree.getZTreeObj("right_tree");
+                    treeObj.expandAll(true);
+                    return;
+                }
+            });
+
+            $("#btnSave").click(function () {
+                var treeObj = $.fn.zTree.getZTreeObj("left_tree");
+                var nodes = treeObj.getCheckedNodes(true);
+                $("#tree").val(JSON.stringify(nodes));
+                var data = $("#addTreeForm").serialize();
+                $.ajax({
+                    type: $("#addTreeForm").attr('method'),
+                    url: "{% url 'system:rbac-role-role2menu' %}",
+                    data: data,
+                    cache: false,
+                    beforeSend: function () {
+                        this.layerIndex = layer.load(1, {
+                            shade: [0.1, '#fff']
+                        });
+                    },
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert('操作成功', {icon: 1}, function (index) {
+                                parent.layer.closeAll();
+                            });
+                        } else {
+                            //alert(msg.message);
+                            layer.alert('操作失败', {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            });
+        });
+
+
+    </script>
+{% endblock %}
--- a/templates/system/role_role2user.html
+++ b/templates/system/role_role2user.html
@@ -0,0 +1,105 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="selectUsersForm" action="" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ role.id }}"/>
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-xs-5">
+                        <label class="control-label">可选用户:</label>
+                        <select name="from" id="multiselect" class="form-control" size="18" multiple="multiple">
+                            {% for item in un_add_users %}
+                                <option value="{{ item.id }}">{{ item.name }}({{ item.username }})</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <div class="col-xs-2">
+                        <br><br><br><br><br><br>
+                        <button type="button" id="multiselect_rightAll" class="btn btn-block"><i
+                                class="glyphicon glyphicon-forward"></i></button>
+                        <button type="button" id="multiselect_rightSelected" class="btn btn-block"><i
+                                class="glyphicon glyphicon-chevron-right"></i></button>
+                        <button type="button" id="multiselect_leftSelected" class="btn btn-block"><i
+                                class="glyphicon glyphicon-chevron-left"></i></button>
+                        <button type="button" id="multiselect_leftAll" class="btn btn-block"><i
+                                class="glyphicon glyphicon-backward"></i></button>
+                    </div>
+                    <div class="col-xs-5">
+                        <label class="control-label">{{ role.name }}-已绑定用户:</label>
+                        <select name="to" id="multiselect_to" class="form-control" size="18" multiple="multiple">
+                            {% for item in added_users %}
+                                <option value="{{ item.id }}">{{ item.name }}({{ item.username }})</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-xs-12 margin-top-5">
+                        <p class="text-maroon">*注意：一个用户可以添加到多个角色中,继承多个角色的权限</p>
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+        </form>
+    </div>
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select/multiselect.min.js' %}"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //初始化多选列表
+            $('#multiselect').multiselect({
+                search: {
+                    left: '<input type="text" class="form-control" placeholder="Search..." />',
+                    right: '<input type="text" class="form-control" placeholder="Search..." />',
+                },
+                fireSearch: function (value) {
+                    return value.length > 3;
+                }
+            });
+
+
+        });
+
+        $("#btnSave").click(function () {
+            $('#multiselect_to option').prop('selected', true);
+            var data = $("#selectUsersForm").serialize();
+            console.log(data);
+            $.ajax({
+                type: $("#selectUsersForm").attr('method'),
+                url: "{% url 'system:rbac-role-role2user' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('操作成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll();
+                        });
+                    } else {
+                        //alert(msg.message);
+                        layer.alert('操作失败', {icon: 2});
+                    }
+                    return;
+                }
+            });
+        });
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+    </script>
+{% endblock %}
--- a/templates/system/role_update.html
+++ b/templates/system/role_update.html
@@ -0,0 +1,81 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ role.id }}"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>修改角色</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">名称</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="name" type="text" value="{{ role.name }}"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">描述</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="desc" type="text" value="{{ role.desc }}"/>
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/combo-select/jquery.combo.select.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:rbac-role-update' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else {
+                        layer.alert('数据保存失败', {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+
+        /*select 支持输入检索*/
+        $(function () {
+            $('select').comboSelect();
+        });
+
+    </script>
+
+{% endblock %}
--- a/templates/system/structure/structure.html
+++ b/templates/system/structure/structure.html
@@ -57,6 +57,13 @@
 <script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
 <script src="{% static 'js/plugins/layer/layer.js' %}"></script>

+<script type="text/javascript">
+    $(function () {
+        $('#SYSTEM-BASIC').addClass('active');
+        $('#SYSTEM-BASIC-STRUCTURE').addClass('active');
+
+    });
+</script>
 <script type="text/javascript">
    var oDataTable = null;
    $(function () {
@@ -135,6 +142,118 @@
            }
        });
    });
-    </script>
+
+    //checkbox全选
+    $("#checkAll").on("click", function () {
+        if ($(this).prop("checked") === true) {
+            $("input[name='checkList']").prop("checked", $(this).prop("checked"));
+            $('#example tbody tr').addClass('selected');
+        } else {
+            $("input[name='checkList']").prop("checked", false);
+            $('#example tbody tr').removeClass('selected');
+        }
+    });
+
+    //批量删除
+    $("#btnDelete").click(function () {
+        if ($("input[name='checkList']:checked").length == 0) {
+            layer.msg("请选择要删除的记录");
+            return;
+        }
+
+        var arrId = new Array();
+        $("input[name='checkList']:checked").each(function () {
+            //alert($(this).val());
+            arrId.push($(this).val());
+        });
+
+        sId = arrId.join(',');
+
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'system:basic-structure-delete' %}",
+                    data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert("操作成功", {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert("操作失败", {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    //删除单个数据
+    function doDelete(id) {
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'system:basic-structure-delete' %}",
+                    data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},  //防止post数据时报 csrf_token 403
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert('删除成功', {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert('删除失败', {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+
+    }
+
+    function doUpdate(id) {
+        layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'system:basic-structure-create' %}" + '?id=' + id, 'no'],
+            end: function () {
+                oDataTable.ajax.reload();
+            }
+        });
+    }
+
+    function doAddUser(id) {
+        layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '600px'],
+            content: ["{% url 'system:basic-structure-add_user' %}" + '?id=' + id, 'no'],
+            end: function () {
+                window.location.reload();
+            }
+        });
+    }
+
+</script>

 {% endblock %}
--- a/templates/system/structure/structure_create.html
+++ b/templates/system/structure/structure_create.html
@@ -14,14 +14,16 @@
                    <legend>
                        <h4>组织架构信息</h4>
                    </legend>
+                    <input type="hidden" name="id" value="{{ structure.id }}" />
                    <div class="form-group has-feedback">
                        <label class="col-sm-2 control-label">名称</label>
                        <div class="col-sm-3">
-                            <input class="form-control" name="name" type="text" />
+                            <input class="form-control" name="name" type="text" value="{{ structure.name }}" />
                        </div>
                        <label class="col-sm-2 control-label">类别</label>
                        <div class="col-sm-3">
                            <select class="form-control" name="type">
+                                <option value={{ structure.type }}> {{ structure.get_type_display|default:"--类别--" }} </option>
                                <option value="unit">单位</option>
                                <option value="department">部门</option>
                            </select>
@@ -33,6 +35,7 @@
                        <label class="col-sm-2 control-label">所属</label>
                        <div class="col-sm-3">
                            <select class="form-control" name="parent">
+                                <option value={{ structure.parent_id|default_if_none:"" }}> {{ structure.parent.name|default:"" }}
                                <option></option>
                                {% for stru in structure_all %}
                                    <option value={{ stru.id }}> {{ stru.name }} </option>
--- a/templates/system/structure/structure_user.html
+++ b/templates/system/structure/structure_user.html
@@ -0,0 +1,103 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="selectUsersForm" action="" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ structure.id }}"/>
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-xs-5">
+                        <label class="control-label">可选用户:</label>
+                        <select name="from" id="multiselect" class="form-control" size="18" multiple="multiple">
+                            {% for item in un_add_users %}
+                                <option value="{{ item.id }}">{{ item.name }}({{ item.username }})</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <div class="col-xs-2">
+                        <br><br><br><br><br><br>
+                        <button type="button" id="multiselect_rightAll" class="btn btn-block"><i
+                                class="glyphicon glyphicon-forward"></i></button>
+                        <button type="button" id="multiselect_rightSelected" class="btn btn-block"><i
+                                class="glyphicon glyphicon-chevron-right"></i></button>
+                        <button type="button" id="multiselect_leftSelected" class="btn btn-block"><i
+                                class="glyphicon glyphicon-chevron-left"></i></button>
+                        <button type="button" id="multiselect_leftAll" class="btn btn-block"><i
+                                class="glyphicon glyphicon-backward"></i></button>
+                    </div>
+                    <div class="col-xs-5">
+                        <label class="control-label">{{structure.name}}-已绑定用户:</label>
+                        <select name="to" id="multiselect_to" class="form-control" size="18" multiple="multiple">
+                            {% for item in added_users %}
+                                <option value="{{ item.id }}">{{ item.name }}({{ item.username }})</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-xs-12 margin-top-5">
+                        <p class="text-maroon">*注意：一个用户只能隶属一个部门，如果选择的用户已存在部门，用户将会从原有部门移出</p>
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+        </form>
+    </div>
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select/multiselect.min.js' %}"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //初始化多选列表
+            $('#multiselect').multiselect({
+                search: {
+                    left: '<input type="text" class="form-control" placeholder="Search..." />',
+                    right: '<input type="text" class="form-control" placeholder="Search..." />',
+                },
+                fireSearch: function (value) {
+                    return value.length > 3;
+                }
+            });
+
+
+        });
+
+        $("#btnSave").click(function () {
+            $('#multiselect_to option').prop('selected', true);
+            var data = $("#selectUsersForm").serialize();
+            console.log(data);
+            $.ajax({
+                type: $("#selectUsersForm").attr('method'),
+                url: "{% url 'system:basic-structure-add_user' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('操作成功', {icon: 1});
+                    } else {
+                        //alert(msg.message);
+                        layer.alert('操作失败', {icon: 2});
+                    }
+                    return;
+                }
+            });
+        });
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+    </script>
+{% endblock %}
--- a/templates/system/system_index.html
+++ b/templates/system/system_index.html
@@ -4,14 +4,87 @@

 {% block content %}

+    <div class="pad margin no-print">
+        <div class="callout callout-info" style="margin-bottom: 0!important;">
+            <h4><i class="fa  fa-info-circle"></i>系统管理:</h4>
+            系统管理模块包含：系统权限管理和系统设置，系统权限管理可实现基于角色组的权限管理，可根据角色组权限动态生成URL导航菜单。
+        </div>
+    </div>
    <!-- Main content -->
-  <section class="content">
-    系统管理首页：system_index，content是页面定义的主要区域，
-    头部和底部内容以及导航栏都是通过模板继承的，之后的所有
-    功能前端页面都是在content内进行编辑。
-  </section>
+    <section class="invoice">
+        <div class="row">
+            <div class="col-xs-12">
+                <h2 class="page-header">
+                    <i class="fa fa-github"></i> RBAC权限管理历史版本
+                </h2>
+            </div>
+            <!-- /.col -->
+        </div>
+        <div class="row">

+            <div class="col-xs-12 table-responsive">
+          <table class="table table-striped">
+            <thead>
+            <tr>
+              <th>编号</th>
+              <th>TAG</th>
+              <th>发布日期</th>
+              <th>TAG地址</th>
+              <th>Commit</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+              <td>1</td>
+              <td>v1.19</td>
+              <td>2018-11-16</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.19</td>
+              <td>system config</td>
+            </tr>
+            <tr>
+              <td>2</td>
+              <td>v1.18</td>
+              <td>2018-11-16</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.18</td>
+              <td>rbac config</td>
+            </tr>
+            <tr>
+              <td>3</td>
+              <td>v1.17</td>
+              <td>2018-11-14</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.17</td>
+              <td>role2menu</td>
+            </tr>
+            <tr>
+              <td>4</td>
+              <td>v1.16</td>
+              <td>2018-11-14</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.17</td>
+              <td>role2user</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+        <!-- /.col -->
+        </div>
+      <!-- /.row -->
+        <div class="row">
+            <!-- accepted payments column -->
+            <div class="col-xs-12">
+              <p class="lead">其他信息：</p>
+
+              <p class="text-muted well well-sm no-shadow" style="margin-top: 10px;">
+                <strong>权限管理开发文档获取地址（知识星球）：</strong> https://t.zsxq.com/a6IqBMr (微信中打开链接)<br>
+                <strong>知识星球快捷入口：</strong>微信公众号搜索[知识星球]，关注后发送52824366，获取星球连接。<br>
+                <strong>知乎专栏SandBox：</strong>https://zhuanlan.zhihu.com/sandbox <br>
+                <strong>轻量级办公管理系统项目开源地址：</strong>https://github.com/RobbieHan/gistandard <br>
+              </p>
+            </div>
+            <!-- /.col -->
+        </div>
+    </section>
    <!-- /.content -->
+    <div class="clearfix"></div>

 {% endblock %}

--- a/templates/system/users/passwd_change.html
+++ b/templates/system/users/passwd_change.html
@@ -0,0 +1,95 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+{% endblock %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ user.id }}"/>
+            <input type="hidden" name='user' value="save"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>基本信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text" readonly="readonly"
+                                   value="{{ user.name }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">用户名</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control" name="username" readonly="readonly"
+                                   value="{{ user.username }}"/>
+                        </div>
+                    </div>
+
+                        <h4>密码信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="password" type="password" value=""/>
+                        </div>
+                        <label class="col-sm-2 control-label">确认密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="confirm_password" type="password" value=""/>
+                        </div>
+                    </div>
+
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">确定</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/combo-select/jquery.combo.select.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:basic-user-password_change' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.status == 'success') {
+                        layer.alert('密码修改成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll();
+                        });
+                    } else if (msg.status == 'fail') {
+                        layer.alert(msg.password_change_form_errors, {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        })
+
+
+    </script>
+
+{% endblock %}
--- a/templates/system/users/user.html
+++ b/templates/system/users/user.html
@@ -0,0 +1,404 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+<link rel="stylesheet" href="{% static 'plugins/datatables/jquery.dataTables.min.css' %}">
+<link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+{% endblock %}
+
+{% block content %}
+
+    <!-- Main content -->
+  <section class="content">
+
+    <div id="devlist">
+        <div class="box box-primary" id="liebiao">
+            <div class="box-header">
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnRefresh" class="btn btn-default">
+                        <i class="glyphicon glyphicon-repeat"></i>刷新
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnCreate" class="btn btn-default">
+                        <i class="glyphicon glyphicon-plus"></i>新增
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnDelete" class="btn btn-default">
+                        <i class="glyphicon glyphicon-trash"></i>删除
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnEnable" class="btn btn-default">
+                        <i class="glyphicon glyphicon-ok-circle"></i>启用
+                    </button>
+                    <button type="button" id="btnDisable" class="btn btn-default">
+                        <i class="glyphicon glyphicon-ban-circle"></i>禁用
+                    </button>
+                </div>
+                <div class="btn-group pull-right">
+                    <form class="form-inline">
+                        <div class="form-group">
+                            <label>用户状态：</label>
+                            <select id="select" name="select" class="form-control">
+                                <option style='text-align:center' value=''>-----所有-----</option>
+                                <option value="True">启用</option>
+                                <option value="False">禁用</option>
+                            </select>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div class="box-body">
+                <table id="dtbList" class="display" cellspacing="0" width="100%">
+                    <thead>
+                    <tr valign="middle">
+                        <th><input type="checkbox" id="checkAll"></th>
+                        <th>ID</th>
+                        <th>姓名</th>
+                        <th>性别</th>
+                        <th>手机</th>
+                        <th>邮箱</th>
+                        <th>部门</th>
+                        <th>职位</th>
+                        <th>上级</th>
+                        <th>状态</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+                <br> <br>
+            </div>
+        </div>
+    </div>
+  </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+{% block javascripts %}
+<script src="{% static 'plugins/datatables/jquery.dataTables.min.js' %}"></script>
+<script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
+<script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+
+<script type="text/javascript">
+    $(function () {
+        $('#SYSTEM-BASIC').addClass('active');
+        $('#SYSTEM-BASIC-USER').addClass('active');
+
+    });
+</script>
+
+<script type="text/javascript">
+    var oDataTable = null;
+    $(function () {
+        oDataTable = initTable();
+
+        function initTable() {
+            var oTable = $('#dtbList').DataTable($.extend(true, {},
+                DATATABLES_CONSTANT.DATA_TABLES.DEFAULT_OPTION,
+                {
+                    ajax: {
+                        "url": "{% url 'system:basic-user-list' %}",
+                        "data": function (d) {
+                            d.select = $("#select").val();
+                        }
+                    },
+                    columns: [
+                        DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+                        {
+                            data: "id",
+                            width: "5%",
+                        },
+                        {
+                            data: "name",//parent
+                            width: "10%",
+                        },
+                        {
+                            data: "gender",
+                            width: "10%",
+                            render: function (data, type, row, meta) {
+                                if (data == 'male') {
+                                    return "男";
+                                } else {
+                                    return "女";
+                                }
+                            }
+                        },
+                        {
+                            data: "mobile",
+                        },
+                        {
+                            data: "email",
+                        },
+                        {
+                            data: "department__name",
+                        },
+
+                        {
+                            data: "post",
+                        },
+                        {
+                            data: "superior__name",
+                        },
+                        {
+                            data: "is_active",
+                            render: function (data) {
+                                if (data == true) {
+                                    return "启用";
+                                } else {
+                                    return "禁用";
+                                }
+                            }
+                        },
+                        {
+                            data: "id",
+                            width: "12%",
+                            bSortable: "false",
+                            render: function (data, type, row, meta) {
+                                var ret = "";
+                                var ret = "<button title='详情-编辑' onclick='doUpdate("
+                                    + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                ret = ret + "<button name='btnChangepasswd' title='修改密码' onclick='doChangepasswd("
+                                    + data + ")'><i class='glyphicon glyphicon-asterisk'></i></button>";
+                                ret = ret + "<button name='btnConfig' title='删除' onclick='doDelete("
+                                    + data + ")'><i class='glyphicon glyphicon-trash'></i></button>";
+                                return ret;
+                            }
+                        }],
+                    "order": [
+                        [2, 'desc']
+                    ],
+                }));
+            return oTable;
+        }
+    });
+</script>
+<script type="text/javascript">
+    $("#btnCreate").click(function () {
+        var div = layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '720px'],
+            content: '/system/basic/user/create',
+            end: function () {
+                //关闭时做的事情
+                oDataTable.ajax.reload();
+            }
+        });
+        layer.full(div)
+    });
+
+            // 跳转到用户详情页面
+    function doUpdate(id) {
+        var div = layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '650px'],
+            content: ["{% url 'system:basic-user-detail' %}" + '?id=' + id, 'no'],
+            end: function () {
+                oDataTable.ajax.reload();
+            }
+        });
+        layer.full(div)
+    }
+
+    function doChangepasswd(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        shadeClose: false,
+        maxmin: true,
+        area: ['850px', '350px'],
+        content: ["{% url 'system:basic-user-password_change' %}" + '?id=' + id, 'no'],
+        end: function () {
+            oDataTable.ajax.reload();
+        }
+    });
+}
+
+//checkbox全选
+$("#checkAll").on("click", function () {
+    if ($(this).prop("checked") === true) {
+        $("input[name='checkList']").prop("checked", $(this).prop("checked"));
+        $('#example tbody tr').addClass('selected');
+    } else {
+        $("input[name='checkList']").prop("checked", false);
+        $('#example tbody tr').removeClass('selected');
+    }
+});
+
+//批量删除
+$("#btnDelete").click(function () {
+    if ($("input[name='checkList']:checked").length == 0) {
+        layer.msg("请选择要删除的记录");
+        return;
+    }
+
+    var arrId = new Array();
+    $("input[name='checkList']:checked").each(function () {
+        //alert($(this).val());
+        arrId.push($(this).val());
+    });
+
+    sId = arrId.join(',');
+
+    layer.alert('确定删除吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-delete' %}",
+                data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert("操作成功");
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert("操作失败");
+                    }
+                    return;
+                }
+            });
+        }
+    });
+});
+
+//批量启用
+$("#btnEnable").click(function () {
+    if ($("input[name='checkList']:checked").length == 0) {
+        layer.msg("请选择要启用的用户");
+        return;
+    }
+
+    var arrId = new Array();
+    $("input[name='checkList']:checked").each(function () {
+        //alert($(this).val());
+        arrId.push($(this).val());
+    });
+
+    sId = arrId.join(',');
+
+    layer.alert('确定启用吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-enable' %}",
+                data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert("启用用户成功", {icon: 1});
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert("启用用户失败", {icon: 5});
+                    }
+                    return;
+                }
+            });
+        }
+    });
+});
+
+//批量禁用
+$("#btnDisable").click(function () {
+    if ($("input[name='checkList']:checked").length == 0) {
+        layer.msg("请选择要禁用的用户");
+        return;
+    }
+
+    var arrId = new Array();
+    $("input[name='checkList']:checked").each(function () {
+        //alert($(this).val());
+        arrId.push($(this).val());
+    });
+
+    sId = arrId.join(',');
+
+    layer.alert('确定禁用吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-disable' %}",
+                data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert("禁用用户成功", {icon: 1});
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert("禁用用户失败", {icon: 5});
+                    }
+                    return;
+                }
+            });
+        }
+    });
+});
+
+//删除单个用户
+function doDelete(id) {
+    layer.alert('确定删除吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-delete' %}",
+                data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},  //防止post数据时报 csrf_token 403
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('删除成功', {icon: 1});
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert('删除失败', {icon: 5});
+                    }
+                    return;
+                }
+            });
+        }
+    });
+
+}
+
+$("#select").change(function () {
+    //alert($("#select").val())
+    oDataTable.ajax.reload();
+});
+
+</script>
+{% endblock %}
--- a/templates/system/users/user_create.html
+++ b/templates/system/users/user_create.html
@@ -0,0 +1,202 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+    <link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-datetimepicker.min.css' %}">
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ user.id }}"/>
+            <input type="hidden" name='user' value="save"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>基本信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text" value=""/>
+                        </div>
+                        <label class="col-sm-2 control-label">性别</label>
+                        <div class="col-sm-3">
+                            <select class="form-control" name="gender">
+                                <option value="male">男</option>
+                                <option value="famale">女</option>
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">生日</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="birthday"/>
+                        </div>
+                        <label class="col-sm-2 control-label">用户名</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control" name="username"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">状态</label>
+                        <div class="col-sm-6">
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="True" checked>启用
+                            </label>
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="False">禁用
+                            </label>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>密码信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="password" type="password" value=""/>
+                        </div>
+                        <label class="col-sm-2 control-label">确认密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="confirm_password" type="password" value=""/>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>联系信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">手机</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="mobile" type="text"/>
+                        </div>
+                        <label class="col-sm-2 control-label">邮箱</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="email" type="text"/>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>职员信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">入职日期</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="joined_date"/>
+                        </div>
+                        <label class="col-sm-2 control-label">部门</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="department">
+                                <option value="">--部门--</option>
+                                {% for structure in structures %}
+                                    <option value="{{ structure.id }}">{{ structure.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">岗位</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="post" type="text"/>
+                        </div>
+                        <label class="col-sm-2 control-label">上级</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="superior">
+                                <option value="">--上级--</option>
+                                {% for user in users %}
+                                    <option value="{{ user.id }}">{{ user.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">所属角色组</label>
+                        <div class="col-sm-6">
+                            {% for role in roles %}
+                                <label class="control-label">
+                                    <input type="checkbox" class="minimal" name="roles" value="{{ role.id }}"
+                                           {% if role in user_roles %}checked{% endif %}>
+                                    {{ role.name }}
+                                </label>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:basic-user-create' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.status == 'success') {
+                        layer.alert('用户添加成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else if (msg.status == 'fail') {
+                        layer.alert(msg.user_create_form_errors, {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        })
+
+        /*input 时间输入选择*/
+        $(".form_datetime").datetimepicker({
+            language: 'zh',
+            minView: 'month', //选择范围只到日期，不选择时分
+            //weekStart: 1,
+            //todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            //startView: 2,
+            forceParse: 0,
+            showMeridian: 1,
+            format: 'yyyy-mm-dd'
+        }).on('changeDate', function (ev) {
+            $(this).datetimepicker('hide');
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+    </script>
+
+{% endblock %}
--- a/templates/system/users/user_detail.html
+++ b/templates/system/users/user_detail.html
@@ -0,0 +1,192 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-datetimepicker.min.css' %}">
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ user.id }}"/>
+            <input type="hidden" name='user' value="save"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>基本信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text" value="{{ user.name }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">性别</label>
+                        <div class="col-sm-3">
+                            <select class="form-control" name="gender">
+                                <option value={{ user.gender }}> {{ user.get_gender_display }} </option>
+                                <option value="male">男</option>
+                                <option value="famale">女</option>
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">生日</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="birthday"
+                                   value="{{ user.birthday|date:"Y-m-d" }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">用户名</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control" name="username" readonly="readonly"
+                                   value="{{ user.username }}"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">状态</label>
+                        <div class="col-sm-6">
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="True"
+                                       {% ifequal user.is_active True %}checked{% endifequal %}>启用
+                            </label>
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="False"
+                                       {% ifequal user.is_active False %}checked{% endifequal %}>禁用
+                            </label>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4 clase="">联系信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">手机</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="mobile" readonly="readonly" type="text"
+                                   value="{{ user.mobile }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">邮箱</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="email" type="text" value="{{ user.email }}"/>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>职员信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">入职日期</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="joined_date"
+                                   value="{{ user.joined_date|date:"Y-m-d" }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">部门</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="department">
+                                <option value="{{ user.department.id }}">{{ user.department.name|default:"--部门--" }}</option>
+                                {% for structure in structures %}
+                                    <option value="{{ structure.id }}">{{ structure.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">岗位</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="post" type="text"
+                                   value="{{ user.post|default_if_none:"" }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">上级</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="superior">
+                                <option value="{{ user.superior.id }}">{{ user.superior.name|default:"--上级--" }}</option>
+                                {% for user in users %}
+                                    <option value="{{ user.id }}">{{ user.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">所属角色组</label>
+                        <div class="col-sm-6">
+                            {% for role in roles %}
+                                <label class="control-label">
+                                    <input type="checkbox" class="minimal" name="roles" value="{{ role.id }}"
+                                           {% if role in user_roles %}checked{% endif %}>
+                                    {{ role.name }}
+                                </label>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        })
+
+        /*input 时间输入选择*/
+        $(".form_datetime").datetimepicker({
+            language: 'zh',
+            minView: 'month',
+            //weekStart: 1,
+            //todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            //startView: 2,
+            forceParse: 0,
+            showMeridian: 1,
+            format: 'yyyy-mm-dd'
+        }).on('changeDate', function (ev) {
+            $(this).datetimepicker('hide');
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:basic-user-update' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.status == 'success') {
+                        layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else if (msg.status == 'fail') {
+                        layer.alert('数据保存失败', {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+            });
+    </script>
+{% endblock %}
Author	SHA1	Message	Date
RobbieHan	9d0bd95b69	device models	2019-01-03 20:54:17 +08:00
RobbieHan	4fbdc88743	scan config	2018-12-29 20:19:34 +08:00
RobbieHan	860ae14d4c	code management	2018-12-19 21:41:50 +08:00
RobbieHan	00f7112b67	logging	2018-12-15 15:34:27 +08:00
RobbieHan	ba936d7f9e	create cmdb app	2018-12-10 20:32:45 +08:00
RobbieHan	c399b77703	remove .idea	2018-11-27 12:11:16 +08:00
RobbieHan	894fe29e15	change to mysql	2018-11-27 01:05:11 +08:00
RobbieHan	602edea8f8	deployment setting	2018-11-26 21:10:43 +08:00
RobbieHan	9d149a6882	system config	2018-11-17 12:12:05 +08:00
RobbieHan	0b47673759	system config	2018-11-16 23:03:09 +08:00
RobbieHan	e2edef0af2	rbac config	2018-11-16 20:15:05 +08:00
RobbieHan	1f94ffa857	role2menu	2018-11-14 23:40:06 +08:00
RobbieHan	134ea4426f	role2user	2018-11-14 19:56:01 +08:00
RobbieHan	04d01aa273	role2uesr	2018-11-14 18:49:00 +08:00
RobbieHan	4570252f6d	role create&update&list	2018-11-14 13:44:27 +08:00
RobbieHan	0f6bd53883	menu update	2018-11-12 22:05:32 +08:00
RobbieHan	8c3158b18e	menu list	2018-11-10 19:36:12 +08:00
RobbieHan	1526767e87	menu create	2018-11-09 23:22:13 +08:00
RobbieHan	64a8fab611	user management	2018-11-06 12:42:31 +08:00
RobbieHan	45630bd451	structure2user	2018-10-23 19:10:55 +08:00
RobbieHan	b85d89642d	structure update & delete	2018-10-21 16:46:38 +08:00