From eaadabd35f60bf4ee6b4329b4dbde87e2c2bffb5 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Wed, 31 Aug 2022 15:46:40 +0800 Subject: [PATCH] =?UTF-8?q?gaea=E5=8D=87=E7=BA=A72.0.4.RELEASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-core/pom.xml | 2 +- .../anjiplus/template/gaea/business/filter/TokenFilter.java | 2 +- .../accessuser/service/impl/AccessUserServiceImpl.java | 3 ++- report-ui/src/utils/request.js | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/report-core/pom.xml b/report-core/pom.xml index 7118783c..a81c8289 100644 --- a/report-core/pom.xml +++ b/report-core/pom.xml @@ -76,7 +76,7 @@ com.anji-plus spring-boot-gaea - 2.0.3.RELEASE + 2.0.4.RELEASE org.springframework.boot diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java index 8022cf44..74ded384 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java @@ -231,7 +231,7 @@ public class TokenFilter implements Filter { } private void error(HttpServletResponse response) throws IOException { - ResponseBean responseBean = ResponseBean.builder().code("50008").message("The Token has expired").build(); + ResponseBean responseBean = ResponseBean.builder().code("User.credentials.expired").message("The Token has expired").build(); response.setContentType(ContentType.APPLICATION_JSON.getMimeType()); response.getWriter().print(JSONObject.toJSONString(responseBean)); } diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java index 96619603..d2164b19 100755 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.anji.plus.gaea.bean.TreeNode; import com.anji.plus.gaea.cache.CacheHelper; import com.anji.plus.gaea.constant.BaseOperationEnum; +import com.anji.plus.gaea.constant.GaeaConstant; import com.anji.plus.gaea.exception.BusinessException; import com.anji.plus.gaea.exception.BusinessExceptionBuilder; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; @@ -163,7 +164,7 @@ public class AccessUserServiceImpl implements AccessUserService { } else { // 生成用户token String uuid = GaeaUtils.UUID(); - token = jwtBean.createToken(loginName, uuid); + token = jwtBean.createToken(loginName, uuid, 0, GaeaConstant.TENANT_CODE); cacheHelper.stringSetExpire(tokenKey, token, 3600); } diff --git a/report-ui/src/utils/request.js b/report-ui/src/utils/request.js index 77453695..a985ccc8 100644 --- a/report-ui/src/utils/request.js +++ b/report-ui/src/utils/request.js @@ -27,8 +27,8 @@ service.interceptors.response.use( * code为非20000是抛错 可结合自己业务进行修改 */ const res = response.data - // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; - if (res.code == '50008' || res.code == '50012' || res.code == '50014') { + // User.credentials.expired:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; + if (res.code == 'User.credentials.expired' || res.code == '50012' || res.code == '50014') { MessageBox.confirm( '你已被登出，可以取消继续留在该页面，或者重新登录', '重新登录',