rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计算树的高度

This commit is contained in:
大米 2023-11-21 18:51:02 +08:00
parent 0ec37f926d
commit 9f032fc032
7 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg_project_dev/material/src/main/resources/bootstrap.properties
View File

@ -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}

6
nflg_project_dev/nflg-bom-new/pom.xml
View File

@ -23,6 +23,12 @@
<groupId>com.nflg.product.starter</groupId>
<artifactId>nflg-boot-starter</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.nflg.product.base.core</groupId>

1
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
View File

@ -88,6 +88,7 @@ public class OriginalBomApi extends BaseApi {
@ApiOperation("计算树的高度(测试用)")
public ResultVO<Boolean> computeTreeHeight() throws ExecutionException, InterruptedException {
return ResultVO.success(originalParentService.compucteLevelNum());
SessionUtil.getUserCode()
}

8
nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap.properties
View File

@ -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}

2
nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java
View File

@ -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);
}

4
nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
View File

@ -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);
}
}

2
nflg_project_dev/nflg-boot-base/nflg-common/src/main/java/nflg/product/common/dto/LoginUserInfoDTO.java
View File

@ -29,4 +29,6 @@ public class LoginUserInfoDTO {
private Integer queryData;
private String fullDeptName;
private String language;
}