Skip to content

Commit a36d5a5

Browse files
Yang-xingchenYang-xingchen
committed
调整依赖、调整代码适应依赖
1 parent 040e18c commit a36d5a5

File tree

36 files changed

+179
-284
lines changed

36 files changed

+179
-284
lines changed

‎base/pom.xml

+2-33
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,15 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<maven.compiler.source>21</maven.compiler.source>
1515
<maven.compiler.target>21</maven.compiler.target>
16+
<junit.version>5.11.4</junit.version>
1617
</properties>
1718

1819
<dependencies>
1920
<dependency>
2021
<groupId>org.junit.jupiter</groupId>
2122
<artifactId>junit-jupiter</artifactId>
22-
<version>5.4.2</version>
23-
<scope>compile</scope>
24-
</dependency>
25-
<dependency>
26-
<groupId>org.slf4j</groupId>
27-
<artifactId>slf4j-log4j12</artifactId>
28-
<version>1.8.0-beta2</version>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.apache.logging.log4j</groupId>
32-
<artifactId>log4j-core</artifactId>
33-
<version>2.11.2</version>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.apache.logging.log4j</groupId>
37-
<artifactId>log4j-api</artifactId>
38-
<version>2.11.2</version>
23+
<version>5.11.4</version>
3924
</dependency>
4025
</dependencies>
4126

42-
<!-- <build>-->
43-
<!-- <plugins>-->
44-
<!-- <plugin>-->
45-
<!-- <groupId>org.apache.maven.plugins</groupId>-->
46-
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
47-
<!-- <configuration>-->
48-
<!-- <source>21</source>-->
49-
<!-- <target>21</target>-->
50-
<!-- <annotationProcessors>-->
51-
<!-- <annotationProcessor>processor.MyProcessor</annotationProcessor>-->
52-
<!-- </annotationProcessors>-->
53-
<!-- </configuration>-->
54-
<!-- </plugin>-->
55-
<!-- </plugins>-->
56-
<!-- </build>-->
57-
5827
</project>

‎base/src/main/java/proxy/ForumServiceImpl.java

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
package proxy;
22

3-
4-
import org.apache.log4j.LogManager;
5-
import org.apache.log4j.Logger;
6-
73
public class ForumServiceImpl implements ForumService {
8-
private static final Logger LOGGER = LogManager.getLogger(ForumServiceImpl.class);
4+
95

106
@Override
117
public void removeTopic(int topicId) {
12-
LOGGER.info("removeTopic:"+topicId);
8+
System.out.println("removeTopic:" + topicId);
139
}
1410

1511
@Override
1612
public void removeForum(int forumId) {
17-
LOGGER.info("removeForum:"+forumId);
13+
System.out.println("removeForum:" + forumId);
1814
}
1915

20-
public String test(){
21-
LOGGER.info("this is ForumServiceImpl");
22-
return "this is ForumServiceImpl : "+this.toString();
23-
}
16+
public String test() {
17+
System.out.println("this is ForumServiceImpl");
18+
return "this is ForumServiceImpl : " + this.toString();
19+
}
2420

2521
}

‎base/src/main/java/proxy/LoadTest.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.stream.Stream;
66

