ApiBoot 2.1.2.RELEASE版本发布

Author: hengboy

README.md

@@ -19,6 +19,8 @@
     </a>
 </p>
 
+ApiBoot 官网：http://apiboot.minbox.io
+
 `ApiBoot`是一款基于`SpringBoot1.x`、`SpringBoot2.x`的接口服务集成基础框架，内部提供了框架的封装集成，让接口开发者完成开箱即用，不再为搭建接口框架而犯愁，从而极大的提高开发效率。
 通过在我的`SpringBoot`系列教程中得到的学习者的反馈，才决定来封装一套对应我文章的基础框架，`ApiBoot`内的每一个框架的具体讲解都在文章内进行了详细说明，如果有不明白的可以通过如下途径访问我的文章：
 
@@ -45,6 +47,7 @@
 更多功能请参考 [更多功能列表](https://github.com/hengboy/api-boot/tree/master/api-boot-project/api-boot-starters)
 
 ## 组件
+- **[ApiBoot Logging Admin](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-logging-admin)**：接收ApiBoot Logging组件的请求日志上报，进行存储、分析、通知等。
 - **[ApiBoot Logging](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-logging)**：零侵入式、链路式请求日志分析框架，无缝整合SpringCloud Openfeign
 - **[Spring Security](https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/)**：Spring提供的安全框架，Spring家族式的设计，无缝整合SpringBoot
 - **[OAuth2](https://oauth.net/2/)**：OAuth是一个网络授权的标准。
@@ -77,7 +80,7 @@
     <dependency>
       <groupId>org.minbox.framework</groupId>
       <artifactId>api-boot-dependencies</artifactId>
-      <version>2.1.1.RELEASE</version>
+      <version>2.1.2.RELEASE</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -110,6 +113,7 @@ Demo列表：
 - [ApiBoot Mybatis Pageable](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-mybatis-pageable)
 - [ApiBoot Mail](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-mail)
 - [ApiBoot Logging](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-logging)
+- [ApiBoot Logging Admin](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-logging-admin)
 
 ## 更新日志
 
@@ -140,35 +144,8 @@ Demo列表：
 
 <p align="left">
   <img src="http://image.yuqiyu.com/ApiBoot-qq-group-1.png" height="240">
-  <img src="http://image.yuqiyu.com/dingding_group.JPG" height="240">
 </p>
 
-### 项目结构
-
-```
-. api-boot
-├── api-boot-projects
-│   ├── api-boot-autoconfigure
-│   ├── api-boot-common
-│   ├── api-boot-dependencies
-│   ├── api-boot-parent
-│   └── api-boot-starters
-├── api-boot-samples
-│   ├── api-boot-sample-alibaba-oss
-│   ├── api-boot-sample-alibaba-sms
-│   ├── api-boot-sample-http-converter
-│   ├── api-boot-sample-datasource-switch
-│   ├── api-boot-sample-security-oauth-jwt
-│   ├── 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
-└── tools
-```
-
 ### 开源许可
 
 `ApiBoot`采用`Apache2`开源许可。

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.1.1.RELEASE</version>
+        <version>2.1.2.RELEASE</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -207,6 +207,13 @@
             <artifactId>api-boot-plugin-logging</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!--ApiBoot Logging Admin-->
+        <dependency>
+            <groupId>org.minbox.framework</groupId>
+            <artifactId>api-boot-plugin-logging-admin</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!--SpringCloud Openfeign-->
         <dependency>

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

@@ -47,7 +47,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -164,8 +163,8 @@ public ApiBootLoggingLocalStorageNotice apiBootLoggingLocalNotice(ObjectProvider
     @Bean
     @ConditionalOnMissingBean
     @ConditionalOnBean(LoggingAdminDiscovery.class)
-    public ApiBootLoggingAdminStorageNotice apiBootLoggingAdminStorageNotice(LoggingCache loggingCache) {
-        return new ApiBootLoggingAdminStorageNotice(loggingCache);
+    public ApiBootLoggingAdminStorageNotice apiBootLoggingAdminStorageNotice(LoggingCache loggingCache, LoggingAdminReport loggingAdminReport) {
+        return new ApiBootLoggingAdminStorageNotice(loggingCache, apiBootLoggingProperties.getReportAway(), loggingAdminReport);
     }
 
     /**
@@ -191,7 +190,7 @@ public LoggingCache loggingMemoryCache() {
     @Bean
     @ConditionalOnMissingBean
     public LoggingAdminReport loggingAdminReportSupport(LoggingAdminDiscovery loggingAdminDiscovery, RestTemplate restTemplate, LoggingCache loggingCache, ConfigurableEnvironment environment) {
-        return new LoggingAdminReportSupport(loggingAdminDiscovery, restTemplate, loggingCache, apiBootLoggingProperties.getNumberOfRequestLog(), environment);
+        return new LoggingAdminReportSupport(loggingAdminDiscovery, restTemplate, loggingCache, apiBootLoggingProperties.getReportNumberOfRequestLog(), environment);
     }
 
     /**
@@ -201,6 +200,7 @@ public LoggingAdminReport loggingAdminReportSupport(LoggingAdminDiscovery loggin
      * @return LoggingReportScheduled
      */
     @Bean
+    @ConditionalOnProperty(prefix = API_BOOT_LOGGING_PREFIX, name = "report-away", havingValue = "timing")
     @ConditionalOnMissingBean
     public LoggingReportScheduled loggingReportScheduled(LoggingAdminReport loggingAdminReport) {
         return new LoggingReportScheduled(loggingAdminReport, apiBootLoggingProperties.getReportInitialDelaySecond(), apiBootLoggingProperties.getReportIntervalSecond());

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

@@ -19,6 +19,7 @@
 
 import lombok.Data;
 import lombok.Getter;
+import org.minbox.framework.api.boot.plugin.logging.ReportAway;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -59,10 +60,14 @@ public class ApiBootLoggingProperties {
      * Format console log JSON
      */
     private boolean formatConsoleLogJson = false;
+    /**
+     * Report Request Log To Admin Away
+     */
+    private ReportAway reportAway = ReportAway.just;
     /**
      * Number of request logs reported once
      */
-    private int numberOfRequestLog = 10;
+    private int reportNumberOfRequestLog = 10;
     /**
      * report to admin initial delay second
      */

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.1.1.RELEASE";
+    private String version = "2.1.2.RELEASE";
     /**
      * 文档版权
      */

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.1.1.RELEASE ::
+:: ApiBoot Version : v2.1.2.RELEASE ::

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.1.1.RELEASE</version>
+        <version>2.1.2.RELEASE</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.1.1.RELEASE</version>
+        <version>2.1.2.RELEASE</version>
         <relativePath>../..</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -16,7 +16,7 @@
         <main.basedir>${basedir}/../..</main.basedir>
         <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
         <spring.cloud.version>Greenwich.RELEASE</spring.cloud.version>
-        <api.boot.version>2.1.1.RELEASE</api.boot.version>
+        <api.boot.version>2.1.2.RELEASE</api.boot.version>
         <druid.version>1.1.17</druid.version>
         <druid.starter.version>1.1.17</druid.starter.version>
         <fastjson.version>1.2.58</fastjson.version>
@@ -394,6 +394,17 @@
                 <artifactId>api-boot-starter-logging</artifactId>
                 <version>${api.boot.version}</version>
             </dependency>
+            <!--ApiBoot Logging Admin-->
+            <dependency>
+                <groupId>org.minbox.framework</groupId>
+                <artifactId>api-boot-plugin-logging-admin</artifactId>
+                <version>${api.boot.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.minbox.framework</groupId>
+                <artifactId>api-boot-starter-logging-admin</artifactId>
+                <version>${api.boot.version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

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.1.1.RELEASE</version>
+        <version>2.1.2.RELEASE</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.1.1.RELEASE</version>
+        <version>2.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>maven-plugin</packaging>