From 3c6a77ff778ee7af5c9f36fae2285878bfd1352b Mon Sep 17 00:00:00 2001
From: haozq <123456>
Date: Wed, 28 Feb 2024 10:08:05 +0800
Subject: [PATCH] service

---
 .idea/workspace.xml | 154 ++++++++++++++++++++++++++++----------------
 1 file changed, 100 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8a3124c..15dd56b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AnalysisUIOptions">
-    <option name="SPLITTER_PROPORTION" value="0.3937397" />
+    <option name="SPLITTER_PROPORTION" value="0.4321745" />
     <option name="GROUP_BY_SEVERITY" value="true" />
   </component>
   <component name="BranchesTreeState">
     <expand>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
       <path>
         <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
         <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
@@ -20,36 +16,27 @@
         <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
       </path>
     </expand>
-    <select />
+    <select>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+    </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="38edcd87-ada4-4894-a064-a836269e71e4" name="Default Changelist" comment="基础模块修改">
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/securityControl-gateway/error.log" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/securityControl-gateway/info.log" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/LoginController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/LoginMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/LoginServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/LoginMapper.xml" afterDir="false" />
+    <list default="true" id="38edcd87-ada4-4894-a064-a836269e71e4" name="Default Changelist" comment="代码规范修改">
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/7338d6d7-5678-4ce5-bd73-ff00416d95fe.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/7338d6d7-5678-4ce5-bd73-ff00416d95fe.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_20_18_10__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_20_18_10__Default_Changelist_.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_21_16_05__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_21_16_05__Default_Changelist_.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_23_10_30__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_2_23_10_30__Default_Changelist_.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/securityControl-auth/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/securityControl-auth/error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/securityControl-auth/info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/securityControl-auth/info.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/securityControl-system/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/securityControl-system/error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/securityControl-system/info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/securityControl-system/info.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/RemoteUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/RemoteUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/domain/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/domain/SysUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/factory/RemoteUserFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/factory/RemoteUserFallbackFactory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-auth/src/main/java/com/securitycontrol/auth/controller/TokenController.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-auth/src/main/java/com/securitycontrol/auth/controller/TokenController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-auth/src/main/resources/bootstrap.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/ServiceNameConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/ServiceNameConstants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/enums/UserStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/enums/UserStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/service/TokenService.java" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/service/TokenService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-gateway/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-gateway/src/main/resources/bootstrap.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/securitycontrol-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/securitycontrol-system.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/securitycontrol-auth/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-auth/target/classes/bootstrap.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/StringUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/StringUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/aes/ListHelper.class" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/aes/ListHelper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/poi/ExcelUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/poi/ExcelUtil.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/reflect/ReflectUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-core/target/classes/com/securitycontrol/common/core/utils/reflect/ReflectUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-security/target/classes/com/securitycontrol/common/security/aspect/InnerAuthAspect.class" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-commons/securitycontrol-commons-security/target/classes/com/securitycontrol/common/security/aspect/InnerAuthAspect.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/securitycontrol-gateway/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/securitycontrol-gateway/target/classes/bootstrap.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -99,8 +86,16 @@
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.securitycontrol.entity.system.vo" />
+      <recent name="com.securitycontrol.common.core.utils.aes" />
+      <recent name="com.securitycontrol.entity.system.dto" />
+      <recent name="com.securitycontrol.system.mapper" />
+      <recent name="com.securitycontrol.system.controller" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="E:\ideaWorkspace\ah_jjzhgd_service\securitycontrol-model\securitycontrol-system\src\main\resources\mapper" />
+      <recent name="E:\ideaWorkspace\ah_jjzhgd_service\securitycontrol-model\securitycontrol-system\src\main\java\com\securitycontrol\system\service" />
       <recent name="E:\ideaWorkspace\ah_jjzhgd_service\securitycontrol-commons\securitycontrol-commons-log\src\main" />
     </key>
   </component>
@@ -110,6 +105,13 @@
       <command value="mvn install" />
     </option>
   </component>
+  <component name="RunDashboard">
+    <option name="configurationTypes">
+      <set>
+        <option value="SpringBootApplicationConfigurationType" />
+      </set>
+    </option>
+  </component>
   <component name="RunManager" selected="Spring Boot.VscSystemApplication">
     <configuration name="SecurityUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.securitycontrol.common.security.utils.SecurityUtils" />