77
public class LoadTest {
8+
89
public static void main(String[] args) {
910
Service service1 = new Service1("Service1");
1011
Service service1_1 = new Service1("Service1_1");
@@ -16,26 +17,26 @@ public static void main(String[] args) {
1617
Handler2 handler2_1 = new Handler2(service1);
1718
Handler2 handler2_2 = new Handler2(service2);
1819

19-
System.out.println("Interface:"+ Arrays.equals(Service1.class.getInterfaces(), Service2.class.getInterfaces()));
20-
System.out.println("ClassLoader:"+Service1.class.getClassLoader().equals(Service2.class.getClassLoader()));
20+
System.out.println("Interface:" + Arrays.equals(Service1.class.getInterfaces(), Service2.class.getInterfaces()));
21+
System.out.println("ClassLoader:" + Service1.class.getClassLoader().equals(Service2.class.getClassLoader()));
2122

2223
Service impl1_1_1 = (Service) Proxy.newProxyInstance(Service1.class.getClassLoader(), Service1.class.getInterfaces(), handler1_1);
2324
Service impl1_1_2 = (Service) Proxy.newProxyInstance(Service1.class.getClassLoader(), Service1.class.getInterfaces(), handler1_1);
24-
System.out.println("重复生成:"+impl1_1_1.getClass().equals(impl1_1_2.getClass()));
25+
System.out.println("重复生成:" + impl1_1_1.getClass().equals(impl1_1_2.getClass()));
2526

2627
Service impl1_1_1_1 = (Service) Proxy.newProxyInstance(Service1.class.getClassLoader(), Service1.class.getInterfaces(), handler1_1_1);
27-
System.out.println("同handler类不同handler的对象:"+impl1_1_1.getClass().equals(impl1_1_1_1.getClass()));
28+
System.out.println("同handler类不同handler的对象:" + impl1_1_1.getClass().equals(impl1_1_1_1.getClass()));
2829

2930
Service impl1_2_1 = (Service) Proxy.newProxyInstance(Service2.class.getClassLoader(), Service2.class.getInterfaces(), handler1_2);
30-
System.out.println("同handler类不同handler、target类:"+impl1_1_1.getClass().equals(impl1_2_1.getClass()));
31+
System.out.println("同handler类不同handler、target类:" + impl1_1_1.getClass().equals(impl1_2_1.getClass()));
3132

3233
Service impl2_1_1 = (Service) Proxy.newProxyInstance(Service1.class.getClassLoader(), Service1.class.getInterfaces(), handler2_1);
33-
System.out.println("不同handler类:"+impl1_1_1.getClass().equals(impl2_1_1.getClass()));
34+
System.out.println("不同handler类:" + impl1_1_1.getClass().equals(impl2_1_1.getClass()));
3435

3536
Service impl2_2_1 = (Service) Proxy.newProxyInstance(Service2.class.getClassLoader(), Service2.class.getInterfaces(), handler2_2);
36-
System.out.println("不同handler、target类:"+impl1_1_1.getClass().equals(impl2_2_1.getClass()));
37+
System.out.println("不同handler、target类:" + impl1_1_1.getClass().equals(impl2_2_1.getClass()));
3738

38-
System.out.println(impl1_1_1.getClass()+"--"+impl2_2_1.getClass());
39+
System.out.println(impl1_1_1.getClass() + "--" + impl2_2_1.getClass());
3940

4041
System.out.println("StackTrace:");
4142
impl2_2_1.print();
@@ -50,7 +51,7 @@ public static void main(String[] args) {
5051
Stream.of(clazz.getDeclaredFields()).forEach(field -> {
5152
field.setAccessible(true);
5253
try {
53-
System.out.println(field+":"+field.get(impl1_1_1));
54+
System.out.println(field + ":" + field.get(impl1_1_1));
5455
} catch (IllegalAccessException e) {
5556
System.out.println(field);
5657
}
@@ -59,7 +60,7 @@ public static void main(String[] args) {
5960
Stream.of(clazz.getFields()).forEach(field -> {
6061
field.setAccessible(true);
6162
try {
62-
System.out.println(field+":"+field.get(impl1_1_1));
63+
System.out.println(field + ":" + field.get(impl1_1_1));
6364
} catch (IllegalAccessException e) {
6465
System.out.println(field);
6566
}

‎base/src/main/java/proxy/PerformanceHandle.java

+13-16
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
package proxy;
22

3-
4-
import org.apache.log4j.LogManager;
5-
import org.apache.log4j.Logger;
6-
73
import java.lang.reflect.InvocationHandler;
84
import java.lang.reflect.Method;
95

106
public class PerformanceHandle implements InvocationHandler {
11-
private static final Logger LOGGER = LogManager.getLogger(PerformanceHandle.class);
12-
7+
8+
139
private Object target;
10+
1411
public PerformanceHandle(Object target) {
1512
this.target = target;
1613
}
1714

18-
public Object getTarget() {
19-
return target;
20-
}
15+
public Object getTarget() {
16+
return target;
17+
}
2118

22-
@Override
19+
@Override
2320
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
24-
if ("getTarget".equals(method.getName())){
25-
return target;
26-
}
27-
LOGGER.info("start");
28-
LOGGER.info(proxy.getClass().getName()+" "+method.getName());
21+
if ("getTarget".equals(method.getName())) {
22+
return target;
23+
}
24+
System.out.println("start");
25+
System.out.println(proxy.getClass().getName() + " " + method.getName());
2926
Object obj = method.invoke(target, args);
30-
LOGGER.info("end");
27+
System.out.println("end");
3128
return obj;
3229
}
3330

‎base/src/main/java/proxy/Service.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package proxy;
22

33
public interface Service {
4-
public void print();
4+
5+
void print();
6+
57
}

‎base/src/main/java/proxy/Service1.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package proxy;
22

3-
public class Service1 implements Service{
3+
public class Service1 implements Service {
4+
45
private String name;
56

67
public Service1() {

‎base/src/main/java/proxy/Service2.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import java.util.stream.Stream;
44

5-
public class Service2 implements Service{
5+
public class Service2 implements Service {
6+
67
private int id;
78

89
public int getId() {

‎base/src/main/java/proxy/Test.java

+9-14
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
package proxy;
22

3-
import org.apache.logging.log4j.LogManager;
4-
import org.apache.logging.log4j.Logger;
5-
63
import java.lang.reflect.Proxy;
74
import java.util.stream.Stream;
85

9-
106
public class Test {
117

12-
private static final Logger LOGGER = LogManager.getLogger(Test.class);
13-
148
public static void main(String[] args){
159
ForumService target = new ForumServiceImpl();
1610
PerformanceHandle handle = new PerformanceHandle(target);
1711
ForumService proxy = (ForumService)Proxy.newProxyInstance(target.getClass().getClassLoader(), target.getClass().getInterfaces(), handle);
1812
proxy.removeForum(12);
1913
proxy.removeTopic(21);
20-
LOGGER.info(proxy.getClass().getName());
14+
System.out.println(proxy.getClass().getName());
2115

22-
LOGGER.info("--------------------------------------------------------------------------");
16+
System.out.println("--------------------------------------------------------------------------");
2317

24-
Stream.of(proxy.getClass().getMethods()).forEach(LOGGER::info);
18+
Stream.of(proxy.getClass().getMethods()).forEach(System.out::println);
2519

26-
LOGGER.info("--------------------------------------------------------------------------");
20+
System.out.println("--------------------------------------------------------------------------");
2721

28-
LOGGER.info(((PerformanceHandle)Proxy.getInvocationHandler(proxy)).getTarget().getClass().getName());
22+
System.out.println(((PerformanceHandle)Proxy.getInvocationHandler(proxy)).getTarget().getClass().getName());
2923

30-
LOGGER.info("--------------------------------------------------------------------------");
24+
System.out.println("--------------------------------------------------------------------------");
3125

32-
LOGGER.info(((ForumServiceImpl)((PerformanceHandle)Proxy.getInvocationHandler(proxy)).getTarget()).test());
33-
LOGGER.info(target.toString());
26+
System.out.println(((ForumServiceImpl)((PerformanceHandle)Proxy.getInvocationHandler(proxy)).getTarget()).test());
27+
System.out.println(target);
3428
}
29+
3530
}

‎frame/ai/pom.xml

-13
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@
1313
<version>0.0.1-SNAPSHOT</version>
1414
<name>ai</name>
1515
<description>Demo project for Spring Boot</description>
16-
<url/>
17-
<licenses>
18-
<license/>
19-
</licenses>
20-
<developers>
21-
<developer/>
22-
</developers>
23-
<scm>
24-
<connection/>
25-
<developerConnection/>
26-
<tag/>
27-
<url/>
28-
</scm>
2916
<properties>
3017
<java.version>21</java.version>
3118
<spring-ai.version>1.0.0-M5</spring-ai.version>

‎frame/easyexcel/pom.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<groupId>org.example</groupId>
88
<artifactId>easyexcel</artifactId>
99
<version>1.0-SNAPSHOT</version>
10+
<properties>
11+
<java.version>21</java.version>
12+
</properties>
1013

1114
<dependencies>
1215
<dependency>
@@ -17,8 +20,7 @@
1720
<dependency>
1821
<groupId>org.junit.jupiter</groupId>
1922
<artifactId>junit-jupiter</artifactId>
20-
<version>5.4.2</version>
21-
<scope>compile</scope>
23+
<version>5.11.4</version>
2224
</dependency>
2325
</dependencies>
2426

‎frame/event/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.5.4</version>
8+
<version>3.4.2</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>spring-study</groupId>
@@ -14,7 +14,7 @@
1414
<name>event</name>
1515
<description>Demo project for Spring Boot</description>
1616
<properties>
17-
<java.version>16</java.version>
17+
<java.version>21</java.version>
1818
</properties>
1919
<dependencies>
2020
<dependency>

‎frame/event/src/main/java/springstudy/event/RefreshedListener.java

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public class RefreshedListener implements ApplicationListener<ContextRefreshedEv
1212
@Override
1313
public void onApplicationEvent(ContextRefreshedEvent event) {
1414
log.info("======================");
15+
// a class
16+
// b class
1517
event.getApplicationContext().getBeansWithAnnotation(AnnotationComponent.class).forEach((s, o) -> {
1618
log.info(s, o.getClass().getAnnotation(AnnotationComponent.class).value());
1719
});

‎frame/format/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.4.4</version>
8+
<version>3.4.2</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>study-test</groupId>
@@ -14,7 +14,7 @@
1414
<name>format</name>
1515
<description>Demo project for Spring Boot</description>
1616
<properties>
17-
<java.version>11</java.version>
17+
<java.version>21</java.version>
1818
</properties>
1919
<dependencies>
2020
<dependency>

‎frame/format/src/main/java/studytest/format/service/TestService.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ public class TestService {
99

1010
public TestModel getByStr(String s) {
1111
String[] split = s.split("-");
12-
return new TestModel().setType(Integer.parseInt(split[0])).setSrc(s).setValue(split[1]);
12+
return new TestModel()
13+
.setType(Integer.parseInt(split[0]))
14+
.setSrc(s)
15+
.setValue(split[1]);
1316
}
1417

1518
}

‎frame/jmh/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<version>1.0-SNAPSHOT</version>
1010

1111
<properties>
12-
<maven.compiler.source>16</maven.compiler.source>
13-
<maven.compiler.target>16</maven.compiler.target>
12+
<maven.compiler.source>21</maven.compiler.source>
13+
<maven.compiler.target>21</maven.compiler.target>
1414
</properties>
1515

1616
<dependencies>

0 commit comments

Comments
 (0)