diff --git a/common/pom.xml b/common/pom.xml
index b38f0cd..a67276b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,10 +10,23 @@
4.0.0
common
+ 公共模块
- 17
- 17
+ 5.3.4
+
+
+ cn.hutool
+ hutool-all
+ ${hutool.version}
+
+
+ org.hibernate.validator
+ hibernate-validator
+ 6.1.5.Final
+
+
+
\ No newline at end of file
diff --git a/common/src/main/java/com/storeroom/exception/BaseException.java b/common/src/main/java/com/storeroom/exception/BaseException.java
index 82a6317..a4e9cf3 100644
--- a/common/src/main/java/com/storeroom/exception/BaseException.java
+++ b/common/src/main/java/com/storeroom/exception/BaseException.java
@@ -1,6 +1,6 @@
package com.storeroom.exception;
-import com.storeroom.exception.constant.Status;
+import com.storeroom.exception.constant.ResponseStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,10 +17,10 @@ public class BaseException extends RuntimeException{
- public BaseException(Status status){
- super(status.getMessage());
- this.code=status.getCode();
- this.message=status.getMessage();
+ public BaseException(ResponseStatus responseStatus){
+ super(responseStatus.getMessage());
+ this.code= responseStatus.getCode();
+ this.message= responseStatus.getMessage();
}
diff --git a/common/src/main/java/com/storeroom/exception/JsonException.java b/common/src/main/java/com/storeroom/exception/JsonException.java
index e43cde4..6bbf67b 100644
--- a/common/src/main/java/com/storeroom/exception/JsonException.java
+++ b/common/src/main/java/com/storeroom/exception/JsonException.java
@@ -1,7 +1,7 @@
package com.storeroom.exception;
-import com.storeroom.exception.constant.Status;
+import com.storeroom.exception.constant.ResponseStatus;
import lombok.Getter;
@@ -11,8 +11,8 @@ import lombok.Getter;
@Getter
public class JsonException extends BaseException {
- public JsonException(Status status) {
- super(status);
+ public JsonException(ResponseStatus responseStatus) {
+ super(responseStatus);
}
public JsonException(Integer code,String message) {
diff --git a/common/src/main/java/com/storeroom/exception/PageException.java b/common/src/main/java/com/storeroom/exception/PageException.java
index 64c666b..a5b544f 100644
--- a/common/src/main/java/com/storeroom/exception/PageException.java
+++ b/common/src/main/java/com/storeroom/exception/PageException.java
@@ -1,6 +1,6 @@
package com.storeroom.exception;
-import com.storeroom.exception.constant.Status;
+import com.storeroom.exception.constant.ResponseStatus;
import lombok.Getter;
/**
@@ -9,8 +9,8 @@ import lombok.Getter;
@Getter
public class PageException extends BaseException {
- public PageException(Status status) {
- super(status);
+ public PageException(ResponseStatus responseStatus) {
+ super(responseStatus);
}
public PageException(Integer code, String message) {
diff --git a/common/src/main/java/com/storeroom/exception/constant/Status.java b/common/src/main/java/com/storeroom/exception/constant/ResponseStatus.java
similarity index 54%
rename from common/src/main/java/com/storeroom/exception/constant/Status.java
rename to common/src/main/java/com/storeroom/exception/constant/ResponseStatus.java
index 6baba42..3342e02 100644
--- a/common/src/main/java/com/storeroom/exception/constant/Status.java
+++ b/common/src/main/java/com/storeroom/exception/constant/ResponseStatus.java
@@ -3,15 +3,23 @@ package com.storeroom.exception.constant;
import lombok.Getter;
+/*
+ * 业务状态码类
+ */
@Getter
-public enum Status {
+public enum ResponseStatus {
//操作成功
SUCCESS(200,"操作成功"),
//操作失败
FAIL(999,"操作失败"),
//未知异常
- UNKNOWN_ERROR(500,"服务器内部错误");
+ UNKNOWN_ERROR(500,"服务器内部错误"),
+ //token过期
+ TOKEN_UNAUTHORIZED(4001,"当前登录状态过期"),
+ //token 为空
+ TOKEN_IS_NULL(4002,"找不到当前登录信息");
+
//状态码
@@ -21,10 +29,9 @@ public enum Status {
private final String message;
//构造
- Status(Integer code,String message){
+ ResponseStatus(Integer code, String message){
this.code=code;
this.message=message;
-
}
}
diff --git a/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java b/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java
index 9d66c09..c22560e 100644
--- a/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java
+++ b/common/src/main/java/com/storeroom/exception/handler/GlobalExceptionHandler.java
@@ -1,13 +1,13 @@
package com.storeroom.exception.handler;
import com.storeroom.exception.BaseException;
-import com.storeroom.exception.constant.Status;
+import com.storeroom.exception.constant.ResponseStatus;
+import com.storeroom.utils.ApiResponse;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
@@ -27,20 +27,20 @@ public class GlobalExceptionHandler {
@ResponseBody
public ApiResponse exception(Exception e){
log.error("全局异常信息 ex={}",e.getMessage());
- return ApiResponse.error(Status.UNKNOWN_ERROR.getCode(),e.getMessage());
+ return ApiResponse.error(ResponseStatus.UNKNOWN_ERROR.getCode(),e.getMessage());
}
@ExceptionHandler(NullPointerException.class)
@ResponseBody
public ApiResponse exceptionHandler(HttpServletRequest req,NullPointerException e) {
log.error("发生空指针异常!原因是:",e);
- return ApiResponse.error(Status.UNKNOWN_ERROR);
+ return ApiResponse.error(ResponseStatus.UNKNOWN_ERROR);
}
@ExceptionHandler(value = Exception.class)
@ResponseBody
public ApiResponse exceptionHandler(HttpServletRequest req,Exception e){
log.error("未知异常 原因是:",e);
- return ApiResponse.error(Status.UNKNOWN_ERROR);
+ return ApiResponse.error(ResponseStatus.UNKNOWN_ERROR);
}
}
diff --git a/common/src/main/java/com/storeroom/exception/handler/ApiResponse.java b/common/src/main/java/com/storeroom/utils/ApiResponse.java
similarity index 74%
rename from common/src/main/java/com/storeroom/exception/handler/ApiResponse.java
rename to common/src/main/java/com/storeroom/utils/ApiResponse.java
index a24b29b..ae224fa 100644
--- a/common/src/main/java/com/storeroom/exception/handler/ApiResponse.java
+++ b/common/src/main/java/com/storeroom/utils/ApiResponse.java
@@ -1,7 +1,7 @@
-package com.storeroom.exception.handler;
+package com.storeroom.utils;
-import com.storeroom.exception.constant.Status;
+import com.storeroom.exception.constant.ResponseStatus;
import lombok.Data;
/**
@@ -47,22 +47,22 @@ public class ApiResponse {
* @param data
*/
private ApiResponse(T data) {
- this.code = Status.SUCCESS.getCode();
- this.message = Status.SUCCESS.getMessage();
+ this.code = ResponseStatus.SUCCESS.getCode();
+ this.message = ResponseStatus.SUCCESS.getMessage();
this.data = data;
}
/**
* 无状态码构造
*
- * @param status
+ * @param responseStatus
*/
- private ApiResponse(Status status) {
- if (null == status) {
+ private ApiResponse(ResponseStatus responseStatus) {
+ if (null == responseStatus) {
return;
}
- this.code = status.getCode();
- this.message = status.getMessage();
+ this.code = responseStatus.getCode();
+ this.message = responseStatus.getMessage();
}
/**
@@ -87,8 +87,8 @@ public class ApiResponse {
*/
public static ApiResponse success(T data) {
ApiResponse apiResponse = new ApiResponse<>();
- apiResponse.setCode(Status.SUCCESS.getCode());
- apiResponse.setMessage(Status.SUCCESS.getMessage());
+ apiResponse.setCode(ResponseStatus.SUCCESS.getCode());
+ apiResponse.setMessage(ResponseStatus.SUCCESS.getMessage());
apiResponse.setData(data);
return apiResponse;
}
@@ -112,12 +112,12 @@ public class ApiResponse {
/**
* 错误状态返回
*
- * @param status 状态码
+ * @param responseStatus 状态码
* @param
* @return
*/
- public static ApiResponse error(Status status) {
- return new ApiResponse(status);
+ public static ApiResponse error(ResponseStatus responseStatus) {
+ return new ApiResponse(responseStatus);
}
/**
@@ -127,7 +127,7 @@ public class ApiResponse {
* @return
*/
public static ApiResponse error() {
- return error(Status.UNKNOWN_ERROR);
+ return error(ResponseStatus.UNKNOWN_ERROR);
}
diff --git a/common/src/main/java/com/storeroom/utils/CallBack.java b/common/src/main/java/com/storeroom/utils/CallBack.java
new file mode 100644
index 0000000..a57f984
--- /dev/null
+++ b/common/src/main/java/com/storeroom/utils/CallBack.java
@@ -0,0 +1,12 @@
+package com.storeroom.utils;
+
+public interface CallBack {
+
+ //回调执行方法
+ void executor();
+
+ //本回调任务名称
+ default String getCallBackName() {
+ return Thread.currentThread().getId() + ":" + this.getClass().getName();
+ }
+}
diff --git a/common/src/main/java/com/storeroom/utils/DataStatusConst.java b/common/src/main/java/com/storeroom/utils/DataStatusConst.java
new file mode 100644
index 0000000..c3a41fd
--- /dev/null
+++ b/common/src/main/java/com/storeroom/utils/DataStatusConst.java
@@ -0,0 +1,15 @@
+package com.storeroom.utils;
+
+
+//数据状态常量
+public class DataStatusConst {
+
+ //正常状态
+ public static final byte OK=1;
+
+ //冻结状态码
+ public static final byte FREEZED=2;
+
+ //删除状态
+ public static final byte DELETE=3;
+}
diff --git a/common/src/main/java/com/storeroom/utils/RedisUtils.java b/common/src/main/java/com/storeroom/utils/RedisUtils.java
new file mode 100644
index 0000000..be99071
--- /dev/null
+++ b/common/src/main/java/com/storeroom/utils/RedisUtils.java
@@ -0,0 +1,694 @@
+package com.storeroom.utils;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.*;
+import org.springframework.stereotype.Component;
+
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * redis 工具类
+ */
+@Component
+public class RedisUtils {
+ private static final Logger log = LoggerFactory.getLogger(RedisUtils.class);
+ private RedisTemplate