Skip to content

Commit 1a19439

Browse files
zihluwangzihluwang
committed
feat: Added logback configurations to each project and upgrade jjwt to 0.12.5
1 parent b7727b3 commit 1a19439

File tree

10 files changed

+100
-80
lines changed

10 files changed

+100
-80
lines changed

‎devkit-core/src/main/resources/logback.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@
1717
-->
1818

1919
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2022

2123
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2324
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
2627
</encoder>
2728
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
32-
</encoder>
33-
</appender>
34-
3529
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
30+
<appender-ref ref="STDOUT"/>
3731
</root>
3832
</configuration>

‎devkit-utils/src/main/resources/logback.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@
1717
-->
1818

1919
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2022

2123
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2324
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
2627
</encoder>
2728
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
32-
</encoder>
33-
</appender>
34-
3529
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
30+
<appender-ref ref="STDOUT"/>
3731
</root>
3832
</configuration>

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ slf4jVersion=2.0.9
2121
lombokVersion=1.18.30
2222
jacksonVersion=2.16.0
2323
javaJwtVersion=4.4.0
24-
jjwtVersion=0.11.5
24+
jjwtVersion=0.12.5
2525
okhttpVersion=4.12.0
2626
springVersion=6.1.1
2727
springBootVersion=3.2.0

‎guid/src/main/resources/logback.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,17 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
1918
<configuration>
19+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
20+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2021

2122
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2323
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
26-
</encoder>
27-
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
24+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
25+
<pattern>${COLOURFUL_OUTPUT}</pattern>
3226
</encoder>
3327
</appender>
34-
3528
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
29+
<appender-ref ref="STDOUT"/>
3730
</root>
3831
</configuration>

‎property-guard-spring-boot-starter/src/main/resources/logback.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright (C) 2023 CodeCraftersCN.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
22+
23+
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
24+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
27+
</encoder>
28+
</appender>
29+
<root level="INFO">
30+
<appender-ref ref="STDOUT"/>
31+
</root>
32+
</configuration>

‎simple-jwt-authzero/src/main/resources/logback.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@
1717
-->
1818

1919
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2022

2123
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2324
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
2627
</encoder>
2728
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
32-
</encoder>
33-
</appender>
34-
3529
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
30+
<appender-ref ref="STDOUT"/>
3731
</root>
3832
</configuration>

‎simple-jwt-facade/src/main/resources/logback.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@
1717
-->
1818

1919
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2022

2123
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2324
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
2627
</encoder>
2728
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
32-
</encoder>
33-
</appender>
34-
3529
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
30+
<appender-ref ref="STDOUT"/>
3731
</root>
3832
</configuration>

‎simple-jwt-jjwt/src/main/resources/logback.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright (C) 2023 CodeCraftersCN.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
22+
23+
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
24+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
27+
</encoder>
28+
</appender>
29+
<root level="INFO">
30+
<appender-ref ref="STDOUT"/>
31+
</root>
32+
</configuration>

‎simple-jwt-spring-boot-starter/src/main/resources/logback.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@
1717
-->
1818

1919
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2022

2123
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2324
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
2627
</encoder>
2728
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
32-
</encoder>
33-
</appender>
34-
3529
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
30+
<appender-ref ref="STDOUT"/>
3731
</root>
3832
</configuration>

‎webcal/src/main/resources/logback.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,17 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
1918
<configuration>
19+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
20+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2021

2122
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2323
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
26-
</encoder>
27-
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
24+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
25+
<pattern>${COLOURFUL_OUTPUT}</pattern>
3226
</encoder>
3327
</appender>
34-
3528
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
29+
<appender-ref ref="STDOUT"/>
3730
</root>
3831
</configuration>

0 commit comments

Comments
 (0)