Skip to content

Commit

Permalink
升级 2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@zuihou
zuihou committed Aug 10, 2020
1 parent 706b793 commit fbfb0d1
Show file tree
Hide file tree
Showing 27 changed files with 36 additions and 29 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ target/
!.mvn/wrapper/maven-wrapper.jar
log.path_IS_UNDEFINED
.DS_Store
spy.log

### STS ###
.apt_generated
Expand Down
12 changes: 9 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<name>${project.artifactId}</name>
Expand Down Expand Up @@ -42,8 +42,8 @@
</modules>

<properties>
<zuihou-commons.version>2.4.0</zuihou-commons.version>
<zuihou-project.version>b.2.4-SNAPSHOT</zuihou-project.version>
<zuihou-commons.version>2.5.0</zuihou-commons.version>
<zuihou-project.version>b.2.5-SNAPSHOT</zuihou-project.version>

<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -216,6 +216,12 @@
<nonFilteredFileExtension>p12</nonFilteredFileExtension>
<nonFilteredFileExtension>key</nonFilteredFileExtension>
<nonFilteredFileExtension>db</nonFilteredFileExtension>
<nonFilteredFileExtension>eot</nonFilteredFileExtension>
<nonFilteredFileExtension>otf</nonFilteredFileExtension>
<nonFilteredFileExtension>svg</nonFilteredFileExtension>
<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
<nonFilteredFileExtension>woff</nonFilteredFileExtension>
<nonFilteredFileExtension>woff2</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-authority-biz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-authority-controller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-authority-entity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-authority-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions ...authority-server/src/main/java/com/github/zuihou/interceptor/TokenHandlerInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
String token = getHeader(BEARER_HEADER_KEY, request);

//添加测试环境的特殊token
if (isDev() && StrPool.TEST.equalsIgnoreCase(token)) {
authInfo = new AuthInfo().setAccount("zuihou").setUserId(1L).setTokenType(BEARER_HEADER_KEY).setName("平台管理员");
if (isDev() && (StrPool.TEST_TOKEN.equalsIgnoreCase(token) || StrPool.TEST.equalsIgnoreCase(token))) {
authInfo = new AuthInfo().setAccount("zuihou").setUserId(3L).setTokenType(BEARER_HEADER_KEY).setName("平台管理员");
}
// 4, 解析 并 验证 token
if (authInfo == null) {
Expand Down
2 changes: 1 addition & 1 deletion zuihou-authority-server/src/main/resources/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ spring:
druid:
initialSize: 10
minIdle: 10
maxActive: 500
maxActive: 200
max-wait: 60000
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
Expand Down
2 changes: 1 addition & 1 deletion zuihou-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion zuihou-file-biz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-file-controller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-file-entity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-jobs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>zuihou-jobs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-jobs/zuihou-executor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-jobs</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-jobs/zuihou-jobs-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-jobs</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-jobs/zuihou-jobs-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-jobs</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-jobs/zuihou-jobs-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-jobs</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-msgs-biz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion zuihou-msgs-controller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion zuihou-msgs-entity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion zuihou-oauth-biz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-oauth-controller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-sms-biz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion zuihou-sms-controller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>zuihou-admin-boot</artifactId>
<groupId>com.github.zuihou</groupId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion zuihou-tenant-biz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-tenant-controller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion zuihou-tenant-entity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.zuihou</groupId>
<artifactId>zuihou-admin-boot</artifactId>
<version>b.2.4-SNAPSHOT</version>
<version>b.2.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down

0 comments on commit fbfb0d1

Please sign in to comment.