Quellcode durchsuchen

1、登录接口回传token,以便前端无法使用Cookie时使用

machaoyi vor 1 Jahr
Ursprung
Commit
73ae7228ca

+ 26 - 41
.idea/workspace.xml

@@ -4,48 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、pom版本整理">
-      <change afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/annotation/DicCode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/utils/DateUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/utils/DicCodeUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClockPO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClockVO.java" afterDir="false" />
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、登录接口回传token,以便前端无法使用Cookie时使用">
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/entity/TokenInfoPO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/entity/SysDic.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDic/entity/SysDic.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/service/SysDicService.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDic/service/SysDicService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchPO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/service/SysDicItemService.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/service/SysDicItemService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/core/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/src/main/java/com/ctsi/utils/ApiResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/utils/ApiResult.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkAddr/controller/WorkAddrController.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkAddr/controller/WorkAddrController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkAddr/entity/WorkAddr.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkAddr/entity/WorkAddr.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkAddr/service/impl/WorkAddrServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkAddr/service/impl/WorkAddrServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/WorkClockService.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/WorkClockService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/config/SwaggerConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/config/SwaggerConfig.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ChangesViewManager">
-    <option name="groupingKeys">
-      <option value="module" />
-    </option>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -182,7 +151,7 @@
       <workItem from="1705392945258" duration="4784000" />
       <workItem from="1705397771531" duration="2808000" />
       <workItem from="1705452083011" duration="7637000" />
-      <workItem from="1705460446625" duration="13755000" />
+      <workItem from="1705460446625" duration="18893000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -504,7 +473,23 @@
       <option name="project" value="LOCAL" />
       <updated>1705471205915</updated>
     </task>
-    <option name="localTasksCounter" value="41" />
+    <task id="LOCAL-00041" summary="1、打卡接口">
+      <option name="closed" value="true" />
+      <created>1705481877483</created>
+      <option name="number" value="00041" />
+      <option name="presentableId" value="LOCAL-00041" />
+      <option name="project" value="LOCAL" />
+      <updated>1705481877483</updated>
+    </task>
+    <task id="LOCAL-00042" summary="1、修改上下班时间">
+      <option name="closed" value="true" />
+      <created>1705482687104</created>
+      <option name="number" value="00042" />
+      <option name="presentableId" value="LOCAL-00042" />
+      <option name="project" value="LOCAL" />
+      <updated>1705482687104</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -553,9 +538,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="1、用户角色表" />
-    <MESSAGE value="1、用户绑定角色&#10;2、用户接口包修改" />
-    <MESSAGE value="1、获取用户当前角色" />
     <MESSAGE value="1、用户部门接口" />
     <MESSAGE value="1、新增、修改用户,关联角色表、部门表" />
     <MESSAGE value="1、新增角色菜单表" />
@@ -578,7 +560,10 @@
     <MESSAGE value="1、打卡接口新增经纬度字段" />
     <MESSAGE value="1、设置考勤打卡信息接口" />
     <MESSAGE value="1、pom版本整理" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、pom版本整理" />
+    <MESSAGE value="1、打卡接口" />
+    <MESSAGE value="1、修改上下班时间" />
+    <MESSAGE value="1、登录接口回传token,以便前端无法使用Cookie时使用" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、登录接口回传token,以便前端无法使用Cookie时使用" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 14 - 0
application/src/main/java/com/ctsi/Auth/entity/TokenInfoPO.java

@@ -0,0 +1,14 @@
+package com.ctsi.Auth.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("Token信息")
+public class TokenInfoPO {
+    @ApiModelProperty(value = "Token名称")
+    private String tokenName;
+    @ApiModelProperty(value = "Token值")
+    private String tokenValue;
+}

+ 4 - 1
application/src/main/java/com/ctsi/Auth/web/login.java

@@ -1,6 +1,7 @@
 package com.ctsi.Auth.web;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.ctsi.Auth.entity.TokenInfoPO;
 import com.ctsi.Auth.entity.UserForm;
 import com.ctsi.Auth.entity.UserInfoPO;
 import com.ctsi.Enum.ErrorCodeEnum;
@@ -60,7 +61,9 @@ public class login {
         if (!PasswordEncoderUtil.checkPassword(userForm.getPassword(),User.getPassword()))
             return ApiResult.result(ErrorCodeEnum.PASSWORD_INVALID);
         StpUtil.login(User.getId(),userForm.getRememberMe());
-        return ApiResult.success("登录成功");
+        TokenInfoPO tokenInfoPO = new TokenInfoPO();
+        BeanUtils.copyProperties(StpUtil.getTokenInfo(), tokenInfoPO);
+        return ApiResult.result(ApiResult.DEFAULT_SUCCEED_CODE, "登录成功", tokenInfoPO);
     }
 
     @ApiOperation("登出")

+ 2 - 2
application/src/main/java/com/ctsi/config/SwaggerConfig.java

@@ -40,7 +40,7 @@ public class SwaggerConfig {
     private List<SecurityScheme> securitySchemes() {
         List<SecurityScheme> apiKeyList= new ArrayList<>();
         //注意,这里应对应登录token鉴权对应的k-v
-        apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
+        apiKeyList.add(new ApiKey("token", "token", "header"));
         return apiKeyList;
     }
     /**
@@ -48,7 +48,7 @@ public class SwaggerConfig {
      */
     private SecurityContext securityContext() {
         return SecurityContext.builder()
-                .securityReferences(Collections.singletonList(new SecurityReference("Authorization", scopes())))
+                .securityReferences(Collections.singletonList(new SecurityReference("token", scopes())))
                 .build();
     }