升级2.0.8.RC1版本号

Author: hengboy

README.md

@@ -49,6 +49,7 @@
 - **[Quartz](http://www.quartz-scheduler.org)**：分布式定时任务调度框架
 - **[Swagger2](https://swagger.io/)**：Swagger是一款API文档生成工具，自动扫描代码进行生成可运行测试的文档。
 - **[Mybatis Enhance](https://github.com/hengboy/mybatis-enhance)**：`Enhance`是对于原生的`MyBatis`的增强编写，不影响任何原生的使用，使用后完全替代`mybatis-core`、`mybatis-spring`以及`mybatis-spring-boot-starter`，可以使用`SpringBoot`配置文件的形式进行配置相关的内容，尽可能强大的方便快速的集成`MyBatis`。
+- **[Mybatis Enhance Codegen](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-mybatis-enhance-codegen)**：为`Mybatis Enhance`搭配研发的代码自动生成`Maven Plugin`，自定生成对应数据库表结构的数据实体、动态查询实体等，通过`like`语法可以过滤指定表的生成。
 - **[DataSource Switch](https://github.com/hengboy/api-boot/tree/master/api-boot-project/api-boot-plugins/api-boot-plugin-datasource-switch)**：一款多数据源自动切换框架，可配置多种数据库类型数据源集成、主从数据源配置。
 - **[Mybatis Pageable](https://github.com/hengboy/mybatis-pageable)**：`MyBatis-Pageable`是一款自动化分页的插件，基于`MyBatis`内部的插件`Interceptor`拦截器编写完成，拦截`Executor.query`的两个重载方法计算出分页的信息以及根据配置的数据库`Dialect`自动执行不同的查询语句完成总数量的统计。
 - **[Code Builder](https://github.com/hengboy/code-builder)**：`code-builder`是一款代码生成`maven mojo`插件，通过简单的配置就可以完成数据库内`Table`转换`Entity`或者其他实体类，想怎么生成完全根据你的个人业务逻辑，`code-builder`尽可能的完善的提供数据库内的一些定义的信息，让你更方便更灵活的来生成`Java`文件。
@@ -73,7 +74,7 @@
     <dependency>
       <groupId>org.minbox.framework</groupId>
       <artifactId>api-boot-dependencies</artifactId>
-      <version>2.0.7.RELEASE</version>
+      <version>2.0.8.RC1</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -102,6 +103,7 @@ Demo列表：
 - [ApiBoot Message Push](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-message-push)
 - [ApiBoot RateLimiter](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-rate-limiter)
 - [ApiBoot Mybatis Enhance](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-mybatis-enhance)
+- [ApiBoot Mybatis Enhance Codegen](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-mybatis-enhance-codegen)
 - [ApiBoot Mybatis Pageable](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-mybatis-pageable)
 
 ## 更新日志
@@ -127,7 +129,7 @@ Demo列表：
 
 #### 恒宇少年微信
 
-yuqiyu999
+**yuqiyu999**
 
 #### ApiBoot 开源群组
 
@@ -155,6 +157,7 @@ yuqiyu999
 │   ├── api-boot-sample-resource-load
 │   ├── api-boot-sample-rate-limiter
 │   ├── api-boot-sample-mybatis-enhance
+│   ├── api-boot-sample-mybatis-enhance-codegen
 │   ├── api-boot-sample-mybatis-pageable
 │   ├── api-boot-sample-quartz    
 │   └── api-boot-sample-swagger

api-boot-project/api-boot-autoconfigure/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.0.8.RC1</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/ratelimiter/ApiBootRateLimiterAutoConfiguration.java

@@ -18,11 +18,10 @@
 package org.minbox.framework.api.boot.autoconfigure.ratelimiter;
 
 import org.minbox.framework.api.boot.plugin.rate.limiter.ApiBootRateLimiter;
-import org.minbox.framework.api.boot.plugin.rate.limiter.ApiBootRateLimiterConfiguration;
+import org.minbox.framework.api.boot.plugin.rate.limiter.aop.advisor.ApiBootRateLimiterAdvisor;
+import org.minbox.framework.api.boot.plugin.rate.limiter.aop.interceptor.ApiBootRateLimiterMethodInterceptor;
 import org.minbox.framework.api.boot.plugin.rate.limiter.centre.RateLimiterConfigCentre;
 import org.minbox.framework.api.boot.plugin.rate.limiter.centre.support.DefaultRateLimiterConfigCentre;
-import org.minbox.framework.api.boot.plugin.rate.limiter.config.RateLimiterConfig;
-import org.minbox.framework.api.boot.plugin.rate.limiter.handler.ApiBootDefaultRateLimiterInterceptorHandler;
 import org.minbox.framework.api.boot.plugin.rate.limiter.support.GoogleGuavaRateLimiter;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -46,7 +45,7 @@
  * GitHub：https://github.com/hengboy
  */
 @Configuration
-@ConditionalOnClass(ApiBootRateLimiterConfiguration.class)
+@ConditionalOnClass(ApiBootRateLimiter.class)
 @EnableConfigurationProperties(ApiBootRateLimiterProperties.class)
 @AutoConfigureAfter(WebMvcAutoConfiguration.class)
 @Import({ApiBootRateLimiterRedisAutoConfiguration.class, ApiBootRateLimiterNacosConfigConfiguration.class})
@@ -60,18 +59,6 @@ public ApiBootRateLimiterAutoConfiguration(ApiBootRateLimiterProperties apiBootR
         this.apiBootRateLimiterProperties = apiBootRateLimiterProperties;
     }
 
-    /**
-     * ApiBoot Rate Limiter Interceptor
-     *
-     * @param apiBootRateLimiter ApiBoot RateLimiter
-     * @return ApiBootDefaultRateLimiterInterceptorHandler
-     */
-    @Bean
-    @ConditionalOnMissingBean
-    public ApiBootDefaultRateLimiterInterceptorHandler apiBootDefaultRateLimiterInterceptorHandler(ApiBootRateLimiter apiBootRateLimiter) {
-        return new ApiBootDefaultRateLimiterInterceptorHandler(apiBootRateLimiter);
-    }
-
     /**
      * google guava rate limiter
      *
@@ -98,18 +85,27 @@ public RateLimiterConfigCentre defaultRateLimiterConfigCentre() {
     }
 
     /**
-     * ApiBoot Rate Limiter Configuration
+     * ApiBoot RateLimiter Pointcut Advisor
      *
-     * @param apiBootDefaultRateLimiterInterceptorHandler ApiBoot RateLimiter Interceptor
-     * @return ApiBootRateLimiterConfiguration
+     * @param apiBootRateLimiterMethodInterceptor ResourceLoad Annotation Method Interceptor
+     * @return ApiBootRateLimiterAdvisor
      */
     @Bean
     @ConditionalOnMissingBean
-    public ApiBootRateLimiterConfiguration apiBootRateLimiterConfiguration(ApiBootDefaultRateLimiterInterceptorHandler apiBootDefaultRateLimiterInterceptorHandler) {
-        // rate limiter config
-        RateLimiterConfig rateLimiterConfig = new RateLimiterConfig();
-        rateLimiterConfig.setInterceptorUrl(apiBootRateLimiterProperties.getInterceptorUrl());
+    ApiBootRateLimiterAdvisor rateLimiterAdvisor(ApiBootRateLimiterMethodInterceptor apiBootRateLimiterMethodInterceptor) {
+        return new ApiBootRateLimiterAdvisor(apiBootRateLimiterMethodInterceptor);
+    }
 
-        return new ApiBootRateLimiterConfiguration(rateLimiterConfig, apiBootDefaultRateLimiterInterceptorHandler);
+    /**
+     * ResourceLoad Annotation Method Interceptor
+     * Implementing major business logic
+     *
+     * @param apiBootRateLimiter apiBootRateLimiter
+     * @return ApiBootRateLimiterMethodInterceptor
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    ApiBootRateLimiterMethodInterceptor rateLimiterMethodInterceptor(ApiBootRateLimiter apiBootRateLimiter) {
+        return new ApiBootRateLimiterMethodInterceptor(apiBootRateLimiter);
     }
 }

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/ratelimiter/ApiBootRateLimiterProperties.java

@@ -45,14 +45,17 @@ public class ApiBootRateLimiterProperties {
     /**
      * 限流请求地址前缀
      */
+    @Deprecated
     private String[] interceptorUrl = {"/**"};
     /**
      * 全局QPS配置
      * 默认每秒限流10次请求
      */
+    @Deprecated
     private Long globalQps = 10L;
     /**
      * 开启全局QPS配置
      */
+    @Deprecated
     private boolean enableGlobalQps = false;
 }

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/swagger/SwaggerProperties.java

@@ -45,7 +45,7 @@ public class SwaggerProperties {
     /**
      * 文档版本号
      */
-    private String version = "2.0.7.RELEASE";
+    private String version = "2.0.8.RC1";
     /**
      * 文档版权
      */

api-boot-project/api-boot-autoconfigure/src/main/resources/banner.txt

@@ -6,4 +6,4 @@
          |
          '
 :: Based On SpringBoot Version : ${spring-boot.formatted-version} ::
-:: ApiBoot Version : v2.0.7.RELEASE ::
+:: ApiBoot Version : v2.0.8.RC1 ::

api-boot-project/api-boot-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.0.8.RC1</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

api-boot-project/api-boot-dependencies/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.0.8.RC1</version>
         <relativePath>../..</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -15,7 +15,7 @@
     <properties>
         <main.basedir>${basedir}/../..</main.basedir>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
-        <api.boot.version>2.0.7.RELEASE</api.boot.version>
+        <api.boot.version>2.0.8.RC1</api.boot.version>
         <druid.version>1.1.14</druid.version>
         <druid.starter.version>1.1.14</druid.starter.version>
         <fastjson.version>1.2.56</fastjson.version>

api-boot-project/api-boot-maven-plugins/api-boot-maven-plugin-code-builder/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>api-boot-maven-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.0.8.RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>maven-plugin</packaging>

api-boot-project/api-boot-maven-plugins/api-boot-mybatis-enhance-maven-codegen/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>api-boot-maven-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.0.8.RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>maven-plugin</packaging>