瀏覽代碼

fix 拉黑用户无法授权登录

zoujiajian 2 年之前
父節點
當前提交
f173b727e3

+ 1 - 1
netflix-common/src/main/java/com/cyksj/common/util/StringUtil.java

@@ -436,7 +436,7 @@ public final class StringUtil {
 		StringBuilder sb = new StringBuilder(length);
 		for (int i = 0; i < length; i++) {
 			int number = RandomUtil.randomInt(baseLength);
-			sb.append(randomStr.charAt(number));
+			sb.append(baseStr.charAt(number));
 		}
 		return sb.toString();
 	}

+ 20 - 0
netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -437,6 +437,12 @@ public class AuthorizationController {
     @NoSubmit
     public Result<UserAuthLoginResp> loginByPhone(@RequestBody LoginReq loginReq) throws Exception {
         User user = userService.webLogin(loginReq);
+        Optional.ofNullable(user.getIsBlack())
+                .ifPresent(black -> {
+                    if (black) {
+                        throw BusinessRuntimeException.getInstance("您的账号已被注销...");
+                    }
+                });
         //写回登陆信息
         StpUserUtil.login(user.getId());
         UserAuthLoginResp loginPhoneRep = new UserAuthLoginResp(StpUserUtil.getTokenValue(), user.getShowId(), user.getNickname(), user.getHeadimgurl());
@@ -456,6 +462,13 @@ public class AuthorizationController {
             throw BusinessRuntimeException.getInstance("系统错误,请重新授权");
         }
 
+        Optional.ofNullable(user.getIsBlack())
+                .ifPresent(black -> {
+                    if (black) {
+                        throw BusinessRuntimeException.getInstance("您的账号已被注销...");
+                    }
+                });
+
         //写回登陆信息
         StpUserUtil.login(user.getId());
         response.addHeader("satoken-user", StpUserUtil.getTokenValue());
@@ -491,6 +504,13 @@ public class AuthorizationController {
         loginReq.setEmail(googleLoginRep.getEmail());
         loginReq.setSubject(googleLoginRep.getSubject());
         User user = userService.webLogin(loginReq);
+
+        Optional.ofNullable(user.getIsBlack())
+                .ifPresent(black -> {
+                    if (black) {
+                        throw BusinessRuntimeException.getInstance("您的账号已被注销...");
+                    }
+                });
         //写回登陆信息
         StpUserUtil.login(user.getId());
         UserAuthLoginResp loginPhoneRep = new UserAuthLoginResp(StpUserUtil.getTokenValue(), user.getShowId(), user.getNickname(), user.getHeadimgurl());