1.2.0-RELEASE ⚡

Former-commit-id: 633f5b3311a89388462c9415257d3e4427636c09

Author: springboot-plus

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>io.geekidea</groupId>
     <artifactId>spring-boot-plus</artifactId>
-    <version>1.1.0.RELEASE</version>
+    <version>1.2.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-plus</name>
@@ -49,7 +49,7 @@
         <spring-boot.version>2.1.6.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.7.0</swagger2.version>
+        <swagger2.version>2.6.1</swagger2.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <velocity.version>1.7</velocity.version>
         <mysql.version>5.1.47</mysql.version>
@@ -65,10 +65,9 @@
         <jwt.version>0.9.1</jwt.version>
         <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
 
-        <maven-compiler-source.version>1.8</maven-compiler-source.version>
-        <maven-compiler-target.version>1.8</maven-compiler-target.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -185,7 +184,6 @@
             <version>3.2.1</version>
         </dependency>
 
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -233,18 +231,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!-- RabbitMQ -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-
-        <!-- KafkaMQ -->
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
@@ -306,7 +292,6 @@
         </resources>
 
         <plugins>
-
             <!-- 由于没有直接继承spring-boot-starter-parent，此处修添加主类和设置repackage -->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -327,11 +312,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven-resources-plugin.version}</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>

src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java

@@ -43,8 +43,6 @@
 public class SpringBootPlusApplication {
 
     public static void main(String[] args) {
-        // 启动项目，准备工作提示
-        PrintApplicationInfo.printTip();
         // 启动spring-boot-plus
         ConfigurableApplicationContext context = SpringApplication.run(SpringBootPlusApplication.class, args);
         // 打印项目信息

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

@@ -17,8 +17,6 @@
 package io.geekidea.springbootplus.common.web.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -34,91 +32,15 @@
 @Slf4j
 public class PermissionInterceptor extends HandlerInterceptorAdapter {
 
-	@Autowired
-	private RedisTemplate redisTemplate;
-
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
-
-//		// 如果访问的不是控制器,则跳出,继续执行下一个拦截器
-//		if (!(handler instanceof HandlerMethod)) {
-//			return true;
-//		}
-//
-//		// 获取token
-//		String token = request.getHeader(CommonConstant.TOKEN);
-//		boolean hastoken = false;
-//		if (StringUtils.isNotBlank(token)){
-//			hastoken = true;
-//		}
-//		if (hastoken == false){
-//			token = request.getParameter(CommonConstant.TOKEN);
-//			if (StringUtils.isNotBlank(token)){
-//				hastoken = true;
-//			}
-//		}
-//		if (hastoken == false){
-//			// 请传入token
-//			ApiResult apiResult = new ApiResult();
-//			apiResult.setCode(ResponseCode.NOT_PERMISSION);
-//			apiResult.setMsg("请传入有效的token");
-//			HttpServletResponseUtil.printJSON(response,apiResult);
-//			return false;
-//		}
-//
-//		// 判断是否登陆
-////		LoginSysUserVo loginSysUserVo = (LoginSysUserVo) redisTemplate.opsForValue().get(token);
-////		if (loginSysUserVo == null){
-////			ResponseResult responseResult = new ResponseResult();
-////			responseResult.setCode(ResponseCode.NOT_LOGIN);
-////			responseResult.setMsg("token无效或已过期,请重新登录");
-////			HttpServletResponseUtil.printJSON(response,responseResult);
-////			return false;
-////		}
-//
-//		// 判断是否有权限
-////		String path = request.getServletPath();
-//		// 获取到权限路径
-//		// TODO 需判断第一次初始化信息
-////		List<String> allFuncActions = loginSysUserVo.getAllFuncActions();
-////		if (CollectionUtils.isEmpty(allFuncActions)){
-////			HttpServletResponseUtil.printJSON(response,new ResponseResult(ResponseCode.NOT_PERMISSION,"该用户没有任何权限功能"));
-////			return false;
-////		}
-//
-////		// 排除不需要权限验证的路径
-////		if (isExistsPath(path)){
-////			// 将当前登录用户保存到request中
-////			request.setAttribute(CommonConstant.LOGIN_SYS_USER, loginSysUserVo);
-////			return true;
-////		}
-////
-////		// 验证是否有操作权限
-////		if (!allFuncActions.contains(path)){
-////			HttpServletResponseUtil.printJSON(response,new ResponseResult(ResponseCode.NOT_PERMISSION,"该用户没有此操作权限"));
-////			return false;
-////		}
-//
-//		// 将当前登录用户保存到request中
-////		request.setAttribute(CommonConstant.LOGIN_SYS_USER, loginSysUserVo);
-
+		log.info("\n\nPermissionInterceptor...\n\n");
 		return true;
 	}
 
 	@Override
 	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
 	}
 
-//	public boolean isExistsPath(String path){
-//		if (functionExcludePaths == null || functionExcludePaths.length == 0){
-//			return false;
-//		}
-//		for (String functionExcludePath : functionExcludePaths){
-//			if (path.startsWith(functionExcludePath)){
-//				return true;
-//			}
-//		}
-//		return false;
-//	}
 }

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

