Skip to content

Commit 09c8c68

Browse files
zihongzihong
zihong
authored and
zihong
committed
refactor: springboot 版本升级至 2.1.0
1 parent d6bee8b commit 09c8c68

File tree

55 files changed

+123
-61
lines changed

Some content is hidden

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

55 files changed

+123
-61
lines changed

README.md

+1-1

SpringBoot-ActiveMq/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
3-
compile('org.springframework.boot:spring-boot-starter-activemq:2.0.4.RELEASE')
2+
compile project(':SpringBoot-Support')
3+
compile('org.springframework.boot:spring-boot-starter-activemq')
44
}

SpringBoot-Alibaba-Sentinel/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tasks.withType(JavaCompile) {
2323
options.encoding = 'UTF-8'
2424
}
2525
dependencies {
26-
compile project(':SpringBoot-Utils')
26+
compile project(':SpringBoot-Support')
2727
compile 'org.springframework.cloud:spring-cloud-starter-alibaba-sentinel:0.2.2.RELEASE'
2828
}
2929
//具体配置生成镜像

SpringBoot-Dubbo-Consumer/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(":SpringBoot-Utils")
2+
compile project(":SpringBoot-Support")
33
compile(group: 'com.alibaba', name: 'dubbo', version: '2.5.3') {
44
exclude(module: 'spring')
55
exclude(module: 'slf4j-log4j12')

SpringBoot-Dubbo-Provider/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile(group: 'com.alibaba', name: 'dubbo', version: '2.5.3') {
44
exclude(module: 'spring')
55
exclude(module: 'slf4j-log4j12')

SpringBoot-Elasticsearch-Query/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-elasticsearch', version: '2.0.6.RELEASE'
44
compile 'org.elasticsearch.client:x-pack-transport:5.5.0'
55
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.4.RELEASE'

SpringBoot-Elasticsearch/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-elasticsearch', version: '2.0.6.RELEASE'
44
compile 'org.elasticsearch.client:x-pack-transport:5.5.0'
55
}

SpringBoot-Email/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '2.0.4.RELEASE'
4-
compile 'org.springframework.boot:spring-boot-starter-thymeleaf:2.0.4.RELEASE'
4+
compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
55
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.4.RELEASE'
66
}

SpringBoot-FastDFS/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
3-
compile 'org.springframework.boot:spring-boot-starter-thymeleaf:2.0.4.RELEASE'
2+
compile project(':SpringBoot-Support')
3+
compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
44
//此包需要自己编译,https://github.com/happyfish100/fastdfs-client-java
55
compile 'org.csource:fastdfs-client-java:1.27-SNAPSHOT'
66
}

SpringBoot-Grpc/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ subprojects {
1717
maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
1818
}
1919
dependencies {
20-
compile project(':SpringBoot-Utils')
20+
compile project(':SpringBoot-Support')
2121
// runtime 'io.netty:netty-tcnative-boringssl-static:2.0.20.Final'
2222
compile group: 'net.devh', name: 'grpc-client-spring-boot-starter', version: '2.0.1.RELEASE'
2323
compile group: 'net.devh', name: 'grpc-server-spring-boot-starter', version: '2.0.1.RELEASE'

SpringBoot-JTA-Atomikos/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.boot', name: 'spring-boot-starter-jta-atomikos', version: '2.0.4.RELEASE'
44
compile group: 'com.alibaba', name: 'druid', version: '1.1.10'
55
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'

SpringBoot-JWT/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ dependencies {
22
compile project(':SpringBoot-Support')
33
compile 'com.auth0:java-jwt:3.4.0'
44
compile 'org.apache.shiro:shiro-spring:1.4.0'
5-
compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.0.4.RELEASE'
6-
compile 'org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE'
5+
compile group: 'org.springframework.boot', name: 'spring-boot-devtools'
6+
compile 'org.springframework.boot:spring-boot-starter-aop'
77
compile group: 'com.alibaba', name: 'druid', version: '1.1.10'
88
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
99
compile group: 'org.mybatis.spring.boot', name: 'mybatis-spring-boot-starter', version: '1.3.2'
10-
testCompile('org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE')
10+
testCompile('org.springframework.boot:spring-boot-starter-test')
1111
}

SpringBoot-Jpa-Thymeleaf/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
3-
compile 'org.springframework.boot:spring-boot-starter-thymeleaf:2.0.4.RELEASE'
4-
compile 'org.springframework.boot:spring-boot-starter-data-jpa:2.0.4.RELEASE'
2+
compile project(':SpringBoot-Support')
3+
compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
4+
compile 'org.springframework.boot:spring-boot-starter-data-jpa'
55
compile 'mysql:mysql-connector-java:6.0.6'
66
}

