Pārlūkot izejas kodu

/sso/Auth接口修改

jindi 1 gadu atpakaļ
vecāks
revīzija
a5faca3b63
3 mainītis faili ar 46 papildinājumiem un 185 dzēšanām
  1. 44 183
      .idea/workspace.xml
  2. 2 2
      src/main/resources/application.yml
  3. BIN
      xmnk-sso-1.0.jar

+ 44 - 183
.idea/workspace.xml

@@ -42,156 +42,8 @@
       <change afterPath="$PROJECT_DIR$/log/ssp-server/2023_08/2023_08_22/2023_08_22_18(0).log" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/log/ssp-server/2023_08/2023_08_23/2023_08_23_09(0).log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/pj/project/sso/SsoServerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/pj/project/sso/SsoServerController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/SspServerApplication.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/SaPlusStartup.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/config/MyConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/config/PerformConfigure.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/config/ProjectConfigure.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/config/RemoveDruidAdConfig$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/config/RemoveDruidAdConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/config/SystemObject.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/global/ApilogAspect.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/global/ApilogStartInterceptor$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/global/ApilogStartInterceptor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/global/GlobalExceptionHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/global/NotFoundHandle.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/mybatis/MybatisMapperDynamicLoader$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/mybatis/MybatisMapperDynamicLoader$Scanner.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/mybatis/MybatisMapperDynamicLoader.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/mybatis/MybatisStdOutImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/mybatis/RefConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/satoken/AuthConst.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/satoken/SaTokenConfigure.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/satoken/StpInterfaceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/current/satoken/StpUserUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sso/CustomSaSsoTemplate.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sso/SsoServerController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sta_data/StaDataController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sta_data/StaDataMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sta_data/StaDataMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client/SysClient.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client/SysClientController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client/SysClientMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client/SysClientMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client/SysClientUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client_visit/SysClientVisit.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client_visit/SysClientVisitController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client_visit/SysClientVisitMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client_visit/SysClientVisitMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_client_visit/SysClientVisitUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_login_log/SysLoginLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_login_log/SysLoginLogController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_login_log/SysLoginLogMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_login_log/SysLoginLogMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_login_log/SysLoginLogUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/HttpContextUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/ReadUserInfoExcel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/SysUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/SysUserController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/SysUserMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/SysUserMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/SysUserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/SysUserUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAcc.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAccController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAccMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAccMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAccService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAccUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_online/SysUserOnlineController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_password/SysUserPasswordService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_sync/Sm4Util.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_sync/brd/SspServerBrdUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_sync/listen/SspServerListenController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_sync/listen/SspServerListenUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/SP.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin/SpAdmin.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin/SpAdminController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin/SpAdminMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin/SpAdminMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin/SpAdminService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin/SpAdminUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4acc/SpAccAdminController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4acc/SpAccAdminService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4login/SpAdminLogin.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4login/SpAdminLoginController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4login/SpAdminLoginMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4login/SpAdminLoginMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4password/SpAdminPasswordController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/admin4password/SpAdminPasswordService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/apilog/SpApilog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/apilog/SpApilogControlle.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/apilog/SpApilogInsertTemplate.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/apilog/SpApilogMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/apilog/SpApilogMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/apilog/SpApilogUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/config/SpConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/config/SpConfigController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/config/SpConfigMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/config/SpConfigMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/config/SpConfigUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/menu/SpMenu.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/menu/SpMenuController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/menu/SpMenuMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/menu/SpMenuMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/menu/SpMenuUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/public4mapper/JdbcLambdaBegin.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/public4mapper/JdbcLambdaBeginRet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/public4mapper/JdbcLambdaRollback.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/public4mapper/JdbcLambdaRollbackRet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/public4mapper/PublicMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/public4mapper/PublicMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/public4mapper/PublicService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/redis4console/RedisConsoleController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/redis4console/RedisConsoleUtil$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/redis4console/RedisConsoleUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role/SpRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role/SpRoleController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role/SpRoleMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role/SpRoleMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role/SpRoleUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role4permission/SpRolePermissionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role4permission/SpRolePermissionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role4permission/SpRolePermissionMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/role4permission/SpRolePermissionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/test/TestController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/uploadfile/UploadConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/uploadfile/UploadController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project4sp/uploadfile/UploadUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/LogUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/Sugar.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/Ttime.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/VcUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/cache/RedisUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/sg/AjaxError.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/sg/AjaxJson.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/sg/IpCheckUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/sg/IpUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/sg/NbUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/sg/WebNbUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/utils/so/SoMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/banner.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/logo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/jquery.min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/layer.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/mobile/layer.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/mobile/need/layer.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/theme/default/icon-ext.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/theme/default/icon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/theme/default/layer.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/theme/default/loading-0.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/theme/default/loading-1.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/layer/theme/default/loading-2.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/login.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/sa-res/login.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/用户信息.xlsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/templates/login.html" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -320,7 +172,8 @@
       <workItem from="1693013189580" duration="18142000" />
       <workItem from="1693184212405" duration="1406000" />
       <workItem from="1693185743697" duration="31304000" />