@@ -184,7 +186,35 @@
       <option name="project" value="LOCAL" />
       <updated>1708412455494</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="基础模块修改">
+      <created>1709084110972</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1709084110972</updated>
+    </task>
+    <task id="LOCAL-00005" summary="基础模块修改">
+      <created>1709084441246</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1709084441246</updated>
+    </task>
+    <task id="LOCAL-00006" summary="字典下拉选">
+      <created>1709084610454</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1709084610454</updated>
+    </task>
+    <task id="LOCAL-00007" summary="代码规范修改">
+      <created>1709085101907</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1709085101907</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -193,6 +223,11 @@
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
+        <entry key="1">
+          <value>
+            <State />
+          </value>
+        </entry>
         <entry key="MAIN">
           <value>
             <State />
@@ -200,12 +235,15 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="初始化修改" />
     <MESSAGE value="基础模块修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="基础模块修改" />
+    <MESSAGE value="字典下拉选" />
+    <MESSAGE value="代码规范修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="代码规范修改" />
   </component>
   <component name="WindowStateProjectService">
     <state x="552" y="178" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1708417712806">
@@ -224,38 +262,42 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="454" height="466" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1708422708907" />
-    <state width="1877" height="354" key="GridCell.Tab.0.bottom" timestamp="1708423510888">
+    <state x="740" y="275" key="FileChooserDialogImpl" timestamp="1709083941870">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1708423510888" />
-    <state width="1877" height="354" key="GridCell.Tab.0.center" timestamp="1708423510888">
+    <state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1709083941870" />
+    <state width="938" height="322" key="GridCell.Tab.0.bottom" timestamp="1709086030420">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1708423510888" />
-    <state width="1877" height="354" key="GridCell.Tab.0.left" timestamp="1708423510888">
+    <state width="938" height="322" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
+    <state width="938" height="322" key="GridCell.Tab.0.center" timestamp="1709086030420">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1708423510888" />
-    <state width="1877" height="354" key="GridCell.Tab.0.right" timestamp="1708423510888">
+    <state width="938" height="322" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
+    <state width="938" height="322" key="GridCell.Tab.0.left" timestamp="1709086030420">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1708423510888" />
-    <state width="1877" height="354" key="GridCell.Tab.1.bottom" timestamp="1708423547572">
+    <state width="938" height="322" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
+    <state width="938" height="322" key="GridCell.Tab.0.right" timestamp="1709086030420">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1708423547572" />
-    <state width="1877" height="354" key="GridCell.Tab.1.center" timestamp="1708423547572">
+    <state width="938" height="322" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
+    <state width="938" height="322" key="GridCell.Tab.1.bottom" timestamp="1709086030420">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1708423547572" />
-    <state width="1877" height="354" key="GridCell.Tab.1.left" timestamp="1708423547572">
+    <state width="938" height="322" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
+    <state width="938" height="322" key="GridCell.Tab.1.center" timestamp="1709086030420">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1708423547572" />
-    <state width="1877" height="354" key="GridCell.Tab.1.right" timestamp="1708423547572">
+    <state width="938" height="322" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
+    <state width="938" height="322" key="GridCell.Tab.1.left" timestamp="1709086030420">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="354" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1708423547572" />
+    <state width="938" height="322" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
+    <state width="938" height="322" key="GridCell.Tab.1.right" timestamp="1709086030420">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="938" height="322" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1709086030420" />
     <state width="1877" height="302" key="GridCell.Tab.2.bottom" timestamp="1708423510619">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -272,18 +314,22 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="302" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1708423510618" />
-    <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1708412461493">
+    <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1709085106802">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1708412461493" />
+    <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1709085106802" />
     <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1708421653893">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1708421653893" />
-    <state x="753" y="433" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1708409810755">
+    <state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1709085003965">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="753" y="433" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1708409810755" />
+    <state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1709085003965" />
+    <state x="753" y="433" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1709085179512">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="753" y="433" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1709085179512" />
     <state x="616" y="240" width="672" height="677" key="run.anything.popup" timestamp="1708423352732">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>