Skip to content

Commit 2a53033

Browse files
hengboyhengboy
committed
独立ApiBoot Logging为MinBox Logging
1 parent 88ad695 commit 2a53033

File tree

149 files changed

+123
-30041
lines changed

Some content is hidden

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

149 files changed

+123
-30041
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,23 +201,20 @@
201201
<optional>true</optional>
202202
</dependency>
203203

204-
<!--ApiBoot Logging-->
204+
<!--MinBox Logging-->
205205
<dependency>
206206
<groupId>org.minbox.framework</groupId>
207-
<artifactId>api-boot-plugin-logging</artifactId>
207+
<artifactId>minbox-logging-client</artifactId>
208208
<optional>true</optional>
209209
</dependency>
210-
211-
<!--ApiBoot Logging Admin-->
212210
<dependency>
213211
<groupId>org.minbox.framework</groupId>
214-
<artifactId>api-boot-plugin-logging-admin</artifactId>
212+
<artifactId>minbox-logging-admin</artifactId>
215213
<optional>true</optional>
216214
</dependency>
217-
<!--ApiBoot Logging Admin UI-->
218215
<dependency>
219216
<groupId>org.minbox.framework</groupId>
220-
<artifactId>api-boot-plugin-logging-admin-ui</artifactId>
217+
<artifactId>minbox-logging-admin-ui</artifactId>
221218
<optional>true</optional>
222219
</dependency>
223220

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.logging;
1919

20-
import org.minbox.framework.api.boot.plugin.logging.admin.discovery.support.LoggingAppointAdminDiscovery;
21-
import org.minbox.framework.api.boot.plugin.logging.admin.discovery.support.LoggingRegistryCenterAdminDiscovery;
20+
import org.minbox.framework.logging.client.admin.discovery.support.LoggingAppointAdminDiscovery;
21+
import org.minbox.framework.logging.client.admin.discovery.support.LoggingRegistryCenterAdminDiscovery;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2424
import org.springframework.boot.context.properties.EnableConfigurationProperties;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.logging;
1919

20-
import org.minbox.framework.api.boot.plugin.logging.admin.discovery.support.LoggingRegistryCenterAdminDiscovery;
20+
import org.minbox.framework.logging.client.admin.discovery.support.LoggingRegistryCenterAdminDiscovery;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

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

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.logging;
1919

