Skip to content

Commit

Permalink
Merge pull request #82 from aoju/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
839128 authored Dec 3, 2019
2 parents e1d88db + 22a8429 commit 30206b7
Show file tree
Hide file tree
Showing 1,608 changed files with 1,907 additions and 1,834 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
<img src="https://img.shields.io/badge/maven--central-v5.3.0-blue.svg?label=Maven%20Central" ></img>
<img src="https://img.shields.io/badge/maven--central-v5.3.2-blue.svg?label=Maven%20Central" ></img>
</a>
<a target="_blank" href="https://travis-ci.org/aoju/bus">
<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
Expand Down Expand Up @@ -96,13 +96,13 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
<dependency>
<groupId>org.aoju</groupId>
<artifactId>bus-all</artifactId>
<version>5.3.0</version>
<version>5.3.2</version>
</dependency>
```

### Gradle
```
implementation 'org.aoju:bus-all:5.3.0'
implementation 'org.aoju:bus-all:5.3.2'
```

### Other
Expand Down
2 changes: 1 addition & 1 deletion bus-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-all</artifactId>
<version>5.3.0</version>
<version>5.3.2</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion bus-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-base</artifactId>
<version>5.3.0</version>
<version>5.3.2</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class Consts extends Normal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* 系统响应码
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class ErrorCode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public interface BaseMapper<T> extends Mapper<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public interface Mapper<T> extends org.aoju.bus.mapper.common.Mapper<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public interface BaseService<T> extends Service {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public interface Service {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class BaseServiceImpl<Mapper extends BaseMapper<T>, T extends BaseEntity>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@ControllerAdvice
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* 基础请求封装
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class BaseController<Service extends BaseService<T>, T> extends Controller {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* 基础输出封装
*
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class Controller {
Expand Down
2 changes: 1 addition & 1 deletion bus-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-bom</artifactId>
<version>5.3.0</version>
<version>5.3.2</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Object func(@CacheKey("#arg0[#i]") List<Long> ids) {
<dependency>
<groupId>org.aoju.bus</groupId>
<artifactId>bus-cache</artifactId>
<version>5.3.0</version>
<version>5.3.2</version>
</dependency>
```
- XML注册
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-cache</artifactId>
<version>5.3.0</version>
<version>5.3.2</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Aspectj.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Aspect
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Complex.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Singleton
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Context.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class Context {
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Manage.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Singleton
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Module.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class Module extends AbstractModule {
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Provider.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public interface Provider {
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Registry.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class Registry<T> implements FactoryBean<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Documented
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Documented
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Documented
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Documented
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public interface CacheExpire {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class CacheHolder {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class CacheKeys {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class CachePair<L, R> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public abstract class AbstractProvider implements Provider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class H2Provider extends AbstractProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class MemoryProvider implements Provider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

/**
* @author Kimi Liu
* @version 5.3.0
* @version 5.3.2
* @since JDK 1.8+
*/
public class MySQLProvider extends AbstractProvider {
Expand Down
Loading

0 comments on commit 30206b7

Please sign in to comment.