diff --git a/inspect-admin/src/main/java/com/inspect/admin/controller/TokenController.java b/inspect-admin/src/main/java/com/inspect/admin/controller/TokenController.java index 6646a70..a5c10ba 100644 --- a/inspect-admin/src/main/java/com/inspect/admin/controller/TokenController.java +++ b/inspect-admin/src/main/java/com/inspect/admin/controller/TokenController.java @@ -88,9 +88,6 @@ public class TokenController { String md5Hex = DigestUtils.md5Hex(password); LoginUser userInfo = this.sysLoginService.login(username, md5Hex, request); Map map = this.tokenService.createToken(userInfo); - Map mapApi = new HashMap(); - mapApi.put("key", "Authorization"); - mapApi.put("value", "Bearer " + map.get(TokenConst.ACCESS_TOKEN)); - return Response.ok(mapApi, "操作成功"); + return Response.ok(map, "操作成功"); } } diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/TokenConst.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/TokenConst.java index faabe1d..0bf4338 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/TokenConst.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/TokenConst.java @@ -15,6 +15,7 @@ public class TokenConst { public static final String LOGIN_TOKENS = "login_tokens:"; public static final String DOWN_TOKEN = "downToken"; public static final String ACCESS_TOKEN = "access_token"; + public static final String TOKEN_TYPE = "token_type"; public static final String EXPIRES_IN = "expires_in"; public static final String ADMIN_FLAG = "admin_flag"; } diff --git a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java index 34d4fb7..338093f 100644 --- a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java +++ b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java @@ -53,6 +53,7 @@ public class TokenService { Map rspMap = new HashMap<>(); rspMap.put(TokenConst.ACCESS_TOKEN, JwtUtils.createToken(claimsMap)); rspMap.put(TokenConst.EXPIRES_IN, expireTime); + rspMap.put(TokenConst.TOKEN_TYPE, "Bearer"); return rspMap; }