Skip to content

Commit e856c87

Browse files
dunwudunwu
committed
🚚 项目结构调整
1 parent 40034c6 commit e856c87

11 files changed

Lines changed: 351 additions & 63 deletions

File tree

‎codes/javalib/bean/pom.xml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
3+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
7+
<!-- [Part 1] BASIC SETTINGS BEGIN -->
8+
9+
<!-- MAVEN COORDINATE BEGIN -->
10+
<groupId>io.github.dunwu.javalib</groupId>
11+
<artifactId>javalib-bean</artifactId>
12+
<version>1.0.0</version>
13+
<packaging>jar</packaging>
14+
<!-- MAVEN COORDINATE END -->
15+
16+
<!-- RELATIONSHIP SETTINGS BEGIN -->
17+
<dependencies>
18+
<!-- bean begin -->
19+
<dependency>
20+
<groupId>org.projectlombok</groupId>
21+
<artifactId>lombok</artifactId>
22+
<version>1.16.8</version>
23+
</dependency>
24+
<!-- bean end -->
25+
26+
<!-- test begin -->
27+
<dependency>
28+
<groupId>junit</groupId>
29+
<artifactId>junit</artifactId>
30+
<version>4.12</version>
31+
<scope>test</scope>
32+
</dependency>
33+
<!-- test end -->
34+
</dependencies>
35+
<!-- RELATIONSHIP SETTINGS END -->
36+
37+
<!-- PROPERTIES BEGIN -->
38+
<properties>
39+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40+
<java.version>1.8</java.version>
41+
<maven.compiler.source>${java.version}</maven.compiler.source>
42+
<maven.compiler.target>${java.version}</maven.compiler.target>
43+
</properties>
44+
<!-- PROPERTIES END -->
45+
46+
<!-- [Part 1] BASIC SETTINGS END -->
47+
48+
49+
<!-- [Part 2] BUILD SETTINGS BEGIN -->
50+
<build>
51+
<resources>
52+
<resource>
53+
<filtering>true</filtering>
54+
<directory>src/main/resources</directory>
55+
</resource>
56+
</resources>
57+
</build>
58+
<!-- [Part 2] BUILD SETTINGS END -->
59+
60+
61+
<!-- [Part 3] PROJECT INFO BEGIN -->
62+
<name>${project.artifactId}</name>
63+
<description>javalib 之JavaBean库示例集锦</description>
64+
<!-- [Part 3] PROJECT INFO END -->
65+
66+
67+
</project>

codes/javalib/src/main/java/io/github/dunwu/javalib/bean/Company.java renamed to codes/javalib/bean/src/main/java/io/github/dunwu/javalib/bean/Company.java

File renamed without changes.

codes/javalib/src/main/java/io/github/dunwu/javalib/bean/Person.java renamed to codes/javalib/bean/src/main/java/io/github/dunwu/javalib/bean/Person.java

File renamed without changes.

codes/javalib/src/test/java/io/github/dunwu/javalib/bean/LombokTest.java renamed to codes/javalib/bean/src/test/java/io/github/dunwu/javalib/bean/LombokTest.java

File renamed without changes.

codes/javalib/src/test/java/io/github/dunwu/javalib/test/JUnitTest.java renamed to codes/javalib/bean/src/test/java/io/github/dunwu/javalib/test/JUnitTest.java

File renamed without changes.

