Ver código fonte

完善系统设置功能

huangyh 6 anos atrás
pai
commit
b78dedc675

+ 4 - 1
.gitignore

@@ -6,4 +6,7 @@ output
 logs
 data.db
 lastupdate.tmp
-web/*
+web/*
+vue/*
+*_gen.xml
+*_gen.go

+ 357 - 174
.idea/workspace.xml

@@ -5,56 +5,55 @@
       <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/gen/ApiController_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/gen/ApiController_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/gen/SsoController_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/gen/SsoController_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/gen/SysAttachmentController_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/gen/SysAttachmentController_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/gen/SystemController_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/gen/SystemController_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/partial/SystemController.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/partial/SystemController.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db/tree.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/engine/apiengine.go" beforeDir="false" afterPath="$PROJECT_DIR$/engine/apiengine.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/engine/system_init.go" beforeDir="false" afterPath="$PROJECT_DIR$/engine/system_init.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/entitys/ctrl_context.go" beforeDir="false" afterPath="$PROJECT_DIR$/entitys/ctrl_context.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/middleware/login_ware.go" beforeDir="false" afterPath="$PROJECT_DIR$/middleware/login_ware.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Filter.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/FilterField_gen.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Filter_gen.go" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/ColumnFilter_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/ColumnFilter_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/ColumnFilters_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/ColumnFilters_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/GetPageInfo_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/GetPageInfo_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/Join_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Join_gen.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Local_date.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Local_datetime.go" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/models/LoginInfo_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/LoginInfo_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/LoginReturnInfo_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/LoginReturnInfo_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/PageQueryParam_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/PageQueryParam_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/PageResult_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/PageResult_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SaveRoleMenu_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SaveRoleMenu_gen.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Sql_SysAttachment_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Sql_SysAttachment_gen.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Sql_SysMenu_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Sql_SysMenu_gen.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Sql_SysPermission.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Sql_SysPermission_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Sql_SysPermission_gen.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Sql_SysRolePermission_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Sql_SysRolePermission_gen.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Sql_SysUser_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Sql_SysUser_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/StorageResult_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/StorageResult_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysAttachment_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysAttachment_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/SysDomain_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysDomain_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysMenuTree_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysMenuTree_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysMenu_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysMenu_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysOrgTree_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysOrgTree_gen.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/SysOrganization_gen.go" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/SysOrg_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysOrg_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysPermission_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysPermission_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysReturn_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysReturn_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/SysRoleMenu_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysRoleMenu_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysRolePageInfo_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysRolePageInfo_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysRolePermission_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysRolePermission_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/SysRole_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysRole_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/SysUserPageInfo_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysUserPageInfo_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/SysUserRole_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysUserRole_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/SysUser_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/SysUser_gen.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/TreeNode_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/TreeNode_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/UserInfo_gen.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/UserInfo_gen.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/model.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/model.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/aip_doc.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/attachment.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/common.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/menu.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/org.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/role.go" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/routers/api.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/api.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/sso.go" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/routers/sso.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/sso.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/routers/sys_attachment.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/sys_attachment.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/routers/system.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/system.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/user.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/utils/filedb.go" beforeDir="false" afterPath="$PROJECT_DIR$/utils/filedb.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utils/utils.go" beforeDir="false" afterPath="$PROJECT_DIR$/utils/utils.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_attachment_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_attachment_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_domain_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_domain_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_menu_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_menu_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_org_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_org_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_permission_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_permission_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role_menu_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role_menu_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role_permission_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role_permission_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_user_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_user_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_user_role_gen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_user_role_gen.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_count.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_count.tpl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_select.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_select.tpl" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -63,7 +62,41 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/light-apiengine.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="151">
+              <caret line="142" column="31" selection-start-line="142" selection-start-column="23" selection-end-line="142" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/controllers/partial/SystemController.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-524">
+              <caret line="413" column="8" selection-start-line="413" selection-start-column="4" selection-end-line="413" selection-end-column="8" />
+              <folding>
+                <element signature="e#17#303#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/routers/system.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="208">
+              <caret line="22" column="32" selection-start-line="22" selection-start-column="32" selection-end-line="22" selection-end-column="32" />
+              <folding>
+                <element signature="e#18#215#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -74,19 +107,39 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>sys_attachmentController_upload</find>
-      <find>_menu</find>
-      <find>AddMenu</find>
-      <find>systemController_add_menu</find>
-      <find>_org</find>
-      <find>systemController_add_role</find>
-      <find>_role</find>
-      <find>_role_menu</find>
-      <find>systemController_find_role_menu</find>
-      <find>apiController_api_doc</find>
+      <find>RegisterSqlTemplate</find>
+      <find>page_r</find>
+      <find>org</find>
+      <find>sys_org</find>
+      <find>find_role_page</find>
+      <find>system/add_user</find>
+      <find>Page(</find>
+      <find>add_user</find>
+      <find>addU</find>
+      <find>delUser</find>
+      <find>get_org_tree</find>
+      <find>menu</find>
+      <find>menuP</find>
+      <find>get_menu_tree</find>
+      <find>findmenu</find>
+      <find>find_menu_page</find>
+      <find>FindRolePage</find>
+      <find>find</find>
+      <find>findO</find>
+      <find>sys_menu</find>
+      <find>updateM</find>
+      <find>Db.Update</find>
+      <find>sidebar</find>
+      <find>__none_func_system__</find>
+      <find>findMenu</find>
+      <find>create</find>
+      <find>add</find>
+      <find>addM</find>
+      <find>addUs</find>
+      <find>add_menu</find>
     </findStrings>
   </component>
-  <component name="GOROOT" path="$USER_HOME$/go" />
+  <component name="GOROOT" path="C:\Go" />
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -94,12 +147,9 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/utils/storage.go" />
-        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/middleware/login_ware.go" />
         <option value="$PROJECT_DIR$/controllers/partial/ApiController.go" />
         <option value="$PROJECT_DIR$/controllers/partial/SysAttachmentController.go" />
-        <option value="$PROJECT_DIR$/controllers/partial/SystemController.go" />
-        <option value="$PROJECT_DIR$/controllers/gen/SystemController_gen.go" />
         <option value="$PROJECT_DIR$/controllers/gen/SysAttachmentController_gen.go" />
         <option value="$PROJECT_DIR$/controllers/gen/ApiController_gen.go" />
         <option value="$PROJECT_DIR$/models/model.go" />
@@ -116,20 +166,34 @@
         <option value="$PROJECT_DIR$/controllers/gen/sso_controller_gen.go" />
         <option value="$PROJECT_DIR$/routers/sso.go" />
         <option value="$PROJECT_DIR$/main.go" />
+        <option value="$PROJECT_DIR$/sqlconfig/system_controller/system_sidebar.tpl" />
+        <option value="$PROJECT_DIR$/sqlconfig/system_controller/system_find_user_page_count.tpl" />
+        <option value="$PROJECT_DIR$/sqlconfig/sql_map/sys_role.xml" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role.xml" />
+        <option value="$PROJECT_DIR$/sqlconfig/system_controller/system_find_org_page_select.tpl" />
+        <option value="$PROJECT_DIR$/sqlconfig/system_controller/system_find_role_page_select.tpl" />
+        <option value="$PROJECT_DIR$/controllers/gen/SystemController_gen.go" />
+        <option value="$PROJECT_DIR$/sqlconfig/system_controller/system_find_user_page_select.tpl" />
+        <option value="$PROJECT_DIR$/utils/page_util.go" />
+        <option value="$PROJECT_DIR$/light-apiengine.xml" />
+        <option value="$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_select.tpl" />
+        <option value="$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_count.tpl" />
+        <option value="$PROJECT_DIR$/controllers/partial/SystemController.go" />
+        <option value="$PROJECT_DIR$/sqlconfig/light-apiengine/sys_menu.xml" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="y" value="20" />
     <option name="width" value="1440" />
-    <option name="height" value="814" />
+    <option name="height" value="815" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -137,10 +201,82 @@
               <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
               <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
+              <item name="sqlconfig" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
+              <item name="sqlconfig" type="462c0819:PsiDirectoryNode" />
+              <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="GOPATH &lt;light-apiengine&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="GOPATH &lt;light-apiengine&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="GOPATH &lt;light-apiengine&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="git.qianqiusoft.com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="GOPATH &lt;light-apiengine&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="git.qianqiusoft.com" type="462c0819:PsiDirectoryNode" />
+              <item name="qianqiusoft" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="GOPATH &lt;light-apiengine&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="git.qianqiusoft.com" type="462c0819:PsiDirectoryNode" />
+              <item name="qianqiusoft" type="462c0819:PsiDirectoryNode" />
+              <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="GOPATH &lt;light-apiengine&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="git.qianqiusoft.com" type="462c0819:PsiDirectoryNode" />
+              <item name="qianqiusoft" type="462c0819:PsiDirectoryNode" />
+              <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
+              <item name="sqlconfig" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="light-apiengine" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="GOPATH &lt;light-apiengine&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="git.qianqiusoft.com" type="462c0819:PsiDirectoryNode" />
+              <item name="qianqiusoft" type="462c0819:PsiDirectoryNode" />
+              <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
+              <item name="sqlconfig" type="462c0819:PsiDirectoryNode" />
+              <item name="light-apiengine" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -148,10 +284,10 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../ssm_backend" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="go" />
+    <property name="settings.editor.selected.configurable" value="watcher.settings" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -171,22 +307,34 @@
       </list>
     </option>
   </component>
+  <component name="RunManager">
+    <configuration name="go build main.go" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
+      <module name="light-apiengine" />
+      <working_directory value="$PROJECT_DIR$/" />
+      <go_parameters value="-i" />
+      <kind value="FILE" />
+      <filePath value="$PROJECT_DIR$/main.go" />
+      <output_directory value="$PROJECT_DIR$/" />
+      <method v="2" />
+    </configuration>
+  </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="814" extended-state="6" />
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26752505" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26675603" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3286119" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39943343" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32963988" />
+      <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.24220963" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="bottom" id="Docker" order="11" show_stripe_button="false" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -198,225 +346,260 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="UnknownFeatures">
+    <option featureType="com.intellij.fileTypeFactory" implementationName="*.tpl" />
+  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/utils/storage.go" />
-    <entry file="file://$PROJECT_DIR$/models/StorageResult_gen.go">
+    <entry file="file://$PROJECT_DIR$/models/Sql_SysMenu.go" />
+    <entry file="file://$PROJECT_DIR$/controllers/gen/SysAttachmentController_gen.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="24" selection-start-line="24" selection-end-line="24" />
+        <state relative-caret-position="240">
+          <caret line="16" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
+          <folding>
+            <element signature="e#14#210#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/token_store.go">
+    <entry file="file://$PROJECT_DIR$/models/Sql_SysAttachment_gen.go">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/utils.go">
+    <entry file="file://$PROJECT_DIR$/models/model.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+          <folding>
+            <element signature="e#17#142#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/gen/ApiController_gen.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="21" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="21" />
+          <folding>
+            <element signature="e#14#210#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/routers/router_gen.go" />
+    <entry file="file://$PROJECT_DIR$/routers/role.go" />
+    <entry file="file://$PROJECT_DIR$/routers/org.go" />
+    <entry file="file://$PROJECT_DIR$/routers/menu.go" />
+    <entry file="file://$PROJECT_DIR$/routers/attachment.go" />
+    <entry file="file://$PROJECT_DIR$/routers/aip_doc.go" />
+    <entry file="file://$PROJECT_DIR$/routers/user.go" />
+    <entry file="file://$PROJECT_DIR$/controllers/gen/sso_controller_gen.go" />
+    <entry file="file://$PROJECT_DIR$/controllers/partial/sso_controller.go" />
+    <entry file="file://$PROJECT_DIR$/controllers/partial/SysAttachmentController.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="436">
+          <caret line="145" column="48" selection-start-line="145" selection-start-column="48" selection-end-line="145" selection-end-column="48" />
+          <folding>
+            <element signature="n#!!block;n#SysAttachment_Upload#0" />
+            <element signature="n#!!block;n#SysAttachment_Download#0" />
+            <element signature="n#!!block;n#SysAttachment_Delete#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/iniconfig.go">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/filedb.go">
+    <entry file="file://$PROJECT_DIR$/config/config.go">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/http_util.go">
+    <entry file="file://$PROJECT_DIR$/main.go" />
+    <entry file="file://$PROJECT_DIR$/routers/sso.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-150" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/routers/sys_attachment.go">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/paths.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_get_org_tree.tpl">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/pwd.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_sidebar.tpl">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/safemap.go">
+    <entry file="file://$PROJECT_DIR$/controllers/partial/ApiController.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="16" column="7" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
-          <folding>
-            <element signature="e#628#646#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="450">
+          <caret line="23" column="11" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/entitys/ctrl_context.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_user_page_count.tpl">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="6" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
+        <state relative-caret-position="175">
+          <caret line="7" selection-start-line="7" selection-end-line="9" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/entitys/token.go">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/env/env.go">
+    <entry file="file://$PROJECT_DIR$/controllers/partial/SsoController.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-770" />
+        <state relative-caret-position="550">
+          <caret line="31" column="50" selection-start-line="31" selection-start-column="50" selection-end-line="31" selection-end-column="50" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/logs/logs.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/sql_map/sys_role.xml" />
+    <entry file="file://$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role_gen.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
+        <state relative-caret-position="275">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/UserInfo_gen.go">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/../../../github.com/xormplus/xorm/session_plus.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="218">
+          <caret line="152" column="49" selection-start-line="152" selection-start-column="49" selection-end-line="152" selection-end-column="60" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/Filter_gen.go" />
-    <entry file="file://$PROJECT_DIR$/models/Filter.go" />
-    <entry file="file://$PROJECT_DIR$/middleware/login_ware.go">
+    <entry file="file://$PROJECT_DIR$/../../../github.com/xormplus/xorm/engine.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        <state relative-caret-position="226">
+          <caret line="37" column="4" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/Sql_SysPermission.go" />
-    <entry file="file://$PROJECT_DIR$/models/Sql_SysOrg_gen.go">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/models/UserInfo_gen.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/Sql_SysMenu_gen.go">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="750">
+          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/SystemController.go_new" />
-    <entry file="file://$PROJECT_DIR$/wfclient/client.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_org_page_count.tpl" />
+    <entry file="file://$PROJECT_DIR$/controllers/partial/SystemController.go_new">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-          <folding>
-            <element signature="e#18#115#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="450">
+          <caret line="153" column="1" selection-start-line="132" selection-end-line="152" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wfclient/http.go">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/utils/page_util.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/Sql_SysMenu.go" />
-    <entry file="file://$PROJECT_DIR$/controllers/gen/SysAttachmentController_gen.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_role_page_count.tpl" />
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_role_page_select.tpl" />
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_org_page_select.tpl" />
+    <entry file="file://$PROJECT_DIR$/controllers/gen/SystemController_gen.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
+        <state relative-caret-position="675">
+          <caret line="32" column="22" selection-start-line="32" selection-start-column="22" selection-end-line="32" selection-end-column="22" />
           <folding>
-            <element signature="e#14#210#0" expanded="true" />
+            <element signature="e#14#240#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/partial/SystemController.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_user_page_select.tpl">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="426">
-          <caret line="938" column="42" selection-start-line="938" selection-start-column="42" selection-end-line="938" selection-end-column="42" />
+        <state relative-caret-position="225">
+          <caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/Sql_SysAttachment_gen.go">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_select.tpl">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="13" selection-start-line="13" selection-end-line="15" selection-end-column="7" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/model.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/system_controller/system_find_menu_page_count.tpl">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
-          <folding>
-            <element signature="e#17#142#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="375">
+          <caret line="15" column="7" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/gen/ApiController_gen.go">
+    <entry file="file://$PROJECT_DIR$/light-apiengine.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="21" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="21" />
-          <folding>
-            <element signature="e#14#210#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="151">
+          <caret line="142" column="31" selection-start-line="142" selection-start-column="23" selection-end-line="142" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routers/router_gen.go" />
-    <entry file="file://$PROJECT_DIR$/routers/system.go">
+    <entry file="file://$PROJECT_DIR$/engine/system_init.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" selection-start-line="19" selection-end-line="19" />
-          <folding>
-            <element signature="e#17#152#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1746">
+          <caret line="128" column="39" selection-start-line="128" selection-start-column="39" selection-end-line="128" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/light-apiengine/sys_menu_gen.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" />
-          <folding>
-            <element signature="e#18#116#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="200">
+          <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="22" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routers/role.go" />
-    <entry file="file://$PROJECT_DIR$/routers/org.go" />
-    <entry file="file://$PROJECT_DIR$/routers/menu.go" />
-    <entry file="file://$PROJECT_DIR$/routers/attachment.go" />
-    <entry file="file://$PROJECT_DIR$/routers/aip_doc.go" />
-    <entry file="file://$PROJECT_DIR$/routers/user.go" />
-    <entry file="file://$PROJECT_DIR$/routers/sso.go" />
-    <entry file="file://$PROJECT_DIR$/controllers/gen/sso_controller_gen.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/light-apiengine/sys_role.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="703">
-          <caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" />
-          <folding>
-            <element signature="e#14#210#0" expanded="true" />
-          </folding>
+        <state>
+          <caret selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/partial/sso_controller.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/light-apiengine/sys_menu.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
-          <folding>
-            <element signature="e#18#87#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="50">
+          <caret line="2" column="39" selection-start-line="2" selection-start-column="39" selection-end-line="2" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/partial/ApiController.go">
+    <entry file="file://$PROJECT_DIR$/routers/system.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="8" column="10" selection-end-line="28" />
+        <state relative-caret-position="208">
+          <caret line="22" column="32" selection-start-line="22" selection-start-column="32" selection-end-line="22" selection-end-column="32" />
           <folding>
-            <element signature="e#18#87#0" expanded="true" />
+            <element signature="e#18#215#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/gen/SystemController_gen.go">
+    <entry file="file://$PROJECT_DIR$/sqlconfig/light-apiengine/sys_org_gen.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="57">
-          <caret line="8" column="1" selection-end-line="287" />
+        <state>
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.go">
+    <entry file="file://$PROJECT_DIR$/vue/api/modules/system/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="7" column="14" lean-forward="true" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
-          <folding>
-            <element signature="e#14#141#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="101">
+          <caret line="206" column="16" selection-start-line="204" selection-end-line="213" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/partial/SysAttachmentController.go">
+    <entry file="file://$PROJECT_DIR$/controllers/partial/SystemController.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="145" column="48" selection-start-line="145" selection-start-column="48" selection-end-line="145" selection-end-column="48" />
+        <state relative-caret-position="-524">
+          <caret line="413" column="8" selection-start-line="413" selection-start-column="4" selection-end-line="413" selection-end-column="8" />
           <folding>
-            <element signature="n#!!block;n#SysAttachment_Upload#0" />
-            <element signature="n#!!block;n#SysAttachment_Download#0" />
-            <element signature="n#!!block;n#SysAttachment_Delete#0" />
+            <element signature="e#17#303#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 48 - 16
controllers/partial/SystemController.go

@@ -143,7 +143,10 @@ func System_FindOrgPage(c *entitys.CtrlContext) {
 // @Failure 403 :id is empty
 func System_AddUser(c *entitys.CtrlContext) {
 	var user sysmodel.SysUser
-	c.Ctx.BindJSON(&user)
+	err := c.Ctx.BindJSON(&user)
+	if err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+	}
 	fmt.Println(user.LoginId, "-----add user-----", user.Password, " --- ", user.OrgId)
 	//查找login_id是否存在
 	oldUser := new(sysmodel.SysUser)
@@ -170,7 +173,7 @@ func System_AddUser(c *entitys.CtrlContext) {
 	user.LastUpdateBy = user_id
 	user.DelFlag = 0
 	user.Password = sysutils.HashPassword(user.Password, "")
-	_, err := c.Db.Insert(&user)
+	_, err = c.Db.Insert(&user)
 	ret := __none_func_system__(user.LoginId, user.Password, user.OrgId, user.Email)
 	if ret && err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
@@ -228,16 +231,20 @@ func System_DelUser(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateUser(c *entitys.CtrlContext) {
-	login_id := c.Ctx.Query("login_id")
-	password := c.Ctx.Query("password")
-	org_id := c.Ctx.Query("org_id")
-	email := c.Ctx.Query("email")
+	var user sysmodel.SysUser
+	err := c.Ctx.BindJSON(&user)
 
-	ret := __none_func_system__(login_id, password, org_id, email)
-	if ret {
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	_, err = c.Db.SqlMapClient("update_sys_user", &user).Execute()
+
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -326,7 +333,11 @@ func System_FindMenuPage(c *entitys.CtrlContext) {
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
+	name := c.Ctx.DefaultQuery("name", "")
+	code := c.Ctx.DefaultQuery("code", "")
+	cn_id := c.Ctx.DefaultQuery("cn_id", "")
+
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "name": name, "code": code, "cn_id": cn_id}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_menu_page", "sys_menu", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
@@ -409,11 +420,33 @@ func System_FindPermissions(c *entitys.CtrlContext) {
 func System_AddMenu(c *entitys.CtrlContext) {
 	var paramObj0 models.SysMenu
 	c.Ctx.BindJSON(&paramObj0)
-	ret := __none_func_system__(paramObj0)
-	if ret {
+
+	tk, _ := c.Ctx.Get("token")
+	user := tk.(*entitys.Token)
+
+	paramObj0.Id = sysutils.NewUUID()
+	paramObj0.Domain = user.Domain
+	paramObj0.CreateBy = user.UserId
+	paramObj0.LastUpdateBy = user.UserId
+	paramObj0.CreateTime = time.Now()
+	paramObj0.LastUpdateDate = time.Now()
+	paramObj0.DelFlag = 0
+
+	parentNodes := []sysmodel.SysMenu{}
+	err := c.Db.SqlMapClient("one_sys_menu", paramObj0.Parent).Find(&parentNodes)
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	paramObj0.Inheritance = fmt.Sprintf("|%s%s", paramObj0.Id, parentNodes[0].Inheritance)
+
+	_, err = c.Db.SqlMapClient("insert_sys_menu", &paramObj0).Execute()
+
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -444,10 +477,9 @@ func System_UpdateMenu(c *entitys.CtrlContext) {
 	var paramObj0 models.SysMenu
 	c.Ctx.BindJSON(&paramObj0)
 
-	c.Db.SqlMapClient("update_sys_menu", paramObj0)
+	_, err := c.Db.SqlMapClient("update_sys_menu", paramObj0).Execute()
 
-	ret := __none_func_system__(paramObj0)
-	if ret {
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})

+ 5 - 5
sqlconfig/light-apiengine/sys_menu_gen.xml

@@ -2,13 +2,13 @@
 <sqlMap>
     <sql id="insert_sys_menu">
         insert into sys_menu
-		(`id`,`name`,`code`,`parent`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`)
+		(`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`)
 		values
-		(?id,?name,?code,?parent,?url,?component,?perms,?type,?icon,?order_num,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
+		(?id,?name,?code,?parent,?inheritance,?url,?component,?perms,?type,?icon,?order_num,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
     </sql>
     <sql id="update_sys_menu">
         update sys_menu set
-		`name` = ?name,`code` = ?code,`parent` = ?parent,`url` = ?url,`component` = ?component,`perms` = ?perms,`type` = ?type,`icon` = ?icon,`order_num` = ?order_num,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag
+		`name` = ?name,`code` = ?code,`parent` = ?parent,`inheritance` = ?inheritance,`url` = ?url,`component` = ?component,`perms` = ?perms,`type` = ?type,`icon` = ?icon,`order_num` = ?order_num,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag
 		where id = ?id
     </sql>
     <sql id="deleteone_sys_menu">
@@ -17,13 +17,13 @@
     </sql>
     <sql id="selectone_sys_menu">
         select 
-			`id`,`name`,`code`,`parent`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`
+			`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`
         from sys_menu
 		where id = ?id
     </sql>
     <sql id="selectall_sys_menu">
         select 
-			`id`,`name`,`code`,`parent`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`
+			`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`
         from sys_menu
     </sql>
 </sqlMap>

+ 9 - 0
sqlconfig/system_controller/system_find_menu_page_count.tpl

@@ -5,3 +5,12 @@ from
     sys_menu
 where
 	del_flag = 0
+{{if ne .name ""}}
+    and .name like '%{{.name}}%'
+{{end}}
+{{if ne .code ""}}
+    and code like '%{{.code}}%'
+{{end}}
+{{if ne .cn_id ""}}
+    and inheritance like '%{{.cn_id}}%'
+{{end}}

+ 9 - 0
sqlconfig/system_controller/system_find_menu_page_select.tpl

@@ -5,4 +5,13 @@ from
     sys_menu
 where
     del_flag = 0
+{{if ne .name ""}}
+    and .name like '%{{.name}}%'
+{{end}}
+{{if ne .code ""}}
+    and code like '%{{.code}}%'
+{{end}}
+{{if ne .cn_id ""}}
+    and inheritance like '%{{.cn_id}}%'
+{{end}}
 LIMIT {{.rows}} OFFSET {{.offset}}