Skip to content

Commit 01862bb

Browse files
author
zhangtao
committed
修改整体结构
1 parent de32896 commit 01862bb

File tree

25 files changed

+380
-248
lines changed

25 files changed

+380
-248
lines changed

‎SpringBootDemo/pom.xml

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.tony</groupId>
8-
<artifactId>com.xiaour.spring.boot</artifactId>
9-
<version>1.0-SNAPSHOT</version>
7+
<groupId>com.github.xiaour</groupId>
8+
<artifactId>springbootv1</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
10+
<name>SpringBootDemo</name>
11+
<description>Demo project for Spring Boot</description>
12+
<packaging>jar</packaging>
13+
14+
1015
<!-- 继承父包,此包会添加依赖,spring用到的核心包 -->
1116
<parent>
1217
<groupId>org.springframework.boot</groupId>
1318
<artifactId>spring-boot-starter-parent</artifactId>
1419
<version>1.5.2.RELEASE</version>
20+
<relativePath/> <!-- lookup parent from repository -->
1521
</parent>
1622

1723

‎SpringBootDemoV2/pom.xml

+6-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>SpringBootDemoV2</groupId>
7-
<artifactId>SpringBootDemoV2</artifactId>
6+
<groupId>com.github.xiaour</groupId>
7+
<artifactId>springbootv2</artifactId>
88
<version>0.0.1-SNAPSHOT</version>
9-
<packaging>jar</packaging>
10-
119
<name>SpringBootDemoV2</name>
1210
<description>Demo project for Spring Boot V2</description>
11+
<packaging>jar</packaging>
12+
1313

1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.0.RELEASE</version>
17+
<version>2.4.2</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

@@ -29,6 +29,7 @@
2929
<groupId>org.springframework.boot</groupId>
3030
<artifactId>spring-boot-starter-data-redis</artifactId>
3131
</dependency>
32+
3233
<dependency>
3334
<groupId>org.springframework.boot</groupId>
3435
<artifactId>spring-boot-starter-web</artifactId>
@@ -65,11 +66,6 @@
6566
<version>1.10</version>
6667
</dependency>
6768

68-
<dependency>
69-
<groupId>dom4j</groupId>
70-
<artifactId>dom4j</artifactId>
71-
</dependency>
72-
7369
<dependency>
7470
<groupId>junit</groupId>
7571
<artifactId>junit</artifactId>

‎SpringBootDemoV2/src/main/java/com/github/xiaour/Application.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ public class Application {
1010

1111

1212
public static void main(String[] args) {
13-
SpringApplication.run(Application.class, args);
13+
//SpringApplication.run(Application.class, args);
14+
1415

1516
}
1617

‎SpringBootDemoV2/src/main/java/com/github/xiaour/controller/AuthNotify.java

-147
This file was deleted.

‎SpringBootDemoV2/src/main/java/com/github/xiaour/controller/WxCallback.java

-45
This file was deleted.

‎SpringBootDemoV3/.gitignore

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
HELP.md
2+
target/
3+
!.mvn/wrapper/maven-wrapper.jar
4+
!**/src/main/**/target/
5+
!**/src/test/**/target/
6+
7+
### STS ###
8+
.apt_generated
9+
.classpath
10+
.factorypath
11+
.project
12+
.settings
13+
.springBeans
14+
.sts4-cache
15+
16+
### IntelliJ IDEA ###
17+
.idea
18+
*.iws
19+
*.iml
20+
*.ipr
21+
22+
### NetBeans ###
23+
/nbproject/private/
24+
/nbbuild/
25+
/dist/
26+
/nbdist/
27+
/.nb-gradle/
28+
build/
29+
!**/src/main/**/build/
30+
!**/src/test/**/build/
31+
32+
### VS Code ###
33+
.vscode/

‎SpringBootDemoV3/pom.xml

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-starter-parent</artifactId>
8+
<version>3.2.3</version>
9+
<relativePath/> <!-- lookup parent from repository -->
10+
</parent>
11+
12+
<groupId>com.github.xiaour</groupId>
13+
<artifactId>springbootv3</artifactId>
14+
<version>0.0.1-SNAPSHOT</version>
15+
<name>SpringBootDemoV3</name>
16+
<description>Demo project for Spring Boot</description>
17+
<packaging>jar</packaging>
18+
19+
<properties>
20+
<java.version>17</java.version>
21+
</properties>
22+
23+
<dependencies>
24+
25+
<dependency>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-starter</artifactId>
28+
</dependency>
29+
30+
<dependency>
31+
<groupId>org.springframework.boot</groupId>
32+
<artifactId>spring-boot-starter-test</artifactId>
33+
<scope>test</scope>
34+
</dependency>
35+
36+
<dependency>
37+
<groupId>org.springframework.boot</groupId>
38+
<artifactId>spring-boot-starter-web</artifactId>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>io.github.xiaour</groupId>
43+
<artifactId>easy-export</artifactId>
44+
<version>1.0.1-RELEASE</version>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>com.alibaba</groupId>
49+
<artifactId>easyexcel</artifactId>
50+
<version>2.2.3</version>
51+
</dependency>
52+
53+
</dependencies>
54+
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.springframework.boot</groupId>
59+
<artifactId>spring-boot-maven-plugin</artifactId>
60+
</plugin>
61+
</plugins>
62+
</build>
63+
64+
</project>

‎SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/SpringBootDemoV3Application.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.xiaour.spring.boot;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
6+
@SpringBootApplication
7+
public class SpringBootDemoV3Application {
8+
9+
public static void main(String[] args) {
10+
SpringApplication.run(SpringBootDemoV3Application.class, args);
11+
//System.out.println(Math.max(10,11));
12+
}
13+
14+
15+
}

0 commit comments

Comments
 (0)