@@ -18,16 +18,15 @@
 
 import io.geekidea.springbootplus.common.web.interceptor.PermissionInterceptor;
 import io.geekidea.springbootplus.common.web.interceptor.TokenTimeoutInterceptor;
+import io.geekidea.springbootplus.config.core.SpringBootPlusProperties;
 import io.geekidea.springbootplus.security.interceptor.JwtInterceptor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import java.util.Arrays;
-
 /**
  * @author geekidea
  * @date 2018-11-08
@@ -36,61 +35,35 @@
 @Slf4j
 public class WebMvcConfig implements WebMvcConfigurer {
 
-    @Value("${spring-boot-plus.interceptor.jwt.exclude.path}")
-    private String[] jwtExcludePaths;
-
-    @Value("${spring-boot-plus.interceptor.token-timeout.exclude.path}")
-    private String[] tokenTimeoutExcludePaths;
-
-    @Value("${spring-boot-plus.interceptor.permission.exclude.path}")
-    private String[] permissionExcludePaths;
+    @Autowired
+    private SpringBootPlusProperties springBootPlusProperties;
 
-    /**
-     * jwt token验证拦截器
-     * @return
-     */
-//    @Bean
-    public JwtInterceptor jwtInterceptor(){
-        return new JwtInterceptor();
-    }
+    @Autowired
+    private JwtInterceptor jwtInterceptor;
 
-    /**
-     * 权限拦截器
-     * @return
-     */
-//    @Bean
-    public PermissionInterceptor permissionInterceptor(){
-        return new PermissionInterceptor();
-    }
-
-    /**
-     * TOKEN超时拦截器
-     * @return
-     */
-//    @Bean
-    public TokenTimeoutInterceptor tokenTimeoutInterceptor(){
-        return new TokenTimeoutInterceptor();
-    }
+    @Autowired
+    private PermissionInterceptor permissionInterceptor;
 
+    @Autowired
+    private TokenTimeoutInterceptor tokenTimeoutInterceptor;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        log.info("PermissionInterceptor excludePaths : {}", Arrays.toString(permissionExcludePaths));
-//
-//        registry.addInterceptor(jwtInterceptor())
-//                .addPathPatterns("/**")
-//                .excludePathPatterns(jwtExcludePaths);
 
-        // 1.TOKEN超时拦截器
-//        registry.addInterceptor(tokenTimeoutInterceptor())
+//        // JWT拦截器
+//        registry.addInterceptor(jwtInterceptor)
+//                .addPathPatterns("/**")
+//                .excludePathPatterns(springBootPlusProperties.getInterceptorConfig().getJwtConfig().getExcludePath());
+//
+//        // TOKEN超时拦截器
+//        registry.addInterceptor(tokenTimeoutInterceptor)
 //                .addPathPatterns("/**")
-//                .excludePathPatterns(tokenTimeoutExcludePaths);
+//                .excludePathPatterns(springBootPlusProperties.getInterceptorConfig().getTokenTimeoutConfig().getExcludePath());
 //
-//        // 2.权限拦截器
-//        registry.addInterceptor(permissionInterceptor())
+//        // 权限拦截器
+//        registry.addInterceptor(permissionInterceptor)
 //                .addPathPatterns("/**")
-//                .excludePathPatterns(permissionExcludePaths)
-//                .excludePathPatterns(operationPlatformIncludePaths);
+//                .excludePathPatterns(springBootPlusProperties.getInterceptorConfig().getPermissionConfig().getExcludePath());
 
     }