Jeecg-Boot 2.1.4 版本发布 | 重构较大,较多新功能

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

@@ -0,0 +1,38 @@
+package org.jeecg.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.system.util.MinioUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Minio文件上传配置文件
+ */
+@Slf4j
+@Configuration
+public class MinioConfig {
+    @Value(value = "${jeecg.minio.minio_url}")
+    private String minioUrl;
+    @Value(value = "${jeecg.minio.minio_name}")
+    private String minioName;
+    @Value(value = "${jeecg.minio.minio_pass}")
+    private String minioPass;
+    @Value(value = "${jeecg.minio.bucketName}")
+    private String bucketName;
+
+    @Bean
+    public void initMinio(){
+        if(!minioUrl.startsWith("http")){
+            minioUrl = "http://" + minioUrl;
+        }
+        if(!minioUrl.endsWith("/")){
+            minioUrl = minioUrl.concat("/");
+        }
+        MinioUtil.setMinioUrl(minioUrl);
+        MinioUtil.setMinioName(minioName);
+        MinioUtil.setMinioPass(minioPass);
+        MinioUtil.setBucketName(bucketName);
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package org.jeecg.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate(ClientHttpRequestFactory factory) {
+        return new RestTemplate(factory);
+    }
+
+    @Bean
+    public ClientHttpRequestFactory simpleClientHttpRequestFactory() {
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setReadTimeout(5000);//ms
+        factory.setConnectTimeout(15000);//ms
+        return factory;
+    }
+}

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

@@ -66,14 +66,12 @@ public class ShiroConfig {
 				filterChainDefinitionMap.put(url,"anon");
 			}
 		}
-		//大屏请求排除
-		filterChainDefinitionMap.put("/big/screen/**", "anon");
-		filterChainDefinitionMap.put("/bigscreen/**", "anon");
 
 		//cas验证登录
 		filterChainDefinitionMap.put("/cas/client/validateLogin", "anon");
 		// 配置不会被拦截的链接 顺序判断
 		filterChainDefinitionMap.put("/sys/getCheckCode", "anon"); //登录验证码接口排除
+		filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
 		filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
 		filterChainDefinitionMap.put("/sys/mLogin", "anon"); //登录接口排除
 		filterChainDefinitionMap.put("/sys/logout", "anon"); //登出接口排除
@@ -86,8 +84,9 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/sys/user/phoneVerification", "anon");//用户忘记密码验证手机号
 		filterChainDefinitionMap.put("/sys/user/passwordChange", "anon");//用户更改密码
 		filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
-		filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token
-		filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token
+		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");
@@ -104,6 +103,7 @@ public class ShiroConfig {
 		// update-begin--Author:sunjianlei Date:20190813 for：排除字体格式的后缀
 		filterChainDefinitionMap.put("/**/*.ttf", "anon");
 		filterChainDefinitionMap.put("/**/*.woff", "anon");
+		filterChainDefinitionMap.put("/**/*.woff2", "anon");
 		// update-begin--Author:sunjianlei Date:20190813 for：排除字体格式的后缀
 
 		filterChainDefinitionMap.put("/druid/**", "anon");
@@ -123,10 +123,13 @@ public class ShiroConfig {
 
 		//排除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());