-      <workItem from="1693357631965" duration="48314000" />
+      <workItem from="1693357631965" duration="52650000" />
+      <workItem from="1693564693922" duration="183000" />
     </task>
     <task id="LOCAL-00001" summary="项目提交">
       <created>1692754671570</created>
@@ -504,7 +357,14 @@
       <option name="project" value="LOCAL" />
       <updated>1693475651869</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="/sso/Auth接口修改">
+      <created>1693557067585</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1693557067585</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -526,7 +386,8 @@
     <MESSAGE value="登录页面接口调用server端" />
     <MESSAGE value="认证中心修改" />
     <MESSAGE value="应用端加device_type字段" />
-    <option name="LAST_COMMIT_MESSAGE" value="应用端加device_type字段" />
+    <MESSAGE value="/sso/Auth接口修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="/sso/Auth接口修改" />
   </component>
   <component name="WindowStateProjectService">
     <state x="2685" y="204" key="#com.intellij.ide.util.MemberChooser" timestamp="1692946298826">
@@ -541,10 +402,10 @@
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state x="2635" y="222" key="#xdebugger.evaluate/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693376744606" />
-    <state x="2544" y="170" key="CommitChangelistDialog2" timestamp="1693547341386">
+    <state x="2544" y="170" key="CommitChangelistDialog2" timestamp="1693557060677">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state x="2544" y="170" key="CommitChangelistDialog2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693547341386" />
+    <state x="2544" y="170" key="CommitChangelistDialog2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693557060677" />
     <state width="883" height="466" key="DebuggerActiveHint" timestamp="1693384339114">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