‎codes/javalib/log/logback-demo/pom.xml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
3+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
7+
<!-- [Part 1] BASIC SETTINGS BEGIN -->
8+
9+
<!-- MAVEN COORDINATE BEGIN -->
10+
<groupId>io.github.dunwu</groupId>
11+
<artifactId>javalib-log-logback</artifactId>
12+
<version>1.0.0</version>
13+
<packaging>jar</packaging>
14+
<!-- MAVEN COORDINATE END -->
15+
16+
<!-- RELATIONSHIP SETTINGS BEGIN -->
17+
<dependencies>
18+
<!-- log start -->
19+
<dependency>
20+
<groupId>ch.qos.logback</groupId>
21+
<artifactId>logback-classic</artifactId>
22+
<version>${logback.version}</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>ch.qos.logback</groupId>
26+
<artifactId>logback-access</artifactId>
27+
<version>${logback.version}</version>
28+
</dependency>
29+
<!-- log end -->
30+
31+
<dependency>
32+
<groupId>junit</groupId>
33+
<artifactId>junit</artifactId>
34+
<version>4.12</version>
35+
<scope>test</scope>
36+
</dependency>
37+
</dependencies>
38+
<!-- RELATIONSHIP SETTINGS END -->
39+
40+
<!-- PROPERTIES BEGIN -->
41+
<properties>
42+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43+
<java.version>1.8</java.version>
44+
<maven.compiler.source>${java.version}</maven.compiler.source>
45+
<maven.compiler.target>${java.version}</maven.compiler.target>
46+
<logback.version>1.2.3</logback.version>
47+
</properties>
48+
<!-- PROPERTIES END -->
49+
50+
<!-- [Part 1] BASIC SETTINGS END -->
51+
52+
53+
<!-- [Part 2] BUILD SETTINGS BEGIN -->
54+
<build>
55+
<resources>
56+
<resource>
57+
<filtering>true</filtering>
58+
<directory>src/main/resources</directory>
59+
</resource>
60+
</resources>
61+
</build>
62+
<!-- [Part 2] BUILD SETTINGS END -->
63+
64+
65+
<!-- [Part 3] PROJECT INFO BEGIN -->
66+
<name>${project.artifactId}</name>
67+
<description>logback 示例</description>
68+
<!-- [Part 3] PROJECT INFO END -->
69+
70+
71+
</project>

‎codes/javalib/log/logback-demo/src/main/java/io/github/dunwu/javalib/log/LogbackDemo.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package io.github.dunwu.javalib.log;
2+
3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
6+
/**
7+
* Logback 示例
8+
* @author Zhang Peng
9+
* @date 2018/3/29
10+
* @see <a href="https://logback.qos.ch/">logback 官网</a>
11+
*/
12+
public class LogbackDemo {
13+
14+
private static final Logger logger = LoggerFactory.getLogger(LogbackDemo.class);
15+
16+
public static void main(String[] args) {
17+
for (int i = 0; i < 10; i++) {
18+
logger.trace("NO.{} 这是一条 {} 日志记录", i, "trace");
19+
logger.debug("NO.{} 这是一条 {} 日志记录", i, "debug");
20+
logger.info("NO.{} 这是一条 {} 日志记录", i, "info");
21+
logger.warn("NO.{} 这是一条 {} 日志记录", i, "warn");
22+
logger.error("NO.{} 这是一条 {} 日志记录", i, "error");
23+
}
24+
}
25+
}

