From 9f3fa8f4e9f4c206d7a339f56fe3dc3208e36084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 17 Apr 2024 20:21:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/EBom/CheckEBomException.java | 2 +- .../nflg/product/base/core/api/BaseApi.java | 26 ++++++------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index 04989244..bb50a311 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; @@ -16,6 +15,7 @@ import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.MaterialMainService; import com.nflg.product.bomnew.util.BomLevelUtil; +import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.TreeUtils; import com.nflg.product.bomnew.util.VUtils; import lombok.Getter; 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 0df6bb54..044ddca2 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 @@ -1,19 +1,15 @@ package com.nflg.product.base.core.api; -import com.nflg.product.base.core.exception.NflgBusinessException; import nflg.product.common.constant.STATE; import nflg.product.common.dto.LoginUserInfoDTO; import nflg.product.common.util.JwtUtil; import nflg.product.common.vo.ResultVO; -import org.springframework.http.server.reactive.ServerHttpRequest; -import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ModelAttribute; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Objects; -import java.util.Optional; public class BaseApi { protected HttpServletRequest request; @@ -24,21 +20,15 @@ public class BaseApi { @ModelAttribute private void initLoginInfo(HttpServletRequest request) { - try { - String token = request.getHeader("authorization"); - String language=Objects.nonNull(request.getHeader("language"))? request.getHeader("language") :"zh_cn"; - ResultVO result = JwtUtil.parse(token); - if (result.getState().equals(STATE.Success.getState())) { - LoginUserInfoDTO userInfo = (LoginUserInfoDTO) result.getData(); - userInfo.setSessionKey(token); - userInfo.setLanguage(language); - loginUser.set(userInfo); - } - } catch (Exception ex) { - // throw new NflgBusinessException(STATE.SystemErr,"token 解析出错"); + String token = request.getHeader("authorization"); + String language = Objects.nonNull(request.getHeader("language")) ? request.getHeader("language") : "zh_cn"; + ResultVO result = JwtUtil.parse(token); + if (result.getState().equals(STATE.Success.getState())) { + LoginUserInfoDTO userInfo = (LoginUserInfoDTO) result.getData(); + userInfo.setSessionKey(token); + userInfo.setLanguage(language); + loginUser.set(userInfo); } - - }