test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: 用户没登录返回401

This commit is contained in:
CaptainB 2023-08-23 14:59:48 +08:00 committed by 刘瑞斌
parent 4acb1026b0
commit be37fa558e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/framework/sdk/src/main/java/io/metersphere/sdk/controller/LoginController.java
View File

@ -4,6 +4,7 @@ package io.metersphere.sdk.controller;
import io.metersphere.sdk.constants.HttpMethodConstants; import io.metersphere.sdk.constants.HttpMethodConstants;
import io.metersphere.sdk.constants.UserSource; import io.metersphere.sdk.constants.UserSource;
import io.metersphere.sdk.controller.handler.ResultHolder; import io.metersphere.sdk.controller.handler.ResultHolder;
import io.metersphere.sdk.controller.handler.result.MsHttpResultCode;
import io.metersphere.sdk.dto.LoginRequest; import io.metersphere.sdk.dto.LoginRequest;
import io.metersphere.sdk.dto.SessionUser; import io.metersphere.sdk.dto.SessionUser;
import io.metersphere.sdk.dto.UserDTO; import io.metersphere.sdk.dto.UserDTO;
@ -22,6 +23,7 @@ import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@ -35,7 +37,7 @@ public class LoginController {
@GetMapping(value = "/is-login") @GetMapping(value = "/is-login")
@Operation(summary = "是否登录") @Operation(summary = "是否登录")
public ResultHolder isLogin() throws Exception { public ResultHolder isLogin(HttpServletResponse response) throws Exception {
RsaKey rsaKey = RsaUtil.getRsaKey(); RsaKey rsaKey = RsaUtil.getRsaKey();
SessionUser user = SessionUtils.getUser(); SessionUser user = SessionUtils.getUser();
if (user != null) { if (user != null) {
@ -53,7 +55,8 @@ public class LoginController {
} }
return ResultHolder.success(sessionUser); return ResultHolder.success(sessionUser);
} }
throw new MSException(rsaKey.getPublicKey()); response.setStatus(HttpStatus.UNAUTHORIZED.value());
return ResultHolder.error(MsHttpResultCode.UNAUTHORIZED.getCode(), rsaKey.getPublicKey());
} }
@PostMapping(value = "/login") @PostMapping(value = "/login")