From 3993ac78b7d2652bdd2886f833edf97afcb48f04 Mon Sep 17 00:00:00 2001 From: owen Date: Mon, 17 Jun 2024 21:48:31 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E8=BF=87=E6=BB=A4=E6=8E=89=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E7=94=A8=E6=88=B7=20#2269?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/bkrepo/auth/controller/user/UserController.kt | 1 + .../com/tencent/bkrepo/auth/util/query/UserQueryHelper.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/UserController.kt b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/UserController.kt index 7c33724f1c..f7501d59c3 100644 --- a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/UserController.kt +++ b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/UserController.kt @@ -240,6 +240,7 @@ class UserController @Autowired constructor( @ApiOperation("校验用户token") @PostMapping("/token") + @Deprecated("no need work") fun checkToken(@RequestParam uid: String, @RequestParam token: String): Response { preCheckContextUser(uid) userService.findUserByUserToken(uid, token) ?: return ResponseBuilder.success(false) diff --git a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/util/query/UserQueryHelper.kt b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/util/query/UserQueryHelper.kt index f41c638fb3..b7b42ed44c 100644 --- a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/util/query/UserQueryHelper.kt +++ b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/util/query/UserQueryHelper.kt @@ -13,7 +13,7 @@ object UserQueryHelper { Criteria.where(TUser::pwd.name).`is`(hashPwd), Criteria.where("tokens.id").`is`(pwd), Criteria.where("tokens.id").`is`(sm3HashPwd) - ).and(TUser::userId.name).`is`(userId) + ).and(TUser::userId.name).`is`(userId).and(TUser::locked.name).`is`(false) return query(criteria) }