From 6e5d7a6dab441eaa6d4ebca8cb8fc6fb2919d4e2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 14 Nov 2022 11:34:59 +0800
Subject: [PATCH] 升级druid到最新版本1.2.14
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
index 814b0c2..c1e4b82 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
@@ -103,6 +103,29 @@
}
/**
+ * 返回警告消息
+ *
+ * @param msg 返回内容
+ * @return 警告消息
+ */
+ public static AjaxResult warn(String msg)
+ {
+ return AjaxResult.warn(msg, null);
+ }
+
+ /**
+ * 返回警告消息
+ *
+ * @param msg 返回内容
+ * @param data 数据对象
+ * @return 警告消息
+ */
+ public static AjaxResult warn(String msg, Object data)
+ {
+ return new AjaxResult(HttpStatus.WARN, msg, data);
+ }
+
+ /**
* 返回错误消息
*
* @return
@@ -154,7 +177,7 @@
*/
public boolean isSuccess()
{
- return !isError();
+ return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG));
}
/**
@@ -164,7 +187,7 @@
*/
public boolean isError()
{
- return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG));
+ return !isSuccess();
}
/**
--
Gitblit v1.9.3