Skip to content

Commit bc9521c

Browse files
authored
v6.2.9
v6.2.9
2 parents a4ad010 + 4456cde commit bc9521c

File tree

2,920 files changed

+12227
-11196
lines changed

Some content is hidden

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

2,920 files changed

+12227
-11196
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</p>
77
<p align="center">
88
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
9-
<img src="https://img.shields.io/badge/maven--central-v6.2.8-blue.svg?label=Maven%20Central" />
9+
<img src="https://img.shields.io/badge/maven--central-v6.2.9-blue.svg?label=Maven%20Central" />
1010
</a>
1111
<a target="_blank" href="https://travis-ci.org/aoju/bus">
1212
<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
@@ -15,7 +15,7 @@
1515
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg">
1616
</a>
1717
<a target="_blank" href="https://spring.io/projects/spring-boot">
18-
<img src="https://img.shields.io/badge/Spring Boot-2.5.3-brightgreen.svg">
18+
<img src="https://img.shields.io/badge/Spring Boot-2.5.5-brightgreen.svg">
1919
</a>
2020
<a target="_blank" href="https://www.mysql.com">
2121
<img src="https://img.shields.io/badge/Mysql-8.0-blue.svg">
@@ -56,7 +56,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件,它基于Java8
5656
|[]|bus-all|包含微服务所需的完整模块以及通用组件|
5757
|[]|bus-base|基础功能及base相关功能,实体类(Entity),服务(Service),接口(Controller)|
5858
|[]|bus-bom|包含所有组建信息,当然可以通过配置按需加载等|
59-
|[ × ]|bus-cache|缓存服务及工具,支持redis,memcached,ehcache,hession等|
59+
|[ ]|bus-cache|缓存服务及工具,支持redis,memcached,ehcache,hession等|
6060
|[]|bus-core|核心功能及工具类,包括常量、线程、类加载器、反射、集合、日期等常用工具|
6161
|[]|bus-cron|定时器及定时任务等功能|
6262
|[]|bus-crypto|加密解密,支持支持AES/DES/REA/MD5等常用加密算法|
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件,它基于Java8
9797
<dependency>
9898
<groupId>org.aoju</groupId>
9999
<artifactId>bus-all</artifactId>
100-
<version>6.2.8</version>
100+
<version>6.2.9</version>
101101
</dependency>
102102
```
103103

bus-all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-all</artifactId>
9-
<version>6.2.8</version>
9+
<version>6.2.9</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>

bus-all/src/main/java/org/aoju/bus/Bus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* </p>
4444
*
4545
* @author Kimi Liu
46-
* @version 6.2.8
46+
* @version 6.2.9
4747
* @since JDK 1.8+
4848
*/
4949
public class Bus extends Version {

bus-base/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-base</artifactId>
9-
<version>6.2.8</version>
9+
<version>6.2.9</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -42,7 +42,7 @@
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4444
<project.compiler.version>1.8</project.compiler.version>
45-
<spring.boot.version>2.5.3</spring.boot.version>
45+
<spring.boot.version>2.5.5</spring.boot.version>
4646
<lombok.version>1.18.20</lombok.version>
4747
<persistence.version>2.2</persistence.version>
4848
</properties>

bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
* 异常信息拦截处理
5050
*
5151
* @author Kimi Liu
52-
* @version 6.2.8
52+
* @version 6.2.9
5353
* @since JDK 1.8+
5454
*/
5555
@ControllerAdvice

bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* 公共常量
3333
*
3434
* @author Kimi Liu
35-
* @version 6.2.8
35+
* @version 6.2.9
3636
* @since JDK 1.8+
3737
*/
3838
public class Consts extends Normal {

bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* 系统响应码
3636
*
3737
* @author Kimi Liu
38-
* @version 6.2.8
38+
* @version 6.2.9
3939
* @since JDK 1.8+
4040
*/
4141
public class ErrorCode {

bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@
3232
import org.aoju.bus.core.lang.Normal;
3333
import org.aoju.bus.core.toolkit.*;
3434

35+
import javax.persistence.Transient;
3536
import java.util.List;
3637
import java.util.Objects;
3738

3839
/**
3940
* Entity 基本信息.
4041
*
4142
* @author Kimi Liu
42-
* @version 6.2.8
43+
* @version 6.2.9
4344
* @since JDK 1.8+
4445
*/
4546
@Data
@@ -73,6 +74,24 @@ public class BaseEntity extends Tracer {
7374
*/
7475
protected String modified;
7576

77+
/**
78+
* 当前页码
79+
*/
80+
@Transient
81+
protected transient Integer pageNo;
82+
83+
/**
84+
* 分页大小
85+
*/
86+
@Transient
87+
protected transient Integer pageSize;
88+
89+
/**
90+
* 排序方式,asc desc
91+
*/
92+
@Transient
93+
protected transient String orderBy;
94+
7695
/**
7796
* 设置访问信息
7897
*

bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@
2828
import lombok.Data;
2929

3030
import javax.persistence.Id;
31-
import javax.persistence.Transient;
3231
import java.io.Serializable;
3332

3433
/**
3534
* Entity 实体
3635
*
3736
* @author Kimi Liu
38-
* @version 6.2.8
37+
* @version 6.2.9
3938
* @since JDK 1.8+
4039
*/
4140
@Data
@@ -49,22 +48,4 @@ public abstract class Entity implements Serializable {
4948
@Id
5049
protected String id;
5150

52-
/**
53-
* 当前页码
54-
*/
55-
@Transient
56-
protected transient Integer pageNo = 1;
57-
58-
/**
59-
* 分页大小
60-
*/
61-
@Transient
62-
protected transient Integer pageSize = 100;
63-
64-
/**
65-
* 排序方式,asc desc
66-
*/
67-
@Transient
68-
protected transient String orderBy;
69-
7051
}

bus-base/src/main/java/org/aoju/bus/base/entity/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* 返回值公用类
3535
*
3636
* @author Kimi Liu
37-
* @version 6.2.8
37+
* @version 6.2.9
3838
* @since JDK 1.8+
3939
*/
4040
@Data

0 commit comments

Comments
 (0)