From c53d5fd1f68e9a681f8437d0b9fcc264dc4b65c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 12 六月 2020 15:14:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/monitor/online/index.vue | 2 +-
ruoyi-ui/public/robots.txt | 2 ++
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java | 3 ++-
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java | 4 ++--
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 2 +-
ruoyi-ui/vue.config.js | 6 +++++-
ruoyi-ui/src/views/system/user/index.vue | 2 +-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/public/robots.txt b/ruoyi-ui/public/robots.txt
new file mode 100644
index 0000000..c2aab7e
--- /dev/null
+++ b/ruoyi-ui/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue
index 462a2ac..580d71c 100644
--- a/ruoyi-ui/src/views/monitor/online/index.vue
+++ b/ruoyi-ui/src/views/monitor/online/index.vue
@@ -39,7 +39,7 @@
<el-table-column label="鐧诲綍鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="閮ㄩ棬鍚嶇О" align="center" prop="deptName" />
<el-table-column label="涓绘満" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
- <el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" />
+ <el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="娴忚鍣�" align="center" prop="browser" />
<el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" />
<el-table-column label="鐧诲綍鏃堕棿" align="center" prop="loginTime" width="180">
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index c9e89c1..ca6781b 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -133,7 +133,7 @@
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="40" align="center" />
+ <el-table-column type="selection" width="50" align="center" />
<el-table-column label="鐢ㄦ埛缂栧彿" align="center" prop="userId" />
<el-table-column label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="鐢ㄦ埛鏄电О" align="center" prop="nickName" :show-overflow-tooltip="true" />
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 4cf5f28..87632b5 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -117,7 +117,11 @@
}
}
})
- config.optimization.runtimeChunk('single')
+ config.optimization.runtimeChunk('single'),
+ {
+ from: path.resolve(__dirname, './public/robots.txt'),//闃茬埇铏枃浠�
+ to:'./',//鍒版牴鐩綍涓�
+ }
}
)
}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 736d9d8..f7a96e1 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -118,7 +118,7 @@
StringBuilder result = new StringBuilder();
try
{
- String urlNameString = url + "?" + param;
+ String urlNameString = url;
log.info("sendPost - {}", urlNameString);
URL realUrl = new URL(urlNameString);
URLConnection conn = realUrl.openConnection();
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 2b9a267..16b01e9 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
@@ -4,6 +4,7 @@
import java.net.UnknownHostException;
import javax.servlet.http.HttpServletRequest;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.html.EscapeUtil;
/**
* 鑾峰彇IP鏂规硶
@@ -40,7 +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;
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
index 4068643..ad4293a 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
@@ -58,11 +58,11 @@
{
column.setHtmlType(GenConstants.HTML_INPUT);
- // 濡傛灉鏄诞鐐瑰瀷
+ // 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal
String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
{
- column.setJavaType(GenConstants.TYPE_DOUBLE);
+ column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
// 濡傛灉鏄暣褰�
else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
--
Gitblit v1.9.3