From ec588e4226ea7ca3275778cf7610d102c37d7293 Mon Sep 17 00:00:00 2001
From: lhc <taixingyiji@126.com>
Date: Wed, 27 Jan 2021 15:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=B3=9B=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 ++--
 .../java/com/common/base/common/ResultVO.java | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

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