diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a4b6368
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+.mvn
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
index 59561b6..940ce73 100644
--- a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
+++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 66bd8a3..b691406 100644
--- a/README.md
+++ b/README.md
@@ -7,21 +7,22 @@
### 使用
->yexuejc.base.version=1.1.6
+>yexuejc.base.version=1.1.7
pom.xml
```
- com.github.yexuejc
+ com.yexuejc.base
yexuejc-base
${yexuejc.base.version}
- jitpack.io
- https://jitpack.io
+ yexuejc-nexus-public
+ yexuejc-nexus-public
+ https://nexus.yexuejc.club/repository/maven-public/
```
diff --git a/UPDATE.md b/UPDATE.md
index d2e1940..86a6207 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,13 @@
yexuejc-base 更新记录
------------------
+#### version ：1.1.7
+**time：2018-8-17 11:22:50**
+**branch：** master
+**update：**
+>1. 优化ApiVO
+#
+
#### version ：1.1.6
**time：2018-7-7 11:32:56**
**branch：** master
diff --git a/WIKI.md b/WIKI.md
index 7894877..598c021 100644
--- a/WIKI.md
+++ b/WIKI.md
@@ -1,9 +1,28 @@
yexuejc-base 文档
------------------
+> com.yexuejc.base.constant
##### 1. RespsConsts 网络请求统一返回 常量
+> com.yexuejc.base.http
##### 2. Resps 网络请求统一返回类
+> com.yexuejc.base.pojo
##### 3. ApiVO 接口交互API
##### 4. BaseVO 基类VO
+##### 5. PagerVO 分页VO
+##### 6. ParamsPO 加密参数封装
+> com.yexuejc.base.util
+##### 7. AlgorithmUtils 算法工具类：进制转换
+##### 8. DateTimeUtil 日期时间工具：基于`java.time.*`家族
+##### 9. DateUtil 日期时间工具：基于`java.util.Date`家族
+##### 10. ExcelImportUtils excel工具
+##### 11. FileUtil 文件操作工具
+##### 12. IdcardValidator 身份证工具
+##### 13. JsonUtil json操作工具：基于`com.fasterxml.jackson`家族
+##### 14. JwtUtil jwt库工具
+##### 15. MapRemoveNullUtil map处理空值
+##### 16. MoneyUtils 金额转换：元->分 分->元
+##### 17. RegexUtils 常用正则
+##### 18. StrUtil 字符串工具
+##### 19. SysUtils 常用java系统操作封装
待完善......
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 72dd5de..1dbd45f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.yexuejc.base
yexuejc-base
- 1.1.6
+ 1.1.7
${project.artifactId}
diff --git a/src/main/java/com/yexuejc/base/pojo/ApiVO.java b/src/main/java/com/yexuejc/base/pojo/ApiVO.java
index f31d5f3..a43e1a4 100644
--- a/src/main/java/com/yexuejc/base/pojo/ApiVO.java
+++ b/src/main/java/com/yexuejc/base/pojo/ApiVO.java
@@ -35,6 +35,7 @@ public class ApiVO implements Serializable {
/**
* 使用默认返回code
+ *
* @param status
* @param msg
*/
@@ -55,6 +56,20 @@ public class ApiVO implements Serializable {
this.msgs = msg;
}
+ public ApiVO setStatus(STATUS status, String code, String msg) {
+ this.status = status;
+ this.code = code;
+ this.msgs = StrUtil.isNotEmpty(msg) ? new String[]{msg} : null;
+ return this;
+ }
+
+ public ApiVO setStatus(STATUS status, String code, String[] msg) {
+ this.status = status;
+ this.code = code;
+ this.msgs = msg;
+ return this;
+ }
+
public enum STATUS {
/**
* 成功
@@ -93,36 +108,24 @@ public class ApiVO implements Serializable {
*/
private Object object2;
- public void setObject1(T obj) {
+ public ApiVO setObject1(T obj) {
object1 = obj;
+ return this;
}
public T getObject1(Class clazz) {
return (T) object1;
}
- public void setObject2(T obj) {
+ public ApiVO setObject2(T obj) {
object2 = obj;
+ return this;
}
public T getObject2(Class clazz) {
return (T) object2;
}
- public ApiVO setStatus(STATUS status, String code, String msg) {
- this.status = status;
- this.code = code;
- this.msgs = StrUtil.isNotEmpty(msg) ? new String[]{msg} : null;
- return this;
- }
-
- public ApiVO setStatus(STATUS status, String code, String[] msg) {
- this.status = status;
- this.code = code;
- this.msgs = msg;
- return this;
- }
-
public boolean isSucc() {
if (STATUS.S.name().equals(status.name())) {
return true;
@@ -137,8 +140,9 @@ public class ApiVO implements Serializable {
return false;
}
- public void setMsg(String msg) {
+ public ApiVO setMsg(String msg) {
this.msgs = StrUtil.isNotEmpty(msg) ? new String[]{msg} : null;
+ return this;
}
public boolean isFail() {
@@ -149,8 +153,9 @@ public class ApiVO implements Serializable {
return code;
}
- public void setCode(String code) {
+ public ApiVO setCode(String code) {
this.code = code;
+ return this;
}
@Override
@@ -162,12 +167,14 @@ public class ApiVO implements Serializable {
return status;
}
- public void setStatus(STATUS status) {
+ public ApiVO setStatus(STATUS status) {
this.status = status;
+ return this;
}
- public void setMsgs(String[] msgs) {
+ public ApiVO setMsgs(String[] msgs) {
this.msgs = msgs;
+ return this;
}
public String[] getMsgs() {
diff --git a/src/main/java/com/yexuejc/base/pojo/BaseVO.java b/src/main/java/com/yexuejc/base/pojo/BaseVO.java
index df49887..7c56ca8 100644
--- a/src/main/java/com/yexuejc/base/pojo/BaseVO.java
+++ b/src/main/java/com/yexuejc/base/pojo/BaseVO.java
@@ -6,6 +6,7 @@ import java.io.Serializable;
/**
* 基类VO
+ *
* @PackageName: com.yexuejc.util.base.pojo
* @Description:
* @author: maxf
@@ -15,16 +16,16 @@ public class BaseVO implements Serializable {
private static final long serialVersionUID = -1442656950873492155L;
- public static interface Add {
+ public interface Add {
}
- public static interface Del {
+ public interface Del {
}
- public static interface Mdfy {
+ public interface Mdfy {
}
- public static interface Srch {
+ public interface Srch {
}
@Override