@@ -557,54 +418,54 @@
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state x="2660" y="275" key="FileChooserDialogImpl/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1692754343375" />
-    <state width="1877" height="220" key="GridCell.Tab.0.bottom" timestamp="1693556958266">
+    <state width="1877" height="269" key="GridCell.Tab.0.bottom" timestamp="1693565036119">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="220" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556958266" />
-    <state width="1877" height="220" key="GridCell.Tab.0.center" timestamp="1693556958266">
+    <state width="1877" height="269" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565036119" />
+    <state width="1877" height="269" key="GridCell.Tab.0.center" timestamp="1693565036119">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="220" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556958266" />
-    <state width="1877" height="220" key="GridCell.Tab.0.left" timestamp="1693556958266">
+    <state width="1877" height="269" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565036119" />
+    <state width="1877" height="269" key="GridCell.Tab.0.left" timestamp="1693565036119">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="220" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556958266" />
-    <state width="1877" height="220" key="GridCell.Tab.0.right" timestamp="1693556958266">
+    <state width="1877" height="269" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565036119" />
+    <state width="1877" height="269" key="GridCell.Tab.0.right" timestamp="1693565036119">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="220" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556958266" />
-    <state width="1877" height="300" key="GridCell.Tab.1.bottom" timestamp="1693556949882">
+    <state width="1877" height="269" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565036119" />
+    <state width="1877" height="269" key="GridCell.Tab.1.bottom" timestamp="1693565035861">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.1.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949882" />
-    <state width="1877" height="300" key="GridCell.Tab.1.center" timestamp="1693556949882">
+    <state width="1877" height="269" key="GridCell.Tab.1.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035861" />
+    <state width="1877" height="269" key="GridCell.Tab.1.center" timestamp="1693565035860">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.1.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949882" />
-    <state width="1877" height="300" key="GridCell.Tab.1.left" timestamp="1693556949882">
+    <state width="1877" height="269" key="GridCell.Tab.1.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035860" />
+    <state width="1877" height="269" key="GridCell.Tab.1.left" timestamp="1693565035860">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.1.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949882" />
-    <state width="1877" height="300" key="GridCell.Tab.1.right" timestamp="1693556949882">
+    <state width="1877" height="269" key="GridCell.Tab.1.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035860" />
+    <state width="1877" height="269" key="GridCell.Tab.1.right" timestamp="1693565035860">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.1.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949882" />
-    <state width="1877" height="300" key="GridCell.Tab.2.bottom" timestamp="1693556949883">
+    <state width="1877" height="269" key="GridCell.Tab.1.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035860" />
+    <state width="1877" height="269" key="GridCell.Tab.2.bottom" timestamp="1693565035861">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.2.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949883" />
-    <state width="1877" height="300" key="GridCell.Tab.2.center" timestamp="1693556949882">
+    <state width="1877" height="269" key="GridCell.Tab.2.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035861" />
+    <state width="1877" height="269" key="GridCell.Tab.2.center" timestamp="1693565035861">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.2.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949882" />
-    <state width="1877" height="300" key="GridCell.Tab.2.left" timestamp="1693556949882">
+    <state width="1877" height="269" key="GridCell.Tab.2.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035861" />
+    <state width="1877" height="269" key="GridCell.Tab.2.left" timestamp="1693565035861">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.2.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949882" />
-    <state width="1877" height="300" key="GridCell.Tab.2.right" timestamp="1693556949882">
+    <state width="1877" height="269" key="GridCell.Tab.2.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035861" />
+    <state width="1877" height="269" key="GridCell.Tab.2.right" timestamp="1693565035861">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="300" key="GridCell.Tab.2.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693556949882" />
+    <state width="1877" height="269" key="GridCell.Tab.2.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693565035861" />
     <state x="2636" y="231" key="RollbackChangesDialog" timestamp="1693013074093">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
@@ -613,14 +474,14 @@
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state x="2381" y="162" key="SettingsEditor/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1691549723160" />
-    <state x="2472" y="253" key="Vcs.Push.Dialog.v2" timestamp="1693475671272">
+    <state x="2472" y="253" key="Vcs.Push.Dialog.v2" timestamp="1693557076939">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state x="2472" y="253" key="Vcs.Push.Dialog.v2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693475671272" />
-    <state x="2560" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1693357698933">
+    <state x="2472" y="253" key="Vcs.Push.Dialog.v2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693557076939" />
+    <state x="2560" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1693564910971">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state x="2560" y="344" key="com.intellij.ide.util.TipDialog/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693357698933" />
+    <state x="2560" y="344" key="com.intellij.ide.util.TipDialog/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693564910971" />
     <state x="2672" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1693547334479">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>

+ 2 - 2
src/main/resources/application.yml

@@ -3,8 +3,8 @@ spring:
     application.name: xmnk-sso
     profiles: 
         # 启动环境加载,同时加载两个的写法:common,prod  优先级左>右
-#        active: dev
-        active: prod
+        active: dev
+#        active: prod
 
 # ================ 公共配置(优先级低于application-xxx.yml)  ================ 
     # mvc设置

BIN
xmnk-sso-1.0.jar