Skip to content

Commit f68d7ec

Browse files
hengboyhengboy
committed
发布2.0.7.RELEASE.
1 parent a2916d0 commit f68d7ec

File tree

65 files changed

+178
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+178
-87
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>org.minbox.framework</groupId>
7575
<artifactId>api-boot-dependencies</artifactId>
76-
<version>2.0.6.RELEASE</version>
76+
<version>2.0.7.RELEASE</version>
7777
<type>pom</type>
7878
<scope>import</scope>
7979
</dependency>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>api-boot-parent</artifactId>
77
<groupId>org.minbox.framework</groupId>
8-
<version>2.0.6.RELEASE</version>
8+
<version>2.0.7.RELEASE</version>
99
<relativePath>../api-boot-parent</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
@@ -187,5 +187,12 @@
187187
<optional>true</optional>
188188
</dependency>
189189

190+
<!--Nacos Config-->
191+
<dependency>
192+
<groupId>com.alibaba.boot</groupId>
193+
<artifactId>nacos-config-spring-boot-starter</artifactId>
194+
<optional>true</optional>
195+
</dependency>
196+
190197
</dependencies>
191198
</project>

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.minbox.framework.api.boot.plugin.rate.limiter.ApiBootRateLimiter;
2121
import org.minbox.framework.api.boot.plugin.rate.limiter.ApiBootRateLimiterConfiguration;
2222
import org.minbox.framework.api.boot.plugin.rate.limiter.centre.RateLimiterConfigCentre;
23+
import org.minbox.framework.api.boot.plugin.rate.limiter.centre.support.DefaultRateLimiterConfigCentre;
2324
import org.minbox.framework.api.boot.plugin.rate.limiter.config.RateLimiterConfig;
2425
import org.minbox.framework.api.boot.plugin.rate.limiter.handler.ApiBootDefaultRateLimiterInterceptorHandler;
2526
import org.minbox.framework.api.boot.plugin.rate.limiter.support.GoogleGuavaRateLimiter;
@@ -79,7 +80,19 @@ public ApiBootDefaultRateLimiterInterceptorHandler apiBootDefaultRateLimiterInte
7980
@ConditionalOnMissingBean
8081
@ConditionalOnMissingClass("org.springframework.data.redis.core.RedisTemplate")
8182
public ApiBootRateLimiter googleGuavaRateLimiter(RateLimiterConfigCentre rateLimiterConfigCentre) {
82-
return new GoogleGuavaRateLimiter(apiBootRateLimiterProperties.getGlobalQps(), rateLimiterConfigCentre);
83+
return new GoogleGuavaRateLimiter(apiBootRateLimiterProperties.isEnableGlobalQps() ? apiBootRateLimiterProperties.getGlobalQps() : 0L, rateLimiterConfigCentre);
84+
}
85+
86+
/**
87+
* default config centre
88+
*
89+
* @return RateLimiterConfigCentre
90+
*/
91+
@Bean
92+
@ConditionalOnMissingBean
93+
@ConditionalOnMissingClass({"com.alibaba.boot.nacos.config.properties.NacosConfigProperties"})
94+
public RateLimiterConfigCentre defaultRateLimiterConfigCentre() {
95+
return new DefaultRateLimiterConfigCentre();
8396
}
8497

