From 16d8b71e21dc7298b30f46bf264cd9b3589a6978 Mon Sep 17 00:00:00 2001
From: who's hu <hup_dev@outlook.com>
Date: Tue, 22 Aug 2023 17:25:19 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 由于重定向url存在 http://xxx.xx.xxx/{id}?param={a}&name={b} 的场景, 当未登录访问时, 通过改js封装登录后重定向参数, 会丢失?后的query params 如: 访问 http://localhost:1024/core/doc/doc?id=1683734914907807745&version=31 期望 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745%26version%3D31 实际通过 to.fullPath 封装后 获得 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745&version=31
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
index 207c598..ef15802 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.core.domain;
import java.io.Serializable;
+import com.ruoyi.common.constant.HttpStatus;
/**
* 响应信息主体
@@ -12,10 +13,10 @@
private static final long serialVersionUID = 1L;
/** 成功 */
- public static final int SUCCESS = 200;
+ public static final int SUCCESS = HttpStatus.SUCCESS;
/** 失败 */
- public static final int FAIL = 500;
+ public static final int FAIL = HttpStatus.ERROR;
private int code;
@@ -101,4 +102,14 @@
{
this.data = data;
}
+
+ public static <T> Boolean isError(R<T> ret)
+ {
+ return !isSuccess(ret);
+ }
+
+ public static <T> Boolean isSuccess(R<T> ret)
+ {
+ return R.SUCCESS == ret.getCode();
+ }
}
--
Gitblit v1.9.2