Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-06-18 8d318c222ede0dcc587ac1177c2e4900e609151e

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

 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>

 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)