SpringBoot-Kafka/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'org.springframework.kafka:spring-kafka:2.1.5.RELEASE'
44
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.4.RELEASE'
55
}

SpringBoot-Memcached/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'net.spy', name: 'spymemcached', version: '2.12.3'
44
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.4.RELEASE'
55
}

SpringBoot-Mongodb/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-mongodb', version: '2.0.4.RELEASE'
44
//mongodb增强插件
55
compile group: 'com.spring4all', name: 'mongodb-plus-spring-boot-starter', version: '1.0.0.RELEASE'

SpringBoot-Mybatis-Ehcache/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(":SpringBoot-Utils")
2+
compile project(":SpringBoot-Support")
33
compile 'net.sf.ehcache:ehcache:2.9.1'
44
compile group: 'com.alibaba', name: 'druid', version: '1.1.10'
55
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'

SpringBoot-Mybatis-Multisource/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(":SpringBoot-Utils")
2+
compile project(":SpringBoot-Support")
33
compile group: 'com.alibaba', name: 'druid', version: '1.1.10'
44
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
55
compile group: 'org.mybatis.spring.boot', name: 'mybatis-spring-boot-starter', version: '1.3.2'

SpringBoot-Mybatis-Mycat/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(":SpringBoot-Utils")
2+
compile project(":SpringBoot-Support")
33
compile group: 'com.alibaba', name: 'druid', version: '1.1.10'
44
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
55
compile group: 'org.mybatis.spring.boot', name: 'mybatis-spring-boot-starter', version: '1.3.2'

SpringBoot-Mybatis-Plus/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'com.baomidou:mybatis-plus-boot-starter:3.0.1'
44
//代码生成器
55
compile 'com.baomidou:mybatis-plus-generator:3.0.1'

