From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
index c48dfe0..03cb319 100644
--- a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
@@ -20,7 +20,7 @@
  * @description 容器添加组件
  * @date 2019-06-14 15:50
  */
-@Configuration
+@Configuration()
 @PropertySource("classpath:config/system.properties")
 public class MvcCoreConfig implements WebMvcConfigurer {
 
@@ -64,19 +64,22 @@
 				.excludePathPatterns("/plugin/**")
 				.excludePathPatterns("/swagger**/**")
 				.excludePathPatterns("/webjars/**");
+
 		// 用户认证拦截
-		registry.addInterceptor(userLoginInterceptor)
-				.addPathPatterns("/**")
-				.excludePathPatterns("/common/**")
-				.excludePathPatterns("/resource/**")
-				.excludePathPatterns("/swagger**/**")
-				.excludePathPatterns("/webjars/**")
-				.excludePathPatterns("/api/**");
+//		registry.addInterceptor(userLoginInterceptor)
+//				.addPathPatterns("/**")
+//				.excludePathPatterns("/common/**")
+//				.excludePathPatterns("/resource/**")
+//				.excludePathPatterns("/swagger**/**")
+//				.excludePathPatterns("/webjars/**")
+//				.excludePathPatterns("/api/**");
 
 		// url权限拦截
 		registry.addInterceptor(suAuthorityInterceptor).addPathPatterns("/**/su/**");
 		//小程序公司与域名对应关系拦截
-		registry.addInterceptor(hostInterceptor).addPathPatterns("/**/wxapi/**");
+		registry.addInterceptor(hostInterceptor).addPathPatterns("/**/wxapi/**")
+				.excludePathPatterns("/wxCommon/wxapi/wxpayCallback")
+				.excludePathPatterns("/wxCommon/wxapi/rechargeCallBack");
 	}
 
 

--
Gitblit v1.9.1