微服务重大升级说明（暂时只升级后台3.4.0）

-升级Spring Cloud Alibaba 2021.0.1.0，使用 spring.config.import 方式引入nacos配置
-拆分jeecg-boot-starter出来，使用独立项目维护

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml

@@ -4,37 +4,17 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-base</artifactId>
-		<version>3.3.0</version>
+		<version>3.4.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>jeecg-boot-base-core</artifactId>
 
-	<repositories>
-		<repository>
-			<id>aliyun</id>
-			<name>aliyun Repository</name>
-			<url>https://maven.aliyun.com/repository/public</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>jeecg</id>
-			<name>jeecg Repository</name>
-			<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-
 	<dependencies>
 		<!--jeecg-tools-->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>jeecg-boot-base-tools</artifactId>
+			<artifactId>jeecg-boot-common</artifactId>
 		</dependency>
 		<!--集成springmvc框架并实现自动配置 -->
 		<dependency>

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -304,16 +304,21 @@ public interface CommonConstant {
     String WPS_TYPE_2="2";
 
 
+    /**===============================================================================================*/
+    /**
+     * ::非常重要::
+     * 注意：这四个常量值如果修改，需要与 jeecg-boot-starter/jeecg-boot-common/org.jeecg.config.FeignConfig 类中的值保持一致。
+     */
     String X_ACCESS_TOKEN = "X-Access-Token";
     String X_SIGN = "X-Sign";
     String X_TIMESTAMP = "X-TIMESTAMP";
+    /** 租户 请求头*/
+    String TENANT_ID = "tenant-id";
+    /**===============================================================================================*/
+
     String TOKEN_IS_INVALID_MSG = "Token失效，请重新登录!";
     String X_FORWARDED_SCHEME = "X-Forwarded-Scheme";
 
-    /**
-     * 多租户 请求头
-     */
-    String TENANT_ID = "tenant-id";
 
     /**
      * 微服务读取配置文件属性 服务地址

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PathMatcherUtil.java

@@ -1,96 +0,0 @@
-package org.jeecg.common.util;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.springframework.util.AntPathMatcher;
-
-/**
- * 使用Spring自身提供的地址匹配工具匹配URL
- * @author: jeecg-boot
- */
-public class PathMatcherUtil {
-
-    public static void main(String[] args) {
-        String url = "/sys/dict/loadDictOrderByValue/tree,s2,2";
-        String p = "/sys/dict/loadDictOrderByValue/*";
-
-        System.out.println(PathMatcherUtil.match(p,url));
-    }
-
-    /**
-     * 实际验证路径匹配权限
-     *
-     * @param matchPath 权限url
-     * @param path      访问路径
-     * @return 是否拥有权限
-     */
-    public static boolean match(String matchPath, String path) {
-        SpringAntMatcher springAntMatcher = new SpringAntMatcher(matchPath, true);
-        return springAntMatcher.matches(path);
-    }
-
-    /**
-     * 实际验证路径匹配权限
-     *
-     * @param list 权限url
-     * @param path 访问路径
-     * @return 是否拥有权限
-     */
-    public static boolean matches(Collection<String> list, String path) {
-        for (String s : list) {
-            SpringAntMatcher springAntMatcher = new SpringAntMatcher(s, true);
-            if (springAntMatcher.matches(path)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 地址表达式匹配工具
-     */
-    private static class SpringAntMatcher implements Matcher {
-        private final AntPathMatcher antMatcher;
-        private final String pattern;
-
-        private SpringAntMatcher(String pattern, boolean caseSensitive) {
-            this.pattern = pattern;
-            this.antMatcher = createMatcher(caseSensitive);
-        }
-
-        @Override
-        public boolean matches(String path) {
-            return this.antMatcher.match(this.pattern, path);
-        }
-
-        @Override
-        public Map<String, String> extractUriTemplateVariables(String path) {
-            return this.antMatcher.extractUriTemplateVariables(this.pattern, path);
-        }
-
-        private static AntPathMatcher createMatcher(boolean caseSensitive) {
-            AntPathMatcher matcher = new AntPathMatcher();
-            matcher.setTrimTokens(false);
-            matcher.setCaseSensitive(caseSensitive);
-            return matcher;
-        }
-    }
-
-    private interface Matcher {
-
-        /**
-         * 实际验证路径匹配权限
-         * @param var1
-         * @return
-         */
-        boolean matches(String var1);
-
-        /**
-         * 提取path中匹配到的部分
-         * @param var1
-         * @return
-         */
-        Map<String, String> extractUriTemplateVariables(String var1);
-    }
-}

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java

@@ -19,6 +19,10 @@ public class JeecgBaseConfig {
      * @TODO 降低使用成本加的默认值,实际以 yml配置 为准
      */
     private String signatureSecret = "dd05f1c54d63749eda95f9fa6d49v442a";
+    /**
+     * 需要加强校验的接口清单
+     */
+    private String signUrls;
 
     /**
      * 是否启用安全模式
@@ -79,4 +83,12 @@ public class JeecgBaseConfig {
     public void setDomainUrl(DomainUrl domainUrl) {
         this.domainUrl = domainUrl;
     }
+
+    public String getSignUrls() {
+        return signUrls;
+    }
+
+    public void setSignUrls(String signUrls) {
+        this.signUrls = signUrls;
+    }
 }

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -45,11 +45,9 @@ import java.util.List;
 @Configuration
 public class WebMvcConfiguration implements WebMvcConfigurer {
 
-    @Value("${jeecg.path.upload}")
-    private String upLoadPath;
-    @Value("${jeecg.path.webapp}")
-    private String webAppPath;
-    @Value("${spring.resource.static-locations}")
+    @Autowired
+    JeecgBaseConfig jeecgBaseConfig;
+    @Value("${spring.resource.static-locations:}")
     private String staticLocations;
 
     @Autowired(required = false)
@@ -62,8 +60,8 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/**")
                 //update-begin-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126
-                .addResourceLocations("file:" + upLoadPath + "//")
-                .addResourceLocations("file:" + webAppPath + "//")
+                .addResourceLocations("file:" + jeecgBaseConfig.getPath().getUpload() + "//")
+                .addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//")
                 //update-end-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126
                 .addResourceLocations(staticLocations.split(","));
     }

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
+import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.oConvertUtils;
 import org.mybatis.spring.annotation.MapperScan;

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java

@@ -1,25 +1,25 @@
-package org.jeecg.config.mybatis;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 多租户 tenant_id存储器
- * @author: jeecg-boot
- */
-@Slf4j
-public class TenantContext {
-    private static ThreadLocal<String> currentTenant = new ThreadLocal<>();
-
-    public static void setTenant(String tenant) {
-        log.debug(" setting tenant to " + tenant);
-        currentTenant.set(tenant);
-    }
-
-    public static String getTenant() {
-        return currentTenant.get();
-    }
-
-    public static void clear(){
-        currentTenant.remove();
-    }
-}
+//package org.jeecg.config.mybatis;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+///**
+// * 多租户 tenant_id存储器
+// * @author: jeecg-boot
+// */
+//@Slf4j
+//public class TenantContext {
+//    private static ThreadLocal<String> currentTenant = new ThreadLocal<>();
+//
+//    public static void setTenant(String tenant) {
+//        log.debug(" setting tenant to " + tenant);
+//        currentTenant.set(tenant);
+//    }
+//
+//    public static String getTenant() {
+//        return currentTenant.get();
+//    }
+//
+//    public static void clear(){
+//        currentTenant.remove();
+//    }
+//}

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java

@@ -10,6 +10,7 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.jeecg.common.api.CommonAPI;
+import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
@@ -17,7 +18,6 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.config.mybatis.TenantContext;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java

@@ -3,10 +3,10 @@ package org.jeecg.config.shiro.filters;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
+import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.config.mybatis.TenantContext;
 import org.jeecg.config.shiro.JwtToken;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java

@@ -1,5 +1,9 @@
 package org.jeecg.config.sign.interceptor;
 
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.util.PathMatcherUtil;
+import org.jeecg.common.util.SpringContextHolder;
+import org.jeecg.config.JeecgBaseConfig;
 import org.jeecg.config.filter.RequestBodyReserveFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -7,16 +11,19 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 签名 拦截器配置
  * @author: jeecg-boot
  */
 @Configuration
 public class SignAuthConfiguration implements WebMvcConfigurer {
-    public static String[] SIGN_URL_LIST = new String[]{"/sys/dict/getDictItems/*", "/sys/dict/loadDict/*",
-            "/sys/dict/loadDictOrderByValue/*", "/sys/dict/loadDictItem/*", "/sys/dict/loadTreeData",
-            "/sys/api/queryTableDictItemsByCode", "/sys/api/queryFilterTableDictInfo", "/sys/api/queryTableDictByKeys",
-            "/sys/api/translateDictFromTable", "/sys/api/translateDictFromTableByKeys"};
+    @Resource
+    JeecgBaseConfig jeecgBaseConfig;
+
     @Bean
     public SignAuthInterceptor signAuthInterceptor() {
         return new SignAuthInterceptor();
@@ -24,7 +31,17 @@ public class SignAuthConfiguration implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(signAuthInterceptor()).addPathPatterns(SIGN_URL_LIST);
+        //------------------------------------------------------------
+        //查询需要进行签名拦截的接口 signUrls
+        String signUrls = jeecgBaseConfig.getSignUrls();
+        String[] signUrlsArray = null;
+        if (StringUtils.isNotBlank(signUrls)) {
+            signUrlsArray = signUrls.split(",");
+        } else {
+            signUrlsArray = PathMatcherUtil.SIGN_URL_LIST;
+        }
+        //------------------------------------------------------------
+        registry.addInterceptor(signAuthInterceptor()).addPathPatterns(signUrlsArray);
     }
 
     //update-begin-author:taoyan date:20220427 for: issues/I53J5E post请求X_SIGN签名拦截校验后报错, request body 为空
@@ -38,8 +55,18 @@ public class SignAuthConfiguration implements WebMvcConfigurer {
         FilterRegistrationBean registration = new FilterRegistrationBean();
         registration.setFilter(requestBodyReserveFilter());
         registration.setName("requestBodyReserveFilter");
+        //------------------------------------------------------------
+        //查询需要进行签名拦截的接口 signUrls
+        String signUrls = jeecgBaseConfig.getSignUrls();
+        String[] signUrlsArray = null;
+        if (StringUtils.isNotBlank(signUrls)) {
+            signUrlsArray = signUrls.split(",");
+        } else {
+            signUrlsArray = PathMatcherUtil.SIGN_URL_LIST;
+        }
+        //------------------------------------------------------------
         // 建议此处只添加post请求地址而不是所有的都需要走过滤器
-        registration.addUrlPatterns(SIGN_URL_LIST);
+        registration.addUrlPatterns(signUrlsArray);
         return registration;
     }
     //update-end-author:taoyan date:20220427 for: issues/I53J5E post请求X_SIGN签名拦截校验后报错, request body 为空