From 4b21a3bc48963ef6e85de832ca05f7b6ee40f6dc Mon Sep 17 00:00:00 2001
From: wangfeiyu <wangfeiyu@cscec.com>
Date: Wed, 22 Feb 2023 08:54:10 +0800
Subject: [PATCH] 在方法isMatchedIp的参数中,当filter为null而ip非null/空时,报filter为null异常。把判断条件由&&改为||解决此bug。

---
 ruoyi-ui/src/api/login.js |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 74ed95e..6b0cda0 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -4,6 +4,9 @@
 export function login(username, password, code, uuid) {
   return request({
     url: '/auth/login',
+    headers: {
+      isToken: false
+    },
     method: 'post',
     data: { username, password, code, uuid }
   })
@@ -49,6 +52,9 @@
 export function getCodeImg() {
   return request({
     url: '/code',
+    headers: {
+      isToken: false
+    },
     method: 'get',
     timeout: 20000
   })

--
Gitblit v1.9.3