Skip to content

Commit

Permalink
Merge pull request #6 from guoshiqiufeng/dev
Browse files Browse the repository at this point in the history 
1.5.2
  • Loading branch information
@guoshiqiufeng
guoshiqiufeng authored Dec 15, 2021
2 parents b956f6d + 8410d81 commit 68c6256
Show file tree
Hide file tree
Showing 59 changed files with 80 additions and 71 deletions.
4 changes: 2 additions & 2 deletions kernel-all-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kernel-all-spring-boot-starter</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<description>spring-boot 依赖引用</description>
<inceptionYear>2021-Now</inceptionYear>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion kernel-auth/auth-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-auth</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-auth/auth-sdk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-auth</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-auth/auth-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-auth</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-cache/cache-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-cache</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-cache/cache-redis-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-cache</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-cache/cache-sdk-redis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-cache</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
7 changes: 6 additions & 1 deletion ...edis/src/main/java/com/gitee/fubluesky/kernel/cache/redis/AbstractRedisCacheOperator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ public void add(String key, T value) {
*/
@Override
public void add(String key, T value, Long expire) {
redisTemplate.boundValueOps(getKeyPrefix() + getKey(key)).set(value, expire, TimeUnit.SECONDS);
if (expire != -1) {
redisTemplate.boundValueOps(getKeyPrefix() + getKey(key)).set(value, expire, TimeUnit.SECONDS);
}
else {
redisTemplate.boundValueOps(getKeyPrefix() + getKey(key));
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions kernel-cache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kernel-cache</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<description>缓存模块 </description>
<inceptionYear>2021-Now</inceptionYear>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions kernel-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kernel-core</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<description>核心相关</description>
<inceptionYear>2021-Now</inceptionYear>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion kernel-db/db-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-db</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-db/db-sdk-mybatis-plus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-db</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-db/db-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-db</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions kernel-db/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kernel-db</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<description>数据库相关</description>
<inceptionYear>2021-Now</inceptionYear>
<packaging>pom</packaging>
Expand Down
6 changes: 6 additions & 0 deletions kernel-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<url>https://github.com/guoshiqiufeng</url>

<properties>
<jdom2.version>2.0.6.1</jdom2.version>
<mybatis-plus.version>3.4.2</mybatis-plus.version>
<swagger.fox.version>3.0.0</swagger.fox.version>
<knife4j.version>3.0.2</knife4j.version>
Expand Down Expand Up @@ -66,6 +67,11 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>${jdom2.version}</version>
</dependency>
<!--mybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
Expand Down
2 changes: 1 addition & 1 deletion kernel-email/email-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-email</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-email/email-sdk-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-email</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-email/email-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-email</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-email/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-excel/excel-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-excel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/com/gitee/fubluesky/kernel/excel/api/exception/enums/ExcelExceptionEnum.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public enum ExcelExceptionEnum implements AbstractExceptionEnum {
/**
* Excel导出异常
*/
EXCEL_EXPORT_ERROR(ErrorType.USER_OPERATION_ERROR.getCode(), ExcelConstants.EXCEPTION_STEP_CODE + "02", "Excel导出异常"),
EXCEL_EXPORT_ERROR(ErrorType.USER_OPERATION_ERROR.getCode(), ExcelConstants.EXCEPTION_STEP_CODE + "02",
"Excel导出异常"),

;

Expand Down
2 changes: 1 addition & 1 deletion kernel-excel/excel-sdk-easy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-excel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-excel/excel-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-excel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-excel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-ali-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-all-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
9 changes: 3 additions & 6 deletions .../src/main/java/com/gitee/fubluesky/kernel/file/api/exception/enums/FileExceptionEnum.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,17 @@ public enum FileExceptionEnum implements AbstractExceptionEnum {
/**
* 上传文件失败，请检查配置信息
*/
FILE_UPLOAD_ERROR(ErrorType.THIRD_ERROR.getCode(), FileConstants.EXCEPTION_STEP_CODE + "10",
"上传文件失败，请检查配置信息"),
FILE_UPLOAD_ERROR(ErrorType.THIRD_ERROR.getCode(), FileConstants.EXCEPTION_STEP_CODE + "10", "上传文件失败，请检查配置信息"),

/**
* 获取文件失败
*/
FILE_GET_ERROR(ErrorType.THIRD_ERROR.getCode(), FileConstants.EXCEPTION_STEP_CODE + "11",
"获取文件失败，请检查配置信息"),
FILE_GET_ERROR(ErrorType.THIRD_ERROR.getCode(), FileConstants.EXCEPTION_STEP_CODE + "11", "获取文件失败，请检查配置信息"),

/**
* 删除文件失败
*/
FILE_DELETE_ERROR(ErrorType.THIRD_ERROR.getCode(), FileConstants.EXCEPTION_STEP_CODE + "12",
"删除文件失败，请检查配置信息"),
FILE_DELETE_ERROR(ErrorType.THIRD_ERROR.getCode(), FileConstants.EXCEPTION_STEP_CODE + "12", "删除文件失败，请检查配置信息"),

;

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-expand-apk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-ftp-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-local-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-sdk-ali/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-sdk-ftp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/file-sdk-local/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-file</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-jwt/jwt-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-jwt</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion kernel-jwt/jwt-sdk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.gitee.fubluesky.kernel</groupId>
<artifactId>kernel-jwt</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading

0 comments on commit 68c6256

Please sign in to comment.