From 9f032fc032121615e52ec83f99eea75885cd744b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Tue, 21 Nov 2023 18:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=A0=91=E7=9A=84=E9=AB=98?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/src/main/resources/bootstrap.properties | 8 ++++---- nflg_project_dev/nflg-bom-new/pom.xml | 6 ++++++ .../com/nflg/product/bomnew/api/user/OriginalBomApi.java | 1 + .../nflg-bom-new/src/main/resources/bootstrap.properties | 8 ++++---- .../main/java/com/nflg/product/base/core/api/BaseApi.java | 2 ++ .../nflg/product/base/core/conmon/util/SessionUtil.java | 4 ++++ .../java/nflg/product/common/dto/LoginUserInfoDTO.java | 2 ++ 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/nflg_project_dev/material/src/main/resources/bootstrap.properties b/nflg_project_dev/material/src/main/resources/bootstrap.properties index 3640a496..b84cb537 100644 --- a/nflg_project_dev/material/src/main/resources/bootstrap.properties +++ b/nflg_project_dev/material/src/main/resources/bootstrap.properties @@ -1,13 +1,13 @@ spring.application.name=material -spring.profiles.active=dev +spring.profiles.active=sit server.port=7002 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.cloud.nacos.config.namespace=nflg_dev -spring.cloud.nacos.discovery.namespace=nflg_dev +spring.cloud.nacos.config.namespace=nflg +spring.cloud.nacos.discovery.namespace=nflg spring.cloud.nacos.config.file-extension=properties -nacos.plugin.namespace=nflg_dev +nacos.plugin.namespace=nflg #configuration spring.cloud.nacos.config.server-addr=${nacos.server-addr} diff --git a/nflg_project_dev/nflg-bom-new/pom.xml b/nflg_project_dev/nflg-bom-new/pom.xml index bc91d14c..f5204bda 100644 --- a/nflg_project_dev/nflg-bom-new/pom.xml +++ b/nflg_project_dev/nflg-bom-new/pom.xml @@ -23,6 +23,12 @@ com.nflg.product.starter nflg-boot-starter 1.0-SNAPSHOT + + + commons-io + commons-io + + com.nflg.product.base.core diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index 9c9212cd..bcba6ccb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -88,6 +88,7 @@ public class OriginalBomApi extends BaseApi { @ApiOperation("计算树的高度(测试用)") public ResultVO computeTreeHeight() throws ExecutionException, InterruptedException { return ResultVO.success(originalParentService.compucteLevelNum()); + SessionUtil.getUserCode() } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap.properties b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap.properties index e36644ac..7cb0bbdd 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap.properties +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap.properties @@ -1,12 +1,12 @@ spring.application.name=bom-new -spring.profiles.active=dev +spring.profiles.active=sit spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.cloud.nacos.config.namespace=nflg_dev -spring.cloud.nacos.discovery.namespace=nflg_dev +spring.cloud.nacos.config.namespace=nflg +spring.cloud.nacos.discovery.namespace=nflg spring.cloud.nacos.config.file-extension=properties -nacos.plugin.namespace=nflg_dev +nacos.plugin.namespace=nflg #configuration spring.cloud.nacos.config.server-addr=${nacos.server-addr} diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java index e7d8deb7..b47d34ff 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java @@ -26,9 +26,11 @@ public class BaseApi { private void initLoginInfo(HttpServletRequest request) { try { String token = request.getHeader("authorization").toString(); + String language=Objects.nonNull(request.getHeader("language"))? request.getHeader("language").toString():"zh_cn"; ResultVO result = JwtUtil.parse(token); if (result.getState().equals(STATE.Success.getState())) { LoginUserInfoDTO userInfo = (LoginUserInfoDTO) result.getData(); + userInfo.setLanguage(language); if (!Objects.isNull(userInfo)) { loginUser.set(userInfo); } diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java index bc127878..46da0b22 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java @@ -70,4 +70,8 @@ public class SessionUtil { public static String getFullDeptName() { return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getFullDeptName).orElse(null); } + + public static String getLanguage() { + return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getLanguage).orElse(null); + } } diff --git a/nflg_project_dev/nflg-boot-base/nflg-common/src/main/java/nflg/product/common/dto/LoginUserInfoDTO.java b/nflg_project_dev/nflg-boot-base/nflg-common/src/main/java/nflg/product/common/dto/LoginUserInfoDTO.java index c2523f3a..c5d3f713 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-common/src/main/java/nflg/product/common/dto/LoginUserInfoDTO.java +++ b/nflg_project_dev/nflg-boot-base/nflg-common/src/main/java/nflg/product/common/dto/LoginUserInfoDTO.java @@ -29,4 +29,6 @@ public class LoginUserInfoDTO { private Integer queryData; private String fullDeptName; + + private String language; }