项目提交

.idea/workspace.xml

@@ -42,156 +42,12 @@
       <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/java/com/pj/project/sys_user/SysUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/pj/project/sys_user/SysUserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/pj/project/sys_user/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/pj/project/sys_user/SysUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/pj/project/sys_user_acc/SysUserAccController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/pj/project/sys_user_acc/SysUserAccController.java" afterDir="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/com/pj/project/sys_user/SysUserMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user/SysUserMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAccController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/pj/project/sys_user_acc/SysUserAccController.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -334,7 +190,8 @@
       <workItem from="1694170221068" duration="88000" />
       <workItem from="1694224377178" duration="4330000" />
       <workItem from="1694240006247" duration="12587000" />
-      <workItem from="1694394248081" duration="29779000" />
+      <workItem from="1694394248081" duration="29867000" />
+      <workItem from="1694481115716" duration="4425000" />
     </task>
     <task id="LOCAL-00001" summary="项目提交">
       <created>1692754671570</created>
@@ -567,7 +424,14 @@
       <option name="project" value="LOCAL" />
       <updated>1694429823236</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="项目提交">
+      <created>1694432056584</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1694432056584</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -607,10 +471,10 @@
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state x="2635" y="222" width="1024" height="595" key="#xdebugger.evaluate/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694402260583" />
-    <state x="2544" y="170" key="CommitChangelistDialog2" timestamp="1694429817699">
+    <state x="2544" y="170" key="CommitChangelistDialog2" timestamp="1694432050900">
       <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="1694429817699" />
+    <state x="2544" y="170" key="CommitChangelistDialog2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432050900" />
     <state width="1444" height="466" key="DebuggerActiveHint" timestamp="1694418699725">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
@@ -623,54 +487,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="1694249944928" />
-    <state width="1877" height="220" key="GridCell.Tab.0.bottom" timestamp="1694432021150">
+    <state width="1877" height="220" key="GridCell.Tab.0.bottom" timestamp="1694489679251">
       <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="1694432021150" />
-    <state width="1877" height="220" key="GridCell.Tab.0.center" timestamp="1694432021149">
+    <state width="1877" height="220" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489679251" />
+    <state width="1877" height="220" key="GridCell.Tab.0.center" timestamp="1694489679251">
       <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="1694432021149" />
-    <state width="1877" height="220" key="GridCell.Tab.0.left" timestamp="1694432021149">
+    <state width="1877" height="220" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489679251" />
+    <state width="1877" height="220" key="GridCell.Tab.0.left" timestamp="1694489679251">
       <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="1694432021149" />
-    <state width="1877" height="220" key="GridCell.Tab.0.right" timestamp="1694432021150">
+    <state width="1877" height="220" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489679251" />
+    <state width="1877" height="220" key="GridCell.Tab.0.right" timestamp="1694489679251">
       <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="1694432021150" />
-    <state width="1877" height="218" key="GridCell.Tab.1.bottom" timestamp="1694432005403">
+    <state width="1877" height="220" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489679251" />
+    <state width="1877" height="218" key="GridCell.Tab.1.bottom" timestamp="1694489670954">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.1.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005403" />
-    <state width="1877" height="218" key="GridCell.Tab.1.center" timestamp="1694432005402">
+    <state width="1877" height="218" key="GridCell.Tab.1.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670954" />
+    <state width="1877" height="218" key="GridCell.Tab.1.center" timestamp="1694489670954">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.1.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005402" />
-    <state width="1877" height="218" key="GridCell.Tab.1.left" timestamp="1694432005402">
+    <state width="1877" height="218" key="GridCell.Tab.1.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670954" />
+    <state width="1877" height="218" key="GridCell.Tab.1.left" timestamp="1694489670954">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.1.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005402" />
-    <state width="1877" height="218" key="GridCell.Tab.1.right" timestamp="1694432005403">
+    <state width="1877" height="218" key="GridCell.Tab.1.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670954" />
+    <state width="1877" height="218" key="GridCell.Tab.1.right" timestamp="1694489670954">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.1.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005403" />
-    <state width="1877" height="218" key="GridCell.Tab.2.bottom" timestamp="1694432005403">
+    <state width="1877" height="218" key="GridCell.Tab.1.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670954" />
+    <state width="1877" height="218" key="GridCell.Tab.2.bottom" timestamp="1694489670955">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.2.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005403" />
-    <state width="1877" height="218" key="GridCell.Tab.2.center" timestamp="1694432005403">
+    <state width="1877" height="218" key="GridCell.Tab.2.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670955" />
+    <state width="1877" height="218" key="GridCell.Tab.2.center" timestamp="1694489670954">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.2.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005403" />
-    <state width="1877" height="218" key="GridCell.Tab.2.left" timestamp="1694432005403">
+    <state width="1877" height="218" key="GridCell.Tab.2.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670954" />
+    <state width="1877" height="218" key="GridCell.Tab.2.left" timestamp="1694489670954">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.2.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005403" />
-    <state width="1877" height="218" key="GridCell.Tab.2.right" timestamp="1694432005403">
+    <state width="1877" height="218" key="GridCell.Tab.2.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670954" />
+    <state width="1877" height="218" key="GridCell.Tab.2.right" timestamp="1694489670954">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="218" key="GridCell.Tab.2.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432005403" />
+    <state width="1877" height="218" key="GridCell.Tab.2.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694489670954" />
     <state x="2636" y="231" key="RollbackChangesDialog" timestamp="1694401544807">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
@@ -679,18 +543,18 @@
       <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="1694170307639" />
