WANG 6 rokov pred
rodič
commit
a414beb8c7

+ 12 - 2
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/AuthController.java

@@ -16,6 +16,8 @@ import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.web.support.ResponseStatus;
+import cn.com.qmth.examcloud.commons.web.support.StatusResponseEntity;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
@@ -50,7 +52,8 @@ public class AuthController extends ControllerSupport {
 
 	@ApiOperation(value = "登入", notes = "")
 	@PostMapping("login")
-	public User login(@RequestBody LoginInfo loginInfo, HttpServletRequest request) {
+	public Object login(@RequestBody LoginInfo loginInfo, HttpServletRequest request) {
+		setAlwaysOKResponse();
 		trim(loginInfo, false);
 
 		String realIp = request.getHeader("x-forwarded-for");
@@ -62,8 +65,15 @@ public class AuthController extends ControllerSupport {
 		} else {
 			loginInfo.setClientIp(null);
 		}
+		Boolean alwaysOK = loginInfo.getAlwaysOK();
+
 		User user = authService.login(loginInfo);
-		return user;
+
+		if (null != alwaysOK && alwaysOK) {
+			return new StatusResponseEntity(ResponseStatus.SUCCESS, user);
+		} else {
+			return user;
+		}
 	}
 
 	@ApiOperation(value = "登出", notes = "")

+ 13 - 0
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/LoginInfo.java

@@ -42,6 +42,11 @@ public class LoginInfo implements JsonSerializable {
 	 */
 	private String clientIp;
 
+	/**
+	 * 响应码总是200
+	 */
+	private Boolean alwaysOK;
+
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -90,4 +95,12 @@ public class LoginInfo implements JsonSerializable {
 		this.clientIp = clientIp;
 	}
 
+	public Boolean getAlwaysOK() {
+		return alwaysOK;
+	}
+
+	public void setAlwaysOK(Boolean alwaysOK) {
+		this.alwaysOK = alwaysOK;
+	}
+
 }