20-
import org.minbox.framework.api.boot.plugin.logging.admin.discovery.LoggingAdminDiscovery;
21-
import org.minbox.framework.api.boot.plugin.logging.admin.report.LoggingAdminReport;
22-
import org.minbox.framework.api.boot.plugin.logging.admin.report.LoggingReportScheduled;
23-
import org.minbox.framework.api.boot.plugin.logging.admin.report.support.LoggingAdminReportSupport;
24-
import org.minbox.framework.api.boot.plugin.logging.cache.LoggingCache;
25-
import org.minbox.framework.api.boot.plugin.logging.cache.support.LoggingMemoryCache;
26-
import org.minbox.framework.api.boot.plugin.logging.filter.ApiBootLoggingBodyFilter;
27-
import org.minbox.framework.api.boot.plugin.logging.interceptor.ApiBootLoggingInterceptor;
28-
import org.minbox.framework.api.boot.plugin.logging.notice.ApiBootLogNotice;
29-
import org.minbox.framework.api.boot.plugin.logging.notice.ApiBootLoggingNoticeListener;
30-
import org.minbox.framework.api.boot.plugin.logging.notice.away.ApiBootLogStorageNotice;
31-
import org.minbox.framework.api.boot.plugin.logging.notice.away.support.ApiBootLoggingAdminStorageNotice;
32-
import org.minbox.framework.api.boot.plugin.logging.notice.away.support.ApiBootLoggingLocalStorageNotice;
33-
import org.minbox.framework.api.boot.plugin.logging.span.ApiBootLoggingSpan;
34-
import org.minbox.framework.api.boot.plugin.logging.span.support.ApiBootLoggingDefaultSpan;
35-
import org.minbox.framework.api.boot.plugin.logging.tracer.ApiBootLoggingTracer;
36-
import org.minbox.framework.api.boot.plugin.logging.tracer.support.ApiBootLoggingDefaultTracer;
20+
import org.minbox.framework.logging.client.admin.discovery.LoggingAdminDiscovery;
21+
import org.minbox.framework.logging.client.admin.report.LoggingAdminReport;
22+
import org.minbox.framework.logging.client.admin.report.LoggingReportScheduled;
23+
import org.minbox.framework.logging.client.admin.report.support.LoggingAdminReportSupport;
24+
import org.minbox.framework.logging.client.cache.LoggingCache;
25+
import org.minbox.framework.logging.client.cache.support.LoggingMemoryCache;
26+
import org.minbox.framework.logging.client.filter.LoggingBodyFilter;
27+
import org.minbox.framework.logging.client.interceptor.LoggingInterceptor;
28+
import org.minbox.framework.logging.client.notice.LoggingNotice;
29+
import org.minbox.framework.logging.client.notice.LoggingNoticeListener;
30+
import org.minbox.framework.logging.client.notice.away.LoggingStorageNotice;
31+
import org.minbox.framework.logging.client.notice.away.support.LoggingAdminStorageNotice;
32+
import org.minbox.framework.logging.client.notice.away.support.LoggingLocalStorageNotice;
33+
import org.minbox.framework.logging.client.span.LoggingSpan;
34+
import org.minbox.framework.logging.client.span.support.LoggingDefaultSpan;
35+
import org.minbox.framework.logging.client.tracer.LoggingTracer;
36+
import org.minbox.framework.logging.client.tracer.support.LoggingDefaultTracer;
3737
import org.springframework.beans.factory.ObjectProvider;
3838
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3939
import org.springframework.boot.autoconfigure.condition.*;
@@ -66,7 +66,7 @@
6666
* GitHub：https://github.com/hengboy
6767
*/
6868
@Configuration
69-
@ConditionalOnClass(ApiBootLoggingInterceptor.class)
69+
@ConditionalOnClass(LoggingInterceptor.class)
7070
@EnableConfigurationProperties(ApiBootLoggingProperties.class)
7171
@AutoConfigureAfter(WebMvcAutoConfiguration.class)
7272
@ConditionalOnWebApplication
@@ -99,8 +99,8 @@ public ApiBootLoggingAutoConfiguration(ApiBootLoggingProperties apiBootLoggingPr
9999
*/
100100
@Bean
101101
@ConditionalOnMissingBean
102-
public ApiBootLoggingTracer apiBootLoggingTracer() {
103-
return new ApiBootLoggingDefaultTracer();
102+
public LoggingTracer apiBootLoggingTracer() {
103+
return new LoggingDefaultTracer();
104104
}
105105

106106
/**
@@ -110,8 +110,8 @@ public ApiBootLoggingTracer apiBootLoggingTracer() {
110110
*/
111111
@Bean
112112
@ConditionalOnMissingBean
113-
public ApiBootLoggingSpan apiBootLoggingSpan() {
114-
return new ApiBootLoggingDefaultSpan();
113+
public LoggingSpan apiBootLoggingSpan() {
114+
return new LoggingDefaultSpan();
115115
}
116116

117117
/**
@@ -121,8 +121,8 @@ public ApiBootLoggingSpan apiBootLoggingSpan() {
121121
*/
122122
@Bean
123123
@ConditionalOnMissingBean
124-
public ApiBootLoggingInterceptor apiBootLoggingInterceptor() {
125-
return new ApiBootLoggingInterceptor(environment, apiBootLoggingTracer(), apiBootLoggingSpan(), apiBootLoggingProperties.getIgnorePaths());
124+
public LoggingInterceptor apiBootLoggingInterceptor() {
125+
return new LoggingInterceptor(environment, apiBootLoggingTracer(), apiBootLoggingSpan(), apiBootLoggingProperties.getIgnorePaths());
126126
}
127127

128128
/**
@@ -132,22 +132,21 @@ public ApiBootLoggingInterceptor apiBootLoggingInterceptor() {
132132
*/
133133
@Bean
134134
@ConditionalOnMissingBean
135-
public ApiBootLoggingBodyFilter apiBootLoggingFilter() {
136-
return new ApiBootLoggingBodyFilter();
135+
public LoggingBodyFilter apiBootLoggingFilter() {
136+
return new LoggingBodyFilter();
137137
}
138138

139139
/**
140140
* ApiBoot Logging Console Notice Listener
141141
*
142-
* @param apiBootLogStorageNotice ApiBoot Logging Notice Support Instance
142+
* @param loggingStorageNotice ApiBoot Logging Notice Support Instance
143143
* @return ApiBootLoggingNoticeListener
144-
* @see ApiBootLoggingLocalStorageNotice
145-
* @see org.minbox.framework.api.boot.plugin.logging.notice.away.support.ApiBootLoggingAdminStorageNotice
146-
* @see org.minbox.framework.api.boot.plugin.logging.notice.away.support.ApiBootLoggingLocalStorageNotice
144+
* @see org.minbox.framework.logging.client.notice.away.support.LoggingLocalStorageNotice
145+
* @see org.minbox.framework.logging.client.notice.away.support.LoggingAdminStorageNotice
147146
*/
148147
@Bean
149-
public ApiBootLoggingNoticeListener apiBootLoggingNoticeListener(ApiBootLogStorageNotice apiBootLogStorageNotice) {
150-
return new ApiBootLoggingNoticeListener(apiBootLogStorageNotice, apiBootLoggingProperties.isFormatConsoleLogJson());
148+
public LoggingNoticeListener apiBootLoggingNoticeListener(LoggingStorageNotice loggingStorageNotice) {
149+
return new LoggingNoticeListener(loggingStorageNotice, apiBootLoggingProperties.isFormatConsoleLogJson());
151150
}
152151

153152

@@ -158,8 +157,8 @@ public ApiBootLoggingNoticeListener apiBootLoggingNoticeListener(ApiBootLogStora
158157
*/
159158
@Bean
160159
@ConditionalOnMissingBean(LoggingAdminDiscovery.class)
161-
public ApiBootLoggingLocalStorageNotice apiBootLoggingLocalNotice(ObjectProvider<List<ApiBootLogNotice>> localNoticeObjectProvider) {
162-
return new ApiBootLoggingLocalStorageNotice(localNoticeObjectProvider.getIfAvailable());
160+
public LoggingLocalStorageNotice apiBootLoggingLocalNotice(ObjectProvider<List<LoggingNotice>> localNoticeObjectProvider) {
161+
return new LoggingLocalStorageNotice(localNoticeObjectProvider.getIfAvailable());
163162
}
164163

165164
/**
@@ -170,8 +169,8 @@ public ApiBootLoggingLocalStorageNotice apiBootLoggingLocalNotice(ObjectProvider
170169
@Bean
171170
@ConditionalOnMissingBean
172171
@ConditionalOnBean(LoggingAdminDiscovery.class)
173-
public ApiBootLoggingAdminStorageNotice apiBootLoggingAdminStorageNotice(LoggingCache loggingCache, LoggingAdminReport loggingAdminReport) {
174-
return new ApiBootLoggingAdminStorageNotice(loggingCache, apiBootLoggingProperties.getReportAway(), loggingAdminReport);
172+
public LoggingAdminStorageNotice apiBootLoggingAdminStorageNotice(LoggingCache loggingCache, LoggingAdminReport loggingAdminReport) {
173+
return new LoggingAdminStorageNotice(loggingCache, apiBootLoggingProperties.getReportAway(), loggingAdminReport);
175174
}
176175

177176
/**

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.minbox.framework.api.boot.autoconfigure.logging;
1919

2020
import feign.RequestInterceptor;
21-
import org.minbox.framework.api.boot.plugin.logging.http.openfeign.ApiBootLogOpenFeignInterceptor;
21+
import org.minbox.framework.logging.client.http.openfeign.LoggingOpenFeignInterceptor;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2424
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -37,7 +37,7 @@
3737
* GitHub：https://github.com/hengboy
3838
*/
3939
@Configuration
40-
@ConditionalOnClass({RequestInterceptor.class, ApiBootLogOpenFeignInterceptor.class})
40+
@ConditionalOnClass({RequestInterceptor.class, LoggingOpenFeignInterceptor.class})
4141
@EnableConfigurationProperties(ApiBootLoggingProperties.class)
4242
public class ApiBootLoggingOpenfeignAutoConfiguration {
4343

@@ -48,7 +48,7 @@ public class ApiBootLoggingOpenfeignAutoConfiguration {
4848
*/
4949
@Bean
5050
@ConditionalOnMissingBean
51-
public ApiBootLogOpenFeignInterceptor apiBootLogOpenFeignInterceptor() {
52-
return new ApiBootLogOpenFeignInterceptor();
51+
public LoggingOpenFeignInterceptor apiBootLogOpenFeignInterceptor() {
52+
return new LoggingOpenFeignInterceptor();
5353
}
5454
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
package org.minbox.framework.api.boot.autoconfigure.logging;
1919

2020
import lombok.Data;
21-
import lombok.Getter;
22-
import org.minbox.framework.api.boot.plugin.logging.ReportAway;
21+
import org.minbox.framework.logging.core.ReportAway;
2322
import org.springframework.boot.context.properties.ConfigurationProperties;
2423
import org.springframework.context.annotation.Configuration;
2524

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.logging;
1919

20-
import org.minbox.framework.api.boot.plugin.logging.http.rest.ApiBootLoggingRestTemplateInterceptor;
20+
import org.minbox.framework.logging.client.http.rest.LoggingRestTemplateInterceptor;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2323
import org.springframework.context.annotation.Bean;
@@ -49,6 +49,6 @@ public class ApiBootLoggingRestTemplateAutoConfiguration {
4949
@Bean
5050
@ConditionalOnMissingBean
5151
public ClientHttpRequestInterceptor apiBootLoggingRestTemplateInterceptor() {
52-
return new ApiBootLoggingRestTemplateInterceptor();
52+
return new LoggingRestTemplateInterceptor();
5353
}
5454
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
package org.minbox.framework.api.boot.autoconfigure.logging.admin;
1919

2020
import org.minbox.framework.api.boot.autoconfigure.logging.admin.ui.ApiBootLoggingAdminUiAutoConfiguration;
21-
import org.minbox.framework.api.boot.plugin.logging.admin.endpoint.LoggingEndpoint;
22-
import org.minbox.framework.api.boot.plugin.logging.admin.endpoint.LoggingRequestMappingHandlerMapping;
23-
import org.minbox.framework.api.boot.plugin.logging.admin.listener.ReportLogJsonFormatListener;
21+
import org.minbox.framework.logging.admin.endpoint.LoggingEndpoint;
22+
import org.minbox.framework.logging.admin.endpoint.LoggingRequestMappingHandlerMapping;
23+
import org.minbox.framework.logging.admin.listener.ReportLogJsonFormatListener;
2424
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.logging.admin;
1919

20-
import org.minbox.framework.api.boot.plugin.logging.admin.listener.ReportLogStorageListener;
21-
import org.minbox.framework.api.boot.plugin.logging.admin.storage.LoggingDataSourceStorage;
22-
import org.minbox.framework.api.boot.plugin.logging.admin.storage.LoggingStorage;
20+
import org.minbox.framework.logging.admin.listener.ReportLogStorageListener;
21+
import org.minbox.framework.logging.admin.storage.LoggingDataSourceStorage;
22+
import org.minbox.framework.logging.admin.storage.LoggingStorage;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.context.annotation.Bean;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/logging/admin/ui/ApiBootLoggingAdminUiAutoConfiguration.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.logging.admin.ui;
1919

20-
import org.minbox.framework.api.boot.plugin.logging.admin.ui.HomepageForwardingFilter;
21-
import org.minbox.framework.api.boot.plugin.logging.admin.ui.LoggingAdminUiEndpoint;
20+
import org.minbox.framework.logging.admin.storage.LoggingStorage;
21+
import org.minbox.framework.logging.admin.ui.HomepageForwardingFilter;
22+
import org.minbox.framework.logging.admin.ui.LoggingAdminUiEndpoint;
2223
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2324
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2425
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -65,7 +66,7 @@ public class ApiBootLoggingAdminUiAutoConfiguration implements WebMvcConfigurer
6566
private static final List<String> DEFAULT_UI_ROUTES = asList(
6667
"/about/**",
6768
"/applications/**",
68-
"/journal/**",
69+
"/logs/**",
6970
"/wallboard/**"
7071
);
7172
/**
@@ -128,17 +129,19 @@ public HomepageForwardingFilter homepageForwardFilter() throws IOException {
128129
* Logging Admin Ui Endpoint
129130
* The ability to provide logging admin data to the public
130131
*
132+
* @param loggingStorage Logging Storage
131133
* @return LoggingAdminUiEndpoint
132134
*/
133135
@Bean
134136
@ConditionalOnMissingBean
135-
public LoggingAdminUiEndpoint loggingAdminUiEndpoint() {
137+
public LoggingAdminUiEndpoint loggingAdminUiEndpoint(LoggingStorage loggingStorage) {
136138
return new LoggingAdminUiEndpoint(
137139
LoggingAdminUiEndpoint.Settings.builder()
138140
.brand(adminUiProperties.getBrand())
139141
.title(adminUiProperties.getTitle())
140142
.routes(DEFAULT_UI_ROUTES)
141-
.build()
143+
.build(),
144+
loggingStorage
142145
);
143146
}
144147
}

0 commit comments

Comments
 (0)