-    <state x="2472" y="253" key="Vcs.Push.Dialog.v2" timestamp="1694429829164">
+    <state x="2472" y="253" key="Vcs.Push.Dialog.v2" timestamp="1694432062523">
       <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="1694429829164" />
+    <state x="2472" y="253" key="Vcs.Push.Dialog.v2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694432062523" />
     <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1693907767752">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="968" height="528" key="XDebugger.FullValuePopup/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1693907767752" />
-    <state x="2560" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1694394251710">
+    <state x="2560" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1694481115769">
       <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="1694394251710" />
+    <state x="2560" y="344" key="com.intellij.ide.util.TipDialog/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1694481115769" />
     <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>

src/main/java/com/pj/project/sys_user/SysUserMapper.java

@@ -30,6 +30,9 @@ public interface SysUserMapper {
 	 */
 	int update(SysUser s);
 
+
+	int updateById(SysUser s);
+
 	/** 
 	 * 查 - 根据id  
 	 * @param id 要查询的数据id 

src/main/java/com/pj/project/sys_user/SysUserMapper.xml

@@ -19,12 +19,25 @@
 		age = #{age}, 
 		sex = #{sex}, 
 		phone = #{phone}, 
-		email = #{email}, 
+		email = #{email},
 		is_admin = #{isAdmin},
 		status = #{status}
 		where id = #{id}
 	</update>
 
+    <!-- 改 -->
+    <update id="updateById">
+		update sys_user set
+		name = #{name},
+		avatar = #{avatar},
+		intro = #{intro},
+		age = #{age},
+		sex = #{sex},
+		phone = #{phone},
+		email = #{email}
+		where id = #{id}
+	</update>
+
     <!-- ================================== 查询相关 ================================== -->
 
     <!-- 通用映射：手动模式 -->

src/main/java/com/pj/project/sys_user_acc/SysUserAccController.java

@@ -1,15 +1,15 @@
 package com.pj.project.sys_user_acc;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.spring.SpringMVCUtil;
 import cn.dev33.satoken.sso.SaSsoTemplate;
-import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.pj.current.config.SystemObject;
-import com.pj.project.sys_client.SysClientUtil;
 import com.pj.project.sys_login_log.SysLoginLog;
 import com.pj.project.sys_login_log.SysLoginLogUtil;
+import com.pj.project.sys_user.SysUserMapper;
 import com.pj.utils.sg.IpUtil;
 import com.pj.utils.so.SoMap;
 import eu.bitwalker.useragentutils.UserAgent;
@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.pj.current.satoken.StpUserUtil;
@@ -32,7 +31,6 @@ import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.sg.NbUtil;
 
 import javax.servlet.http.HttpServletRequest;
-import java.net.URLDecoder;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +54,9 @@ public class SysUserAccController {
     @Autowired
     private SaSsoTemplate saSsoTemplate;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     // -------------------------- 登录相关 --------------------------
 
     /**
@@ -202,6 +203,45 @@ public class SysUserAccController {
         return AjaxJson.getSuccess();
     }
 
+    /**
+     * 查 - 根据id
+     */
+    @RequestMapping("getById")
+    public AjaxJson getById(@RequestBody String jsonBody) {
+        JSONObject jsonObject = JSON.parseObject(jsonBody);
+        String id = (String) jsonObject.get("id");
+        if (StringUtil.isNullOrEmpty(id)){
+            return AjaxJson.getError("该用户不存在");
+        }
+        SysUser s = sysUserMapper.getById(id);
+        if (!StringUtil.isNullOrEmpty(s.getAvatar())) {
+            s.setAvatar(getDoMain() + s.getAvatar());
+        }
+        return AjaxJson.getSuccessData(s);
+    }
+
+    /**
+     * 修改个人信息
+     */
+    @RequestMapping("update")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxJson update(@RequestBody SysUser s) {
+        if (StringUtil.isNullOrEmpty(s.getId())){
+            return AjaxJson.getError("该用户不存在");
+        }
+        if (!StringUtil.isNullOrEmpty(s.getAvatar())) {
+            s.setAvatar(s.getAvatar().replaceAll(getDoMain(), ""));
+        }
+        int line = sysUserMapper.updateById(s);
+        if (line>0){
+            //  返回
+            return AjaxJson.getSuccess();
+        }else {
+            return AjaxJson.getError("更新个人信息失败");
+        }
+    }
+
+
     // 返回指定账号登录信息 
     private AjaxJson successLoginInfo(String userId) {
 
@@ -242,4 +282,11 @@ public class SysUserAccController {
                 .set("tokenInfo", StpUserUtil.getTokenInfo());  // token信息 
     }
 
+    /**
+     * 返回本服务器域名信息
+     */
+    static String getDoMain() {
+        return SystemObject.config.getDomain();
+    }
+
 }

target/classes/com/pj/project/sys_user/SysUserMapper.xml

@@ -19,12 +19,25 @@
 		age = #{age}, 
 		sex = #{sex}, 
 		phone = #{phone}, 
-		email = #{email}, 
+		email = #{email},
 		is_admin = #{isAdmin},
 		status = #{status}
 		where id = #{id}
 	</update>
 
+    <!-- 改 -->
+    <update id="updateById">
+		update sys_user set
+		name = #{name},
+		avatar = #{avatar},
+		intro = #{intro},
+		age = #{age},
+		sex = #{sex},
+		phone = #{phone},
+		email = #{email}
+		where id = #{id}
+	</update>
+
     <!-- ================================== 查询相关 ================================== -->
 
     <!-- 通用映射：手动模式 -->