From a195df175f3031d682eccd1fc764ad2033d92b5f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 18 六月 2020 15:07:56 +0800
Subject: [PATCH] 修正定时任务日志权限字符
---
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java | 3 +--
ruoyi-ui/src/views/monitor/job/log.vue | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index d9f79b5..4ead634 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -87,7 +87,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['monitor:jobLog:export']"
+ v-hasPermi="['monitor:job:export']"
>导出</el-button>
</el-col>
</el-row>
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
index 617c8cc..b9f1373 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
@@ -41,8 +41,7 @@
{
ip = request.getRemoteAddr();
}
- ip = EscapeUtil.clean(ip);// 清除Xss特殊字符
- return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
+ return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : EscapeUtil.clean(ip);
}
public static boolean internalIp(String ip)
--
Gitblit v1.9.2