‎codes/javalib/log/logback-demo/src/main/resources/logback.xml‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
3+
<!-- logback中一共有5种有效级别，分别是TRACE、DEBUG、INFO、WARN、ERROR，优先级依次从低到高 -->
4+
<configuration scan="true" scanPeriod="60 seconds" debug="false">
5+
6+
<property name="FILE_NAME" value="javalib"/>
7+
<property name="LOG_PATH" value="./" />
8+
9+
<!-- 重复信息过滤器 -->
10+
<turboFilter class="ch.qos.logback.classic.turbo.DuplicateMessageFilter">
11+
<AllowedRepetitions>10</AllowedRepetitions>
12+
<CacheSize>100</CacheSize>
13+
</turboFilter>
14+
15+
<!-- 将本项目内部日志按级别分别打印 -->
16+
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
17+
<!-- 根据时间来制定滚动策略 -->
18+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
19+
<fileNamePattern>${LOG_PATH}/logs/${FILE_NAME}-error.%d{yyyy-MM-dd}.log</fileNamePattern>
20+
<maxHistory>30</maxHistory>
21+
</rollingPolicy>
22+
23+
<!-- 根据文件大小来制定滚动策略 -->
24+
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
25+
<maxFileSize>10MB</maxFileSize>
26+
</triggeringPolicy>
27+
28+
<filter class="ch.qos.logback.classic.filter.LevelFilter">
29+
<level>ERROR</level>
30+
<onMatch>ACCEPT</onMatch>
31+
<onMismatch>DENY</onMismatch>
32+
</filter>
33+
34+
<encoder>
35+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [javalib] [%thread] [%p] %c{36}#%M - %m%n</pattern>
36+
</encoder>
37+
</appender>
38+
<appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
39+
<!-- 根据时间来制定滚动策略 -->
40+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
41+
<fileNamePattern>${LOG_PATH}/logs/${FILE_NAME}-warn.%d{yyyy-MM-dd}.log</fileNamePattern>
42+
<maxHistory>30</maxHistory>
43+
</rollingPolicy>
44+
45+
<!-- 根据文件大小来制定滚动策略 -->
46+
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
47+
<maxFileSize>10MB</maxFileSize>
48+
</triggeringPolicy>
49+
50+
<filter class="ch.qos.logback.classic.filter.LevelFilter">
51+
<level>WARN</level>
52+
<onMatch>ACCEPT</onMatch>
53+
<onMismatch>DENY</onMismatch>
54+
</filter>
55+
56+
<encoder>
57+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [javalib] [%thread] [%p] %c{36}#%M - %m%n</pattern>
58+
</encoder>
59+
</appender>
60+
<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
61+
<!-- 根据时间来制定滚动策略 -->
62+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
63+
<fileNamePattern>${LOG_PATH}/logs/${FILE_NAME}-info.%d{yyyy-MM-dd}.log</fileNamePattern>
64+
<maxHistory>30</maxHistory>
65+
</rollingPolicy>
66+
67+
<!-- 根据文件大小来制定滚动策略 -->
68+
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
69+
<maxFileSize>10MB</maxFileSize>
70+
</triggeringPolicy>
71+
72+
<filter class="ch.qos.logback.classic.filter.LevelFilter">
73+
<level>INFO</level>
74+
<onMatch>ACCEPT</onMatch>
75+
<onMismatch>DENY</onMismatch>
76+
</filter>
77+
78+
<encoder>
79+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [javalib] [%thread] [%p] %c{36}#%M - %m%n</pattern>
80+
</encoder>
81+
</appender>
82+
<appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
83+
<!-- 根据时间来制定滚动策略 -->
84+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
85+
<fileNamePattern>${LOG_PATH}/logs/${FILE_NAME}-debug.%d{yyyy-MM-dd}.log</fileNamePattern>
86+
<maxHistory>30</maxHistory>
87+
</rollingPolicy>
88+
89+
<!-- 根据文件大小来制定滚动策略 -->
90+
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
91+
<maxFileSize>10MB</maxFileSize>
92+
</triggeringPolicy>
93+
94+
<filter class="ch.qos.logback.classic.filter.LevelFilter">
95+
<level>DEBUG</level>
96+
<onMatch>ACCEPT</onMatch>
97+
<onMismatch>DENY</onMismatch>
98+
</filter>
99+
100+
<encoder>
101+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [javalib] [%thread] [%p] %c{36}#%M - %m%n</pattern>
102+
</encoder>
103+
</appender>
104+
<appender name="TRACE" class="ch.qos.logback.core.rolling.RollingFileAppender">
105+
<!-- 根据时间来制定滚动策略 -->
106+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
107+
<fileNamePattern>${LOG_PATH}/logs/${FILE_NAME}-trace.%d{yyyy-MM-dd}.log</fileNamePattern>
108+
<maxHistory>30</maxHistory>
109+
</rollingPolicy>
110+
111+
<!-- 根据文件大小来制定滚动策略 -->
112+
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
113+
<maxFileSize>10MB</maxFileSize>
114+
</triggeringPolicy>
115+
116+
<filter class="ch.qos.logback.classic.filter.LevelFilter">
117+
<level>TRACE</level>
118+
<onMatch>ACCEPT</onMatch>
119+
<onMismatch>DENY</onMismatch>
120+
</filter>
121+
122+
<encoder>
123+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [javalib] [%thread] [%p] %c{36}#%M - %m%n</pattern>
124+
</encoder>
125+
</appender>
126+
<logger name="io.github.dunwu.javalib" level="TRACE">
127+
<appender-ref ref="ERROR"/>
128+
<appender-ref ref="WARN"/>
129+
<appender-ref ref="INFO"/>
130+
<appender-ref ref="DEBUG"/>
131+
<appender-ref ref="TRACE"/>
132+
</logger>
133+
134+
<!-- 控制台输出 -->
135+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
136+
<encoder>
137+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [javalib] [%thread] [%p] %c{36}#%M - %m%n</pattern>
138+
</encoder>
139+
</appender>
140+
<root level="TRACE">
141+
<appender-ref ref="STDOUT"/>
142+
</root>
143+
144+
</configuration>