8598
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* GitHub：https://github.com/hengboy
5252
*/
5353
@Configuration
54-
@ConditionalOnClass(NacosConfigProperties.class)
54+
@ConditionalOnClass(name = "com.alibaba.boot.nacos.config.properties.NacosConfigProperties")
5555
@EnableConfigurationProperties({NacosConfigProperties.class})
5656
@AutoConfigureAfter(NacosConfigAutoConfiguration.class)
5757
public class ApiBootRateLimiterNacosConfigConfiguration {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
@Configuration
4444
@EnableConfigurationProperties(ApiBootRateLimiterProperties.class)
45-
@ConditionalOnClass(RedisTemplate.class)
45+
@ConditionalOnClass(name = "org.springframework.data.redis.core.RedisTemplate")
4646
@AutoConfigureAfter(RedisAutoConfiguration.class)
4747
public class ApiBootRateLimiterRedisAutoConfiguration {
4848
/**
@@ -63,6 +63,6 @@ public ApiBootRateLimiterRedisAutoConfiguration(ApiBootRateLimiterProperties api
6363
@Bean
6464
@ConditionalOnMissingBean
6565
public ApiBootRateLimiter redisLuaRateLimiter(RedisTemplate redisTemplate, RateLimiterConfigCentre rateLimiterConfigCentre) {
66-
return new RedisLuaRateLimiter(apiBootRateLimiterProperties.getGlobalQps(), rateLimiterConfigCentre, redisTemplate);
66+
return new RedisLuaRateLimiter(apiBootRateLimiterProperties.isEnableGlobalQps() ? apiBootRateLimiterProperties.getGlobalQps() : 0L, rateLimiterConfigCentre, redisTemplate);
6767
}
6868
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SwaggerProperties {
4545
/**
4646
* 文档版本号
4747
*/
48-
private String version = "2.0.6.RELEASE";
48+
private String version = "2.0.7.RELEASE";
4949
/**
5050
* 文档版权
5151
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
|
77
'
88
:: Based On SpringBoot Version : ${spring-boot.formatted-version} ::
9-
:: ApiBoot Version : v2.0.7.RC1 ::
9+
:: ApiBoot Version : v2.0.7.RELEASE ::

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>api-boot-parent</artifactId>
77
<groupId>org.minbox.framework</groupId>
8-
<version>2.0.6.RELEASE</version>
8+
<version>2.0.7.RELEASE</version>
99
<relativePath>../api-boot-parent</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>api-boot</artifactId>
77
<groupId>org.minbox.framework</groupId>
8-
<version>2.0.6.RELEASE</version>
8+
<version>2.0.7.RELEASE</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<packaging>pom</packaging>
@@ -15,7 +15,7 @@
1515
<properties>
1616
<main.basedir>${basedir}/../..</main.basedir>
1717
<spring.boot.version>2.1.4.RELEASE</spring.boot.version>
18-
<api.boot.version>2.0.6.RELEASE</api.boot.version>
18+
<api.boot.version>2.0.7.RELEASE</api.boot.version>
1919
<druid.version>1.1.14</druid.version>
2020
<druid.starter.version>1.1.14</druid.starter.version>
2121
<fastjson.version>1.2.56</fastjson.version>
@@ -38,6 +38,10 @@
3838
<mybatis.pageable.core.version>1.0.6.RELEASE</mybatis.pageable.core.version>
3939
<mybatis.enhance.core.version>1.1.0.RELEASE</mybatis.enhance.core.version>
4040
<mybatis.enhance.dsl.version>1.0.7.RELEASE</mybatis.enhance.dsl.version>
41+
<mysema.codegen.version>0.6.8</mysema.codegen.version>
42+
43+
<!--Nacos Config-->
44+
<nacos.config.version>0.2.1</nacos.config.version>
4145

4246
<!--Plugin Versions-->
4347
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
@@ -339,6 +343,20 @@
339343
<version>${api.boot.version}</version>
340344
</dependency>
341345

346+
<!--Codegen-->
347+
<dependency>
348+
<groupId>com.mysema.codegen</groupId>
349+
<artifactId>codegen</artifactId>
350+
<version>${mysema.codegen.version}</version>
351+
</dependency>
352+
353+
<!--Nacos Config-->
354+
<dependency>
355+
<groupId>com.alibaba.boot</groupId>
356+
<artifactId>nacos-config-spring-boot-starter</artifactId>
357+
<version>${nacos.config.version}</version>
358+
</dependency>
359+
342360
</dependencies>
343361
</dependencyManagement>
344362

@@ -367,6 +385,12 @@
367385
<artifactId>maven-plugin-plugin</artifactId>
368386
<version>${maven-plugin-plugin.version}</version>
369387
</plugin>
388+
<!--ApiBoot Mybatis Enhance Codegen-->
389+
<plugin>
390+
<groupId>org.minbox.framework</groupId>
391+
<artifactId>api-boot-mybatis-enhance-maven-codegen</artifactId>
392+
<version>${api.boot.version}</version>
393+
</plugin>
370394
</plugins>
371395
</pluginManagement>
372396
</build>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>api-boot-maven-plugins</artifactId>
2424
<groupId>org.minbox.framework</groupId>
25-
<version>2.0.6.RELEASE</version>
25+
<version>2.0.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828
<packaging>maven-plugin</packaging>

0 commit comments

Comments
 (0)