Skip to content

Commit

Permalink
Merge pull request #62 from aoju/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@839128
839128 authored Oct 16, 2019
2 parents 61d3a04 + e56add5 commit dc67699
Show file tree
Hide file tree
Showing 1,432 changed files with 2,135 additions and 2,201 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
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.0.2-blue.svg?label=Maven%20Central" ></img>
<img src="https://img.shields.io/badge/maven--central-v5.0.3-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.0.2</version>
<version>5.0.3</version>
</dependency>
```

### Gradle
```
implementation 'org.aoju:bus-all:5.0.2'
implementation 'org.aoju:bus-all:5.0.3'
```

### Other
Expand Down
2 changes: 1 addition & 1 deletion bus-all/pom.xml
View file
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.0.2</version>
<version>5.0.3</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion bus-base/pom.xml
View file
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.0.2</version>
<version>5.0.3</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
102 changes: 16 additions & 86 deletions bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,48 +31,29 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
public class Consts extends Normal {

/**
* 默认: 代码前缀
* 全局状态
*/
public static final String CLASS_NAME_PREFIX = "org.aoju";
/**
* 默认: 堆栈深度
**/
public static final int CODE_STACK_DEPTH = 20;
/**
* 默认: 超时时间
**/
public static final int DEFAULT_TIMEOUT = 30000;
/**
* 状态: 删除
**/
public static final String STATUS_DELETE = "-1";
/**
* 状态: 禁用
**/
public static final String STATUS_DISABLED = "0";
/**
* 状态: 正常
**/
public static final String STATUS_ENABLED = "1";
/**
* 状态: 关闭
**/
public static final String STATUS_CLOSED = "2";
/**
* 状态: 未知
**/
public static final String STATUS_UNKNOW = "3";
/**
* 状态: 结束
**/
public static final String STATUS_FINISHED = "4";
public static final String STATUS_MINUS_ONE = "-1";
public static final String STATUS_ZERO = "0";
public static final String STATUS_ONE = "1";
public static final String STATUS_TWO = "2";
public static final String STATUS_THREE = "3";
public static final String STATUS_FOUR = "4";
public static final String STATUS_FIVE = "5";
public static final String STATUS_SIX = "6";
public static final String STATUS_SEVEN = "7";
public static final String STATUS_EIGHT = "8";
public static final String STATUS_NINE = "9";

/**
* 全局类型
*/
public static final String TYPE_ZERO = "0";
public static final String TYPE_ONE = "1";
public static final String TYPE_TWO = "2";
Expand All @@ -84,55 +65,4 @@ public class Consts extends Normal {
public static final String TYPE_EIGHT = "8";
public static final String TYPE_NINE = "9";

/*************** 返回值状态码-系统默认 ****************/
public static final String EM_SUCCESS = "0";
public static final String EM_FAILURE = "-1";
public static final String EM_LIMITER = "-2";
public static final String EM_100100 = "100100";
public static final String EM_100101 = "100101";
public static final String EM_100102 = "100102";
public static final String EM_100103 = "100103";
public static final String EM_100104 = "100104";
public static final String EM_100105 = "100105";
public static final String EM_100106 = "100106";
public static final String EM_100107 = "100107";
public static final String EM_100108 = "100108";
public static final String EM_100109 = "100109";
public static final String EM_100110 = "100110";
public static final String EM_100111 = "100111";
public static final String EM_100112 = "100112";
public static final String EM_100113 = "100113";
public static final String EM_100114 = "100114";
public static final String EM_100115 = "100115";
public static final String EM_100116 = "100116";
public static final String EM_100117 = "100117";
public static final String EM_100118 = "100118";
public static final String EM_100200 = "100200";
public static final String EM_100201 = "100201";
public static final String EM_100202 = "100202";
public static final String EM_100203 = "100203";
public static final String EM_100204 = "100204";
public static final String EM_100205 = "100205";
public static final String EM_100206 = "100206";
public static final String EM_100207 = "100207";
public static final String EM_100208 = "100208";
public static final String EM_100209 = "100209";
public static final String EM_100300 = "100300";
public static final String EM_100400 = "100400";
public static final String EM_100500 = "100500";
public static final String EM_100501 = "100501";
public static final String EM_100502 = "100502";
public static final String EM_100503 = "100503";
public static final String EM_100504 = "100504";
public static final String EM_100505 = "100505";
public static final String EM_100506 = "100506";
public static final String EM_100507 = "100507";
public static final String EM_100508 = "100508";
public static final String EM_100509 = "100509";
public static final String EM_100510 = "100510";
public static final String EM_100511 = "100511";
public static final String EM_100512 = "100512";
public static final String EM_100513 = "100513";
public static final String EM_100514 = "100514";

}
106 changes: 54 additions & 52 deletions bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,64 +32,66 @@
* 系统响应码
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
public class ErrorCode {

/*********** 返回值状态码-系统默认 ************/
public static final String EM_SUCCESS = "0";
public static final String EM_FAILURE = "-1";
public static final String EM_LIMITER = "-2";
public static final String EM_100100 = "100100";
public static final String EM_100101 = "100101";
public static final String EM_100102 = "100102";
public static final String EM_100103 = "100103";
public static final String EM_100104 = "100104";
public static final String EM_100105 = "100105";
public static final String EM_100106 = "100106";
public static final String EM_100107 = "100107";
public static final String EM_100108 = "100108";
public static final String EM_100109 = "100109";
public static final String EM_100110 = "100110";
public static final String EM_100111 = "100111";
public static final String EM_100112 = "100112";
public static final String EM_100113 = "100113";
public static final String EM_100114 = "100114";
public static final String EM_100115 = "100115";
public static final String EM_100116 = "100116";
public static final String EM_100117 = "100117";
public static final String EM_100118 = "100118";
public static final String EM_100200 = "100200";
public static final String EM_100201 = "100201";
public static final String EM_100202 = "100202";
public static final String EM_100203 = "100203";
public static final String EM_100204 = "100204";
public static final String EM_100205 = "100205";
public static final String EM_100206 = "100206";
public static final String EM_100207 = "100207";
public static final String EM_100208 = "100208";
public static final String EM_100209 = "100209";
public static final String EM_100300 = "100300";
public static final String EM_100400 = "100400";
public static final String EM_100500 = "100500";
public static final String EM_100501 = "100501";
public static final String EM_100502 = "100502";
public static final String EM_100503 = "100503";
public static final String EM_100504 = "100504";
public static final String EM_100505 = "100505";
public static final String EM_100506 = "100506";
public static final String EM_100507 = "100507";
public static final String EM_100508 = "100508";
public static final String EM_100509 = "100509";
public static final String EM_100510 = "100510";
public static final String EM_100511 = "100511";
public static final String EM_100512 = "100512";
public static final String EM_100513 = "100513";
public static final String EM_100514 = "100514";
/**
* 全局错误码
*/
public static String EM_SUCCESS = "0";
public static String EM_FAILURE = "-1";
public static String EM_LIMITER = "-2";
public static String EM_100100 = "100100";
public static String EM_100101 = "100101";
public static String EM_100102 = "100102";
public static String EM_100103 = "100103";
public static String EM_100104 = "100104";
public static String EM_100105 = "100105";
public static String EM_100106 = "100106";
public static String EM_100107 = "100107";
public static String EM_100108 = "100108";
public static String EM_100109 = "100109";
public static String EM_100110 = "100110";
public static String EM_100111 = "100111";
public static String EM_100112 = "100112";
public static String EM_100113 = "100113";
public static String EM_100114 = "100114";
public static String EM_100115 = "100115";
public static String EM_100116 = "100116";
public static String EM_100117 = "100117";
public static String EM_100118 = "100118";
public static String EM_100200 = "100200";
public static String EM_100201 = "100201";
public static String EM_100202 = "100202";
public static String EM_100203 = "100203";
public static String EM_100204 = "100204";
public static String EM_100205 = "100205";
public static String EM_100206 = "100206";
public static String EM_100207 = "100207";
public static String EM_100208 = "100208";
public static String EM_100209 = "100209";
public static String EM_100300 = "100300";
public static String EM_100400 = "100400";
public static String EM_100500 = "100500";
public static String EM_100501 = "100501";
public static String EM_100502 = "100502";
public static String EM_100503 = "100503";
public static String EM_100504 = "100504";
public static String EM_100505 = "100505";
public static String EM_100506 = "100506";
public static String EM_100507 = "100507";
public static String EM_100508 = "100508";
public static String EM_100509 = "100509";
public static String EM_100510 = "100510";
public static String EM_100511 = "100511";
public static String EM_100512 = "100512";
public static String EM_100513 = "100513";
public static String EM_100514 = "100514";

/**
* 错误码列表
* 错误码缓存
*/
private static Map<String, String> ERRORCODE_CACHE = new ConcurrentHashMap<>();

Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
@Data
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
@Data
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/entity/Message.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
@Data
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
@Data
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/entity/Result.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
@Data
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
@Data
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
public interface BaseMapper<T> extends Mapper<T> {
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
public interface Mapper<T> extends org.aoju.bus.mapper.common.Mapper<T> {
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
public interface BaseService<T> extends Service {
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/service/Service.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
public interface Service {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
public class BaseServiceImpl<Mapper extends BaseMapper<T>, T extends BaseEntity>
Expand Down Expand Up @@ -211,7 +211,7 @@ private String setValue(T entity) {
return null;
}
if (StringUtils.isEmpty(entity.getStatus())) {
entity.setStatus(Consts.STATUS_ENABLED);
entity.setStatus(Consts.STATUS_ONE);
}
entity.setCreateInfo(entity);
entity.setUpdatedInfo(entity);
Expand Down
2 changes: 1 addition & 1 deletion bus-base/src/main/java/org/aoju/bus/base/spring/BaseAdvice.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.0.2
* @version 5.0.3
* @since JDK 1.8+
*/
@ControllerAdvice
Expand Down
Loading

0 comments on commit dc67699

Please sign in to comment.