1.2.1-RELEASE 上传下载,静态资源访问 💥

Former-commit-id: bf2833f2b2a8fe4a27a1c3ae23b3677f51711e49

Author: springboot-plus

CHANGELOG.md

@@ -1,5 +1,38 @@
 # 更新日志 CHANGELOG
 
+## [V1.2.1-RELEASE] 2019.08.20
+
+### ⚡️ Optimization
+- 启用项目静态资源访问，可访问static/templates目录下资源
+- static资源访问：http://127.0.0.1:8888/static/welcome.html
+- templates资源访问：http://127.0.0.1:8888/templates/springbootplus.html
+
+###  ⭐️  New Features
+- 文件上传保存到服务器指定目录
+- 文件下载
+- 访问上传的图片等资源
+- static/templates项目静态资源访问
+
+### 📝 Added/Modified
+- Add `UploadController` 上传控制器
+- Add `DownloadController` 下载控制器
+- Add `ImageController` 图片访问控制器
+- Add `ResourceInterceptor` 资源拦截器
+
+- Modify `WebMvcConfig` 注册资源拦截器，项目静态资源访问配置
+- Modify `SpringBootPlusConfig` 创建 `ResourceInterceptor` 资源拦截器
+- Modify `SpringBootPlusInterceptorConfig` 添加 `resourceConfig` 资源拦截器配置 
+- Modify `SpringBootPlusProperties`  添加 `uploadPath`,`resourceAccessPath`,`resourceAccessPatterns`,`resourceAccessUrl`属性
+- Modify `application.yml`, `application-local.yml` 添加文件上传/下载配置
+
+- Modify `mysql_spring_boot_plus.sql` 添加创建数据库语句，如果不存在，则创建
+
+
+### 🔨 Dependency Upgrades
+- Upgrade to springboot 2.1.7.RELEASE
+
+
+
 ## [V1.2.0-RELEASE] 2019.08.06
 ### 🚀 spring-boot-plus演示地址
 - 👉 [spring-boot-plus演示地址-Spring Boot Admin](http://47.105.159.10:8888)

README.md

@@ -58,12 +58,12 @@ Redis | 3.2+ |  |
 ### 技术选型 
 技术 | 版本 |  备注
 -|-|-
-Spring Boot | 2.1.6.RELEASE | 最新发布稳定版 |
-Spring Framework | 5.1.8.RELEASE | 最新发布稳定版 |
+Spring Boot | 2.1.7.RELEASE | 最新发布稳定版 |
+Spring Framework | 5.1.9.RELEASE | 最新发布稳定版 |
 Mybatis | 3.5.1 | 持久层框架 |
-Mybatis Plus | 3.1.1 | mybatis增强框架 |
-Alibaba Druid | 1.1.17 | 数据源 |
-Fastjson | 1.2.58 | JSON处理工具集 |
+Mybatis Plus | 3.1.2 | mybatis增强框架 |
+Alibaba Druid | 1.1.18 | 数据源 |
+Fastjson | 1.2.59 | JSON处理工具集 |
 swagger2 | 2.6.1 | api文档生成工具 |
 commons-lang3 | 3.9 | 常用工具包 |
 commons-io | 2.6 | IO工具包 |

docs/db/mysql_spring_boot_plus.sql

@@ -14,6 +14,11 @@
  * limitations under the License.
 */
 
+-- ----------------------------
+-- Create Database for spring_boot_plus
+-- ----------------------------
+create database if not exists spring_boot_plus character set utf8mb4;
+
 -- ----------------------------
 -- Table structure for ip
 -- ----------------------------

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>io.geekidea</groupId>
     <artifactId>spring-boot-plus</artifactId>
-    <version>1.2.0.RELEASE</version>
+    <version>1.2.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-plus</name>
@@ -46,7 +46,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project-parent.version>${parent.version}</project-parent.version>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
+        <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
         <mybatis-plus-boot-starter.version>3.1.2</mybatis-plus-boot-starter.version>
         <fastjson.version>1.2.59</fastjson.version>
         <swagger2.version>2.6.1</swagger2.version>

src/main/assembly/assembly.xml

@@ -22,7 +22,6 @@
 
     <!-- 打包的类型，如果有N个，将会打N个类型的包 -->
     <formats>
-        <format>dir</format>
         <format>tar.gz</format>
         <format>zip</format>
     </formats>

src/main/java/io/geekidea/springbootplus/common/web/interceptor/ResourceInterceptor.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2019-2029 geekidea(https://github.com/geekidea)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.geekidea.springbootplus.common.web.interceptor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 资源拦截器
+ * @author geekidea
+ * @date 2019/8/20
+ * @since 1.2.1-RELEASE
+ */
+@Slf4j
+public class ResourceInterceptor extends HandlerInterceptorAdapter {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        // 如果访问的控制器,则跳出,继续执行下一个拦截器
+        if (handler instanceof HandlerMethod) {
+            return true;
+        }
+        // 资源拦截器，业务处理代码
+        log.info("ResourceInterceptor...");
+        // 访问路径
+        String url = request.getRequestURI();
+        // 访问全路径
+        String fullUrl = request.getRequestURL().toString();
+        // 访问token，如果需要，可以设置参数，进行鉴权
+        String token = request.getParameter("token");
+
+        log.info("url:{}",url);
+        log.info("fullUrl:{}",fullUrl);
+        log.info("token:{}",token);
+
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+        // 记录实际访问图片日志...
+    }
+}

src/main/java/io/geekidea/springbootplus/config/WebMvcConfig.java

@@ -17,6 +17,7 @@
 package io.geekidea.springbootplus.config;
 
 import io.geekidea.springbootplus.common.web.interceptor.PermissionInterceptor;
+import io.geekidea.springbootplus.common.web.interceptor.ResourceInterceptor;
 import io.geekidea.springbootplus.common.web.interceptor.TokenTimeoutInterceptor;
 import io.geekidea.springbootplus.config.core.SpringBootPlusProperties;
 import io.geekidea.springbootplus.security.interceptor.JwtInterceptor;
@@ -47,20 +48,26 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Autowired
     private TokenTimeoutInterceptor tokenTimeoutInterceptor;
 
+    @Autowired
+    private ResourceInterceptor resourceInterceptor;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
+        // 资源拦截器注册
+        registry.addInterceptor(resourceInterceptor)
+                .addPathPatterns(springBootPlusProperties.getInterceptorConfig().getResourceConfig().getIncludePath());
 
-//        // JWT拦截器
+//        // JWT拦截器注册
 //        registry.addInterceptor(jwtInterceptor)
 //                .addPathPatterns("/**")
 //                .excludePathPatterns(springBootPlusProperties.getInterceptorConfig().getJwtConfig().getExcludePath());
 //
-//        // TOKEN超时拦截器
+//        // TOKEN超时拦截器注册
 //        registry.addInterceptor(tokenTimeoutInterceptor)
 //                .addPathPatterns("/**")
 //                .excludePathPatterns(springBootPlusProperties.getInterceptorConfig().getTokenTimeoutConfig().getExcludePath());
 //
-//        // 权限拦截器
+//        // 权限拦截器注册
 //        registry.addInterceptor(permissionInterceptor)
 //                .addPathPatterns("/**")
 //                .excludePathPatterns(springBootPlusProperties.getInterceptorConfig().getPermissionConfig().getExcludePath());
@@ -69,9 +76,18 @@ public void addInterceptors(InterceptorRegistry registry) {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // 设置项目静态资源访问
+        registry.addResourceHandler("/static/**")
+                .addResourceLocations("classpath:/static/");
+        registry.addResourceHandler("/templates/**")
+                .addResourceLocations("classpath:/templates/");
+        // 设置swagger静态资源访问
         registry.addResourceHandler("swagger-ui.html")
                 .addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        // 设置上传文件访问路径
+        registry.addResourceHandler(springBootPlusProperties.getResourceAccessPatterns())
+                .addResourceLocations("file:" + springBootPlusProperties.getUploadPath());
     }
 }