SpringBoot-Mybatis/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(":SpringBoot-Utils")
2+
compile project(":SpringBoot-Support")
33
compile group: 'com.alibaba', name: 'druid', version: '1.1.10'
44
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
55
compile group: 'org.mybatis.spring.boot', name: 'mybatis-spring-boot-starter', version: '1.3.2'
+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
HELP.md
2+
.gradle
3+
build/
4+
!gradle/wrapper/gradle-wrapper.jar
5+
!**/src/main/**
6+
!**/src/test/**
7+
8+
### STS ###
9+
.apt_generated
10+
.classpath
11+
.factorypath
12+
.project
13+
.settings
14+
.springBeans
15+
.sts4-cache
16+
17+
### IntelliJ IDEA ###
18+
.idea
19+
*.iws
20+
*.iml
21+
*.ipr
22+
out/
23+
24+
### NetBeans ###
25+
/nbproject/private/
26+
/nbbuild/
27+
/dist/
28+
/nbdist/
29+
/.nb-gradle/
30+
31+
### VS Code ###
32+
.vscode/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
dependencies {
2+
compile project(':SpringBoot-Support')
3+
compile 'org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2'
4+
compile('org.springframework.boot:spring-boot-starter-aop')
5+
compile group: 'com.alibaba', name: 'druid', version: '1.1.10'
6+
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
7+
compile 'org.mybatis.generator:mybatis-generator-core:1.3.5'
8+
}

SpringBoot-Nacos-Config/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(":SpringBoot-Utils")
2+
compile project(":SpringBoot-Support")
33
compile 'com.alibaba.boot:nacos-config-spring-boot-starter:0.2.1'
44
compile 'com.alibaba.boot:nacos-config-spring-boot-actuator:0.2.1'
5-
compile 'org.springframework.boot:spring-boot-starter-actuator:2.0.4.RELEASE'
5+
compile 'org.springframework.boot:spring-boot-starter-actuator'
66
}

SpringBoot-Nsq-Consumer/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'com.github.brainlag:nsq-client:1.0.0.RC4'
44
}

SpringBoot-Nsq-Producer/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'com.github.brainlag:nsq-client:1.0.0.RC4'
44
}

SpringBoot-Oauth2-Code/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: '2.3.2.RELEASE'
44
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '2.0.5.RELEASE'
55
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: '2.0.5.RELEASE'

SpringBoot-Oauth2/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: '2.3.2.RELEASE'
44
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '2.0.5.RELEASE'
55
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: '2.0.5.RELEASE'

SpringBoot-RabbitMq/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.9.6'
44
compile group: 'org.springframework.boot', name: 'spring-boot-starter-amqp', version: '2.0.4.RELEASE'
55
}

SpringBoot-RateLimiter/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.aspectj', name: 'aspectjrt', version: '1.9.2'
44
compile 'org.aspectj:aspectjweaver:1.7.2'
55
compile group: 'com.google.guava', name: 'guava', version: '27.0-jre'

SpringBoot-Redis-Distributed-Lock/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'redis.clients', name: 'jedis', version: '2.9.0'
44
compile group: 'org.springframework.data', name: 'spring-data-redis', version: '2.0.4.RELEASE'
55
// compile 'org.redisson:redisson:3.9.1'
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
3-
compile 'org.springframework.boot:spring-boot-starter-data-redis:2.0.4.RELEASE'
2+
compile project(':SpringBoot-Support')
3+
compile 'org.springframework.boot:spring-boot-starter-data-redis'
44
compile 'org.redisson:redisson:3.9.1'
55
}

SpringBoot-Rocketmq/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'org.apache.rocketmq:rocketmq-client:4.3.0'
44
compile 'com.alibaba:fastjson:1.2.47'
5-
testCompile('org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE')
5+
testCompile('org.springframework.boot:spring-boot-starter-test')
66
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apache.rocketmq.consumer.pushConsumer=testConsumer
22
#生产者的配置
33
apache.rocketmq.producer.producerGroup=testProducer
4-
apache.rocketmq.namesrvAddr=192.168.2.46:9876
4+
apache.rocketmq.namesrvAddr=192.168.2.7:9876

SpringBoot-Shiro/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'org.apache.shiro:shiro-spring:1.4.0'
4-
compile 'org.springframework.boot:spring-boot-starter-thymeleaf:2.0.4.RELEASE'
4+
compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
55
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: '2.0.4.RELEASE'
6-
compile 'org.springframework.boot:spring-boot-starter-data-jpa:2.0.4.RELEASE'
6+
compile 'org.springframework.boot:spring-boot-starter-data-jpa'
77
//此jar包针对shiro,对thymeleaf做了部分标签,方便在开发中使用。
88
compile group: 'com.github.theborakompanioni', name: 'thymeleaf-extras-shiro', version: '2.0.0'
99
compile group: 'org.crazycake', name: 'shiro-redis', version: '3.2.2'
1010
compile 'mysql:mysql-connector-java:6.0.6'
11-
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.4.RELEASE'
11+
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
1212
}

SpringBoot-SpringSecurity/README.md

+2-2

SpringBoot-SpringSecurity/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '2.0.5.RELEASE'
44
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version: '2.0.5.RELEASE'
55
compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4:3.0.2.RELEASE'
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile('org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE')
2+
compile('org.springframework.boot:spring-boot-starter-web')
33
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
44
}

SpringBoot-Test-Starter/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ uploadArchives {
1919
}
2020
}
2121
dependencies {
22-
// compile project(':SpringBoot-Utils')
22+
// compile project(':SpringBoot-Support')
2323
testCompile 'org.springframework.boot:spring-boot-configuration-processor:2.0.5.RELEASE'
2424
compile 'org.springframework.boot:spring-boot-autoconfigure:2.0.5.RELEASE'
2525
}

SpringBoot-Thrift-Client/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'org.apache.thrift:libthrift:0.12.0'
4-
testCompile('org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE')
4+
testCompile('org.springframework.boot:spring-boot-starter-test')
55
}

SpringBoot-Thrift-Server/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'org.apache.thrift:libthrift:0.12.0'
44
}

SpringBoot-Validator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
}

SpringBoot-WebSocket/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile group: 'org.springframework.boot', name: 'spring-boot-starter-websocket', version: '2.0.4.RELEASE'
4-
compile 'org.springframework.boot:spring-boot-starter-thymeleaf:2.0.4.RELEASE'
4+
compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
55
}

SpringBoot-Zookeeper-Distributed-Lock/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(':SpringBoot-Utils')
2+
compile project(':SpringBoot-Support')
33
compile 'org.apache.zookeeper:zookeeper:3.4.10'
44
compile 'org.apache.curator:curator-framework:2.12.0'
55
compile 'org.apache.curator:curator-recipes:2.12.0'

0 commit comments

Comments
 (0)