Jeecg-Boot 2.2.0 版本发布 | 重磅升级

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/MinioConfig.java

@@ -1,7 +1,7 @@
 package org.jeecg.config;
 
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.system.util.MinioUtil;
+import org.jeecg.common.util.MinioUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -70,11 +70,12 @@ public class ShiroConfig {
 		//cas验证登录
 		filterChainDefinitionMap.put("/cas/client/validateLogin", "anon");
 		// 配置不会被拦截的链接 顺序判断
-		filterChainDefinitionMap.put("/sys/getCheckCode", "anon"); //登录验证码接口排除
 		filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
+		filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除
 		filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
 		filterChainDefinitionMap.put("/sys/mLogin", "anon"); //登录接口排除
 		filterChainDefinitionMap.put("/sys/logout", "anon"); //登出接口排除
+		filterChainDefinitionMap.put("/thirdLogin/**", "anon"); //第三方登录
 		filterChainDefinitionMap.put("/sys/getEncryptedString", "anon"); //获取加密串
 		filterChainDefinitionMap.put("/sys/sms", "anon");//短信验证码
 		filterChainDefinitionMap.put("/sys/phoneLogin", "anon");//手机登录		
@@ -85,8 +86,6 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/sys/user/passwordChange", "anon");//用户更改密码
 		filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
 		filterChainDefinitionMap.put("/sys/common/static/**", "anon");//图片预览 &下载文件不限制token
-		//filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token
-		//filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token
 		filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览
 		filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
 		filterChainDefinitionMap.put("/", "anon");
@@ -117,19 +116,16 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/actuator/httptrace/**", "anon");
 		filterChainDefinitionMap.put("/actuator/redis/**", "anon");
 
+        //大屏设计器排除
+		filterChainDefinitionMap.put("/big/screen/**", "anon");
+
 		//测试示例
 		filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面
 		filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试
 
-		//排除Online请求
-		filterChainDefinitionMap.put("/auto/cgform/**", "anon");
-
 		//websocket排除
 		filterChainDefinitionMap.put("/websocket/**", "anon");
 
-		//大屏设计器排除
-		filterChainDefinitionMap.put("/big/screen/**", "anon");
-
 		// 添加自己的过滤器并且取名为jwt
 		Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
 		filterMap.put("jwt", new JwtFilter());
@@ -173,6 +169,12 @@ public class ShiroConfig {
 	public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() {
 		DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
 		defaultAdvisorAutoProxyCreator.setProxyTargetClass(true);
+		/**
+		* 解决重复代理问题 github#994
+		* 添加前缀判断 不匹配 任何Advisor
+		*/
+		defaultAdvisorAutoProxyCreator.setUsePrefix(true);
+		defaultAdvisorAutoProxyCreator.setAdvisorBeanNamePrefix("_no_advisor");
 		return defaultAdvisorAutoProxyCreator;
 	}
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -1,32 +1,31 @@
 package org.jeecg.config;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.shiro.vo.DefContants;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
-
-import io.swagger.annotations.ApiOperation;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.Parameter;
-import lombok.extern.slf4j.Slf4j;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.Parameter;
 import springfox.documentation.service.SecurityScheme;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @Author scott
  */
@@ -34,6 +33,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration
 @EnableSwagger2
 @EnableSwaggerBootstrapUI
+@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
 public class Swagger2Config implements WebMvcConfigurer {
 
 	/**

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -1,18 +1,20 @@
 package org.jeecg.config;
 
+import org.jeecg.modules.shiro.authc.interceptor.OnlineInterceptor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * Spring Boot 2.0 解决跨域问题
- * 
+ *
  * @Author qinfeng
  *
  */
@@ -26,6 +28,11 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 	@Value("${spring.resource.static-locations}")
 	private String staticLocations;
 
+	@Bean
+	public OnlineInterceptor onlineInterceptor(){
+		return new OnlineInterceptor();
+	}
+
 	@Bean
 	public CorsFilter corsFilter() {
 		final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
@@ -60,4 +67,10 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 	public void addViewControllers(ViewControllerRegistry registry) {
 		registry.addViewController("/").setViewName("doc.html");
 	}
+
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+		String [] exculudes = new String[]{"/*.html","/html/**","/js/**","/css/**","/images/**"};
+		registry.addInterceptor(onlineInterceptor()).excludePathPatterns(exculudes).addPathPatterns("/online/cgform/api/**");
+	}
 }