From 7160a9edbbfb4ec68248002d3a11ebfef8f4e930 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 10 May 2024 11:44:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88nods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comfac/controller/FactoryAuthController.java | 5 ++++- .../factory/config/InterceptorAdapterConfig.java | 12 +++++------- .../logpm/factory/mt/feign/MtOrderMainClinet.java | 2 +- .../factory/oupai/feign/OuPaiFactoryClinet.java | 2 +- .../factory/snm/feign/StationLineNumClient.java | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryAuthController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryAuthController.java index fd821a727..f4a81b0e7 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryAuthController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryAuthController.java @@ -26,6 +26,8 @@ import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.exception.CustomerException; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springframework.validation.annotation.Validated; @@ -40,7 +42,6 @@ import javax.servlet.http.HttpServletResponse; * @since 2023-06-06 */ @Log4j2 -@NonDS @RestController @AllArgsConstructor @RequestMapping("/factory/auth") @@ -55,6 +56,8 @@ public class FactoryAuthController extends BladeController { @ApiOperation(value = "获取token推送", notes = "传入factoryAccountDTO") public R token(@Validated @RequestBody FactoryAccountDTO factoryAccountDTO, HttpServletResponse response) { log.info("############token: 获取账号token "); + BladeUser user = AuthUtil.getUser(); + log.info("############请求参数 user：{}",user); log.info("############请求参数 factoryAccountDTO：{}",factoryAccountDTO); //通过企业id 应用id 秘钥 获取对应的token String corpid = factoryAccountDTO.getCorpid();//企业id diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java index ab61b8888..d16d65a3b 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java @@ -28,17 +28,15 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry interceptorRegistry) { - InterceptorRegistration registry = interceptorRegistry.addInterceptor(new FactoryAccountsInterceptor(factoryTokenService)); - registry.addPathPatterns("/factory/**"). + interceptorRegistry.addInterceptor(new FactoryAccountsInterceptor(factoryTokenService)) + .addPathPatterns("/factory/**"). excludePathPatterns("/factory/auth/token"). excludePathPatterns("/factory/oupai/**"). excludePathPatterns("/factory/zb/**") .excludePathPatterns("/factory/common/**").order(2); - InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)); - registryZbFactory.addPathPatterns("/factory/zb/**").order(3); - - - registry=interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment)).addPathPatterns("/**").order(1); + interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)) + .addPathPatterns("/factory/zb/**").order(3); + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment)).addPathPatterns("/**").order(1); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java index b691e9a62..f2d9f9c28 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java @@ -26,7 +26,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -@NonDS + @ApiIgnore @RestController @AllArgsConstructor diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java index bbfd67be8..010692d75 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java @@ -26,7 +26,7 @@ import java.util.Map; * @Author Diss * @Create 2024/1/2 22:13 */ -@NonDS + @ApiIgnore @RestController @AllArgsConstructor diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/feign/StationLineNumClient.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/feign/StationLineNumClient.java index bf8b668ee..84caeb0e6 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/feign/StationLineNumClient.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/feign/StationLineNumClient.java @@ -13,7 +13,7 @@ import java.util.List; /** * 诗尼曼工厂线路信息外部服务 */ -@NonDS + @ApiIgnore @RestController @AllArgsConstructor