src/main/java/io/geekidea/springbootplus/config/core/SpringBootPlusConfig.java

@@ -17,6 +17,7 @@
 
 import io.geekidea.springbootplus.common.aop.LogAop;
 import io.geekidea.springbootplus.common.web.interceptor.PermissionInterceptor;
+import io.geekidea.springbootplus.common.web.interceptor.ResourceInterceptor;
 import io.geekidea.springbootplus.common.web.interceptor.TokenTimeoutInterceptor;
 import io.geekidea.springbootplus.security.interceptor.JwtInterceptor;
 import lombok.extern.slf4j.Slf4j;
@@ -79,4 +80,14 @@ public TokenTimeoutInterceptor tokenTimeoutInterceptor(){
         return tokenTimeoutInterceptor;
     }
 
+    /**
+     * 资源拦截器
+     * @return
+     */
+    @Bean
+    public ResourceInterceptor resourceInterceptor(){
+        ResourceInterceptor resourceInterceptor = new ResourceInterceptor();
+        return resourceInterceptor;
+    }
+
 }

src/main/java/io/geekidea/springbootplus/config/core/SpringBootPlusInterceptorConfig.java

@@ -45,6 +45,11 @@ public class SpringBootPlusInterceptorConfig implements Serializable {
      */
     private InterceptorConfig permissionConfig;
 
+    /**
+     * 资源拦截器
+     */
+    private InterceptorConfig resourceConfig;
+
     @Data
     public static class InterceptorConfig {
 
@@ -53,6 +58,11 @@ public static class InterceptorConfig {
          */
         private String excludePath;
 
+        /**
+         * 包含的路径
+         */
+        private String includePath;
+
     }
 
 }

src/main/java/io/geekidea/springbootplus/config/core/SpringBootPlusProperties.java

@@ -58,4 +58,22 @@ public class SpringBootPlusProperties {
     @NestedConfigurationProperty
     private SpringBootPlusInterceptorConfig interceptorConfig;
 
+
+    /**
+     * 上传目录
+     */
+    private String uploadPath;
+    /**
+     * 资源访问路径，前端访问
+     */
+    private String resourceAccessPath;
+    /**
+     * 资源访问路径，后段配置，资源映射/拦截器使用
+     */
+    private String resourceAccessPatterns;
+    /**
+     * 资源访问全路径
+     */
+    private String resourceAccessUrl;
+
 }