diff --git a/basic-pojo/pom.xml b/basic-pojo/pom.xml index 4e309cb7..7a563b0b 100644 --- a/basic-pojo/pom.xml +++ b/basic-pojo/pom.xml @@ -88,6 +88,14 @@ jstl + + + + ink.wgink + basic-annotation + 1.0-SNAPSHOT + + \ No newline at end of file diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/result/ErrorResult.java b/basic-pojo/src/main/java/ink/wgink/pojo/result/ErrorResult.java index 30d048f7..7f9f9c08 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/result/ErrorResult.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/result/ErrorResult.java @@ -65,35 +65,44 @@ public class ErrorResult implements Serializable { /** * 错误类型 */ - SYSTEM_ERROR(40001), - ENCODE_ERROR(40002), - DECODE_ERROR(40003), - APP_DEPENDENCY_ERROR(40004), - PROPERTIES_ERROR(40005), - TEXT_ILLEGAL(40101), - PARAMS_ERROR(40102), - QUERY_ERROR(40101), - SAVE_ERROR(40102), - UPDATE_ERROR(40103), - REMOVE_ERROR(40104), - FILE_ERROR(40401), - TEST_ERROR(40201), - LOGIN_OUT(40301), - TOKEN_ERROR(40302), - USERNAME_PASSWORD_ERROR(40303), - USER_EXIST(40304), - PERMISSION_ERROR(40401), - DEVICE_ERROR(40501), - DEVICE_VERSION_ERROR(40502); + SYSTEM_ERROR(40001, "系统错误"), + ENCODE_ERROR(40002, "编码错误"), + DECODE_ERROR(40003, "解码错误"), + APP_DEPENDENCY_ERROR(40004, "APP依赖错误"), + PROPERTIES_ERROR(40005, "配置属性错误"), + TEXT_ILLEGAL(40101, "文本非法"), + PARAMS_ERROR(40102, "参数错误"), + QUERY_ERROR(40101, "查询错误"), + SAVE_ERROR(40102, "保存错误"), + UPDATE_ERROR(40103, "更新错误"), + REMOVE_ERROR(40104, "删除错误"), + FILE_ERROR(40401, "文件错误"), + TEST_ERROR(40201, "测试错误"), + LOGIN_OUT(40301, "登录登出"), + TOKEN_ERROR(40302, "TOKEN错误"), + USERNAME_PASSWORD_ERROR(40303, "用户名密码错误"), + USER_EXIST(40304, "用户存在"), + DEVICE_ERROR(40501, "设备错误"), + DEVICE_VERSION_ERROR(40502, "设备版本错误"), + PERMISSION_ERROR(40601, "权限错误"), + REMOTE_REQUEST_EXCEPTION(40701, "远程请求错误"), + REMOTE_RESPONSE_EXCEPTION(40702, "远程响应错误"); + private int value; + private String summary; - ErrorResultCodeEnum(int value) { + ErrorResultCodeEnum(int value, String summary) { this.value = value; + this.summary = summary; } public int getValue() { return value; } + + public String getSummary() { + return summary == null ? "" : summary.trim(); + } } } diff --git a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdatePasswordVO.java b/basic-pojo/src/main/java/ink/wgink/pojo/vos/UpdatePasswordVO.java similarity index 97% rename from service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdatePasswordVO.java rename to basic-pojo/src/main/java/ink/wgink/pojo/vos/UpdatePasswordVO.java index 06958a79..5383a611 100644 --- a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdatePasswordVO.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/vos/UpdatePasswordVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.pojo.vos; +package ink.wgink.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/basic-util/pom.xml b/basic-util/pom.xml index fde7105e..0ba57136 100644 --- a/basic-util/pom.xml +++ b/basic-util/pom.xml @@ -136,11 +136,6 @@ - - ink.wgink - basic-annotation - 1.0-SNAPSHOT - ink.wgink basic-exception