Merge branch '2.3.x'

Author: hengboy

.github/workflows/deploy.yml

@@ -0,0 +1,41 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Ci Builder
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches:
+        - master
+        - 2.3.x
+  pull_request:
+    branches:
+        - master
+        - 2.3.x
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checkout source code
+      - uses: actions/checkout@v2
+      # Cache maven .m2 directory
+      - uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+              ${{ runner.os }}-maven-
+      # Install Java 1.8
+      - uses: actions/setup-java@v1
+        with:
+          server-id: hengyu
+          java-version: 1.8
+      # Publish to Apache Maven Central
+      - run: mvn clean compile

.mvn/wrapper/maven-wrapper.properties

@@ -2,7 +2,8 @@
 
 # ApiBoot: Born to build Api services as components
 
-[![](https://www.travis-ci.org/minbox-projects/api-boot.svg?branch=master)](https://www.travis-ci.org/github/minbox-projects/api-boot)
+
+[![Ci Builder](https://github.com/minbox-projects/api-boot/workflows/Ci%20Builder/badge.svg)](https://github.com/minbox-projects/api-boot/actions)
 [![](https://codecov.io/gh/minbox-projects/api-boot/branch/master/graph/badge.svg)](https://codecov.io/gh/minbox-projects/api-boot)
 [![](https://badges.gitter.im/api-boot/community.svg)](https://gitter.im/api-boot/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![](https://img.shields.io/badge/link-官方文档-green.svg?style=flat-square)](https://apiboot.minbox.io)

README.md

@@ -2,7 +2,7 @@
 
 # ApiBoot：为组件化构建Api服务而生
 
-[![](https://www.travis-ci.org/minbox-projects/api-boot.svg?branch=master)](https://www.travis-ci.org/github/minbox-projects/api-boot)
+[![Ci Builder](https://github.com/minbox-projects/api-boot/workflows/Ci%20Builder/badge.svg)](https://github.com/minbox-projects/api-boot/actions)
 [![](https://codecov.io/gh/minbox-projects/api-boot/branch/master/graph/badge.svg)](https://codecov.io/gh/minbox-projects/api-boot)
 [![](https://badges.gitter.im/api-boot/community.svg)](https://gitter.im/api-boot/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![](https://img.shields.io/badge/link-官方文档-green.svg?style=flat-square)](https://apiboot.minbox.io)

README.zh-CN.md

@@ -63,6 +63,7 @@
     ApiBootLoggingWebAutoConfiguration.class,
     ApiBootLoggingGlobalLogStorageAutoConfiguration.class
 })
+@EnableLoggingClient
 public class ApiBootLoggingAutoConfiguration {
     /**
      * logger instance

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/logging/ApiBootLoggingAutoConfiguration.java

@@ -20,6 +20,7 @@
 import org.minbox.framework.api.boot.autoconfigure.logging.admin.ui.ApiBootLoggingAdminUiAutoConfiguration;
 import org.minbox.framework.logging.admin.LoggingAdminFactoryBean;
 import org.minbox.framework.logging.admin.storage.LoggingDataSourceStorage;
+import org.minbox.framework.logging.spring.context.annotation.admin.EnableLoggingAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
@@ -51,6 +52,7 @@
     ApiBootLoggingAdminUiAutoConfiguration.class
 })
 @EnableAsync
+@EnableLoggingAdmin
 public class ApiBootLoggingAdminAutoConfiguration {
     /**
      * logger instance

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/logging/admin/ApiBootLoggingAdminAutoConfiguration.java

@@ -23,7 +23,7 @@
  */
 @Configuration
 @EnableConfigurationProperties(ApiBootMongoClientSettingsProperties.class)
-@ConditionalOnClass(MongoClient.class)
+@ConditionalOnClass(MongoClientSettingsBean.class)
 @AutoConfigureBefore(MongoAutoConfiguration.class)
 public class ApiBootMongoClientSettingsAutoConfiguration {
     private MongoClientSettingsBean clientSettingsBean;

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/mongo/ApiBootMongoClientSettingsAutoConfiguration.java

@@ -15,28 +15,18 @@
 import static org.minbox.framework.api.boot.autoconfigure.oss.ApiBootOssProperties.API_BOOT_OSS_PREFIX;
 
 /**
- * ApiBoot 整合阿里云Oss对象存储自动化配置
+ * Object storage automation configuration
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-03-21 11:12
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
+ * @see AliyunObjectStorageService
  */
 @Configuration
 @EnableConfigurationProperties(ApiBootOssProperties.class)
 @ConditionalOnClass(OSSClient.class)
 @ConditionalOnProperty(prefix = API_BOOT_OSS_PREFIX, name = {"region", "access-key-id", "access-key-secret", "bucket-name"})
 public class ApiBootOssAutoConfiguration {
-    /**
-     * ApiBoot Oss 属性配置
-     */
+
     private ApiBootOssProperties apiBootOssProperties;
-    /**
-     * ApiBoot Progress Provider
-     */
     private ObjectStorageProgress apiBootObjectStorageProgress;
 
     public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, ObjectProvider<ObjectStorageProgress> apiBootProgressProvider) {
@@ -45,9 +35,9 @@ public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, Ob
     }
 
     /**
-     * 实例化ApiBootOssService
+     * Register {@link ObjectStorageService}
      *
-     * @return ApiBootOssService 实例
+     * @return The {@link ObjectStorageService} implement class instance
      */
     @Bean
     @ConditionalOnMissingBean

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oss/ApiBootOssAutoConfiguration.java

@@ -17,7 +17,7 @@
 
         <!--Spring Projects-->
         <spring.version>5.2.7.RELEASE</spring.version>
-        <spring.boot.version>2.3.1.RELEASE</spring.boot.version>
+        <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
 
         <!--Minbox Projects-->
         <minbox-bom.version>1.0.1-SNAPSHOT</minbox-bom.version>

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

@@ -34,6 +34,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.zaxxer</groupId>
+                    <artifactId>HikariCP</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>