Skip to content

Commit f9cf4c2

Browse files
committed
feat: add tanant API
1 parent e744285 commit f9cf4c2

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

base/src/main/java/com/tinyengine/it/common/exception/ExceptionEnum.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,18 @@ public enum ExceptionEnum implements IBaseError {
300300
/**
301301
* Cm 335 exception enum.
302302
*/
303-
CM335("CM335", "密码重置失败");
303+
CM335("CM335", "密码重置失败"),
304+
305+
306+
/**
307+
* Cm 336 exception enum.
308+
*/
309+
CM336("CM336", "token不存在"),
310+
311+
/**
312+
* Cm 337 exception enum.
313+
*/
314+
CM337("CM337", "组织不存在");
304315

305316
/**
306317
* 错误码

base/src/main/java/com/tinyengine/it/login/controller/LoginController.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public Result<ValidationResult> validateToken(@RequestParam String token) {
240240
public Result<SSOTicket> setTenant(@RequestParam Integer tenantId) {
241241
List<Tenant> tenants = loginUserContext.getTenants();
242242
if (tenants == null || tenants.isEmpty()) {
243-
return Result.failed(ExceptionEnum.CM009);
243+
return Result.failed(ExceptionEnum.CM337);
244244
}
245245
List<Tenant> currentTenant = new ArrayList<>();
246246
for (Tenant tenant : tenants) {
@@ -249,13 +249,16 @@ public Result<SSOTicket> setTenant(@RequestParam Integer tenantId) {
249249
}
250250
}
251251
if (currentTenant.isEmpty()) {
252-
return Result.failed(ExceptionEnum.CM009);
252+
return Result.failed(ExceptionEnum.CM337);
253253
}
254254
// 通过 RequestContextHolder 获取请求
255255
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes())
256256
.getRequest();
257257
String authHeader = request.getHeader("Authorization");
258258
String headerToken = jwtUtil.getTokenFromRequest(authHeader);
259+
if (headerToken == null || headerToken.isEmpty()) {
260+
return Result.failed(ExceptionEnum.CM336);
261+
}
259262
String token = jwtUtil.generateTokenWithSelectedTenant(headerToken, currentTenant);
260263
// 将原 token 加入黑名单
261264
Claims claims = Jwts.parser()

0 commit comments

Comments
 (0)