wangwei 5 роки тому
батько
коміт
f12f0fc5e6

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

@@ -12,11 +12,6 @@ public class LoginInfo implements JsonSerializable {
 
 	private static final long serialVersionUID = 1305354276321732681L;
 
-	/**
-	 * 会话ID
-	 */
-	private String sessionId;
-
 	/**
 	 * 顶级机构ID
 	 */
@@ -47,11 +42,6 @@ public class LoginInfo implements JsonSerializable {
 	 */
 	private String smsCode;
 
-	/**
-	 * 图片验证码
-	 */
-	private String imgCode;
-
 	/**
 	 * 客户端IP
 	 */
@@ -67,14 +57,6 @@ public class LoginInfo implements JsonSerializable {
 	 */
 	private Boolean noSession;
 
-	public String getSessionId() {
-		return sessionId;
-	}
-
-	public void setSessionId(String sessionId) {
-		this.sessionId = sessionId;
-	}
-
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -139,14 +121,6 @@ public class LoginInfo implements JsonSerializable {
 		this.smsCode = smsCode;
 	}
 
-	public String getImgCode() {
-		return imgCode;
-	}
-
-	public void setImgCode(String imgCode) {
-		this.imgCode = imgCode;
-	}
-
 	public Boolean getNoSession() {
 		return noSession;
 	}

+ 1 - 8
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/AuthServiceImpl.java

@@ -113,8 +113,6 @@ public class AuthServiceImpl implements AuthService {
 		String password = loginInfo.getPassword();
 		String clientIp = loginInfo.getClientIp();
 		String smsCode = loginInfo.getSmsCode();
-		String sessionId = loginInfo.getSessionId();
-		String imgCode = loginInfo.getImgCode();
 
 		if (StringUtils.isBlank(accountType)) {
 			throw new StatusException("003201", "accountType is null");
@@ -142,12 +140,7 @@ public class AuthServiceImpl implements AuthService {
 		}
 
 		Integer errorTimes = getLoginErrorTimes(accountTypeEnum, accountValue, clientIp);
-		if (StringUtils.isNotBlank(sessionId) && StringUtils.isNotBlank(imgCode)) {
-			String rightImgCode = redisClient.get("$_IMG_" + sessionId, String.class);
-			if (null == rightImgCode || !rightImgCode.equalsIgnoreCase(imgCode)) {
-				throw new StatusException("003303", "验证码错误");
-			}
-		} else if (5 < errorTimes) {
+		if (5 < errorTimes) {
 			throw new StatusException("003205", "登陆失败次数已达到上限,请5分钟后重试");
 		}