diff --git a/pom.xml b/pom.xml index 5904df7..86b7d31 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.1.2 + 2.1.4 @@ -111,7 +111,7 @@ com.alibaba druid-spring-boot-starter - 1.1.1 + 1.2.4 com.github.pagehelper diff --git a/src/main/java/com/common/base/common/ResultVO.java b/src/main/java/com/common/base/common/ResultVO.java index 0523e99..0f95984 100644 --- a/src/main/java/com/common/base/common/ResultVO.java +++ b/src/main/java/com/common/base/common/ResultVO.java @@ -56,8 +56,8 @@ public class ResultVO { * @param 类型 * @return ResultVO */ - public static ResultVO getSuccess(T data) { - return new ResultVO(data); + public static ResultVO getSuccess(T data) { + return new ResultVO<>(data); } /** * 请求成功 状态码 1 @@ -65,8 +65,8 @@ public class ResultVO { * @param 类型 * @return ResultVO */ - public static ResultVO getSuccess() { - return new ResultVO(); + public static ResultVO getSuccess() { + return new ResultVO<>(); } /** * 请求成功 状态码 1 @@ -76,7 +76,7 @@ public class ResultVO { * @param 类型 * @return ResultVO */ - public static ResultVO getSuccess(String msg, T data) { + public static ResultVO getSuccess(String msg, T data) { return new ResultVO(SUCCESS, msg, data); } @@ -87,8 +87,8 @@ public class ResultVO { * @param 类型 * @return ResultVO */ - public static ResultVO getFailed(String msg) { - return new ResultVO(FAILED, msg); + public static ResultVO getFailed(String msg) { + return new ResultVO<>(FAILED, msg); } /** @@ -99,8 +99,8 @@ public class ResultVO { * @param 类型 * @return ResultVO */ - public static ResultVO getFailed(String msg, T data) { - return new ResultVO(FAILED, msg, data); + public static ResultVO getFailed(String msg, T data) { + return new ResultVO<>(FAILED, msg, data); } @@ -110,7 +110,7 @@ public class ResultVO { * @param 类型 * @return ResultVO */ - public static ResultVO getNoLogin() { + public static ResultVO getNoLogin() { return new ResultVO(UNLOG, "用户未登录,请重新登录"); } @@ -121,11 +121,11 @@ public class ResultVO { * @param 类型 * @return ResultVO */ - public static ResultVO getNoAuthorization() { + public static ResultVO getNoAuthorization() { return new ResultVO(NOAUTH, "用户没有操作权限,请重新登录"); } - public static ResultVO getException(Throwable exp) { + public static ResultVO getException(Throwable exp) { return new ResultVO(exp); }