‎codes/javalib/log/pom.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
3+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
7+
<!-- [Part 1] BASIC SETTINGS BEGIN -->
8+
9+
<!-- MAVEN COORDINATE BEGIN -->
10+
<groupId>io.github.dunwu</groupId>
11+
<artifactId>javalib-log</artifactId>
12+
<version>1.0.0</version>
13+
<packaging>pom</packaging>
14+
<!-- MAVEN COORDINATE END -->
15+
16+
<!-- RELATIONSHIP SETTINGS BEGIN -->
17+
<modules>
18+
<module>logback-demo</module>
19+
</modules>
20+
<!-- RELATIONSHIP SETTINGS END -->
21+
22+
<!-- PROPERTIES BEGIN -->
23+
<properties>
24+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25+
<java.version>1.8</java.version>
26+
<maven.compiler.source>${java.version}</maven.compiler.source>
27+
<maven.compiler.target>${java.version}</maven.compiler.target>
28+
</properties>
29+
<!-- PROPERTIES END -->
30+
31+
<!-- [Part 1] BASIC SETTINGS END -->
32+
33+
<!-- [Part 3] PROJECT INFO BEGIN -->
34+
<name>${project.artifactId}</name>
35+
<description>javalib 之日志库示例集锦</description>
36+
<!-- [Part 3] PROJECT INFO END -->
37+
38+
39+
</project>

‎codes/javalib/pom.xml‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
<groupId>io.github.dunwu</groupId>
1111
<artifactId>javalib</artifactId>
1212
<version>1.0.0</version>
13-
<packaging>jar</packaging>
13+
<packaging>pom</packaging>
1414
<!-- MAVEN COORDINATE END -->
1515

1616
<!-- RELATIONSHIP SETTINGS BEGIN -->
17+
<modules>
18+
<module>bean</module>
19+
<module>log</module>
20+
</modules>
1721
<dependencies>
1822
<!-- bean start -->
1923
<dependency>
@@ -62,22 +66,6 @@
6266
<!-- [Part 1] BASIC SETTINGS END -->
6367

6468

65-
<!-- [Part 2] BUILD SETTINGS BEGIN -->
66-
<build>
67-
<resources>
68-
<resource>
69-
<filtering>true</filtering>
70-
<directory>src/main/resources</directory>
71-
<includes>
72-
<include>logback.xml</include>
73-
</includes>
74-
<!--<targetPath>/abc</targetPath>-->
75-
</resource>
76-
</resources>
77-
</build>
78-
<!-- [Part 2] BUILD SETTINGS END -->
79-
80-
8169
<!-- [Part 3] PROJECT INFO BEGIN -->
8270
<name>${project.artifactId}</name>
8371
<description>Java 库使用示例</description>

0 commit comments

Comments
 (0)