Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
c3b5cb20
Commit
c3b5cb20
authored
Jun 10, 2020
by
若依
Committed by
Gitee
Jun 10, 2020
Browse files
Options
Browse Files
Download
Plain Diff
!25 Live轻量级PR
Merge pull request !25 from Live/live
parents
7afc5acc
2daf89e0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
5 deletions
+11
-5
ruoyi-ui/public/robots.txt
ruoyi-ui/public/robots.txt
+2
-0
ruoyi-ui/vue.config.js
ruoyi-ui/vue.config.js
+5
-1
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
.../src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+1
-1
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+1
-1
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
...c/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
+2
-2
No files found.
ruoyi-ui/public/robots.txt
0 → 100644
View file @
c3b5cb20
User-agent: *
Disallow: /
\ No newline at end of file
ruoyi-ui/vue.config.js
View file @
c3b5cb20
...
@@ -117,7 +117,11 @@ module.exports = {
...
@@ -117,7 +117,11 @@ module.exports = {
}
}
}
}
})
})
config
.
optimization
.
runtimeChunk
(
'
single
'
)
config
.
optimization
.
runtimeChunk
(
'
single
'
),
{
from
:
path
.
resolve
(
__dirname
,
'
./public/robots.txt
'
),
//防爬虫文件
to
:
'
./
'
,
//到根目录下
}
}
}
)
)
}
}
...
...
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
View file @
c3b5cb20
...
@@ -118,7 +118,7 @@ public class HttpUtils
...
@@ -118,7 +118,7 @@ public class HttpUtils
StringBuilder
result
=
new
StringBuilder
();
StringBuilder
result
=
new
StringBuilder
();
try
try
{
{
String
urlNameString
=
url
+
"?"
+
param
;
String
urlNameString
=
url
;
log
.
info
(
"sendPost - {}"
,
urlNameString
);
log
.
info
(
"sendPost - {}"
,
urlNameString
);
URL
realUrl
=
new
URL
(
urlNameString
);
URL
realUrl
=
new
URL
(
urlNameString
);
URLConnection
conn
=
realUrl
.
openConnection
();
URLConnection
conn
=
realUrl
.
openConnection
();
...
...
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
View file @
c3b5cb20
...
@@ -40,7 +40,7 @@ public class IpUtils
...
@@ -40,7 +40,7 @@ public class IpUtils
{
{
ip
=
request
.
getRemoteAddr
();
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"
:
ip
;
}
}
...
...
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
View file @
c3b5cb20
...
@@ -58,11 +58,11 @@ public class GenUtils
...
@@ -58,11 +58,11 @@ public class GenUtils
{
{
column
.
setHtmlType
(
GenConstants
.
HTML_INPUT
);
column
.
setHtmlType
(
GenConstants
.
HTML_INPUT
);
// 如果是浮点型
// 如果是浮点型
统一用BigDecimal
String
[]
str
=
StringUtils
.
split
(
StringUtils
.
substringBetween
(
column
.
getColumnType
(),
"("
,
")"
),
","
);
String
[]
str
=
StringUtils
.
split
(
StringUtils
.
substringBetween
(
column
.
getColumnType
(),
"("
,
")"
),
","
);
if
(
str
!=
null
&&
str
.
length
==
2
&&
Integer
.
parseInt
(
str
[
1
])
>
0
)
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
)
else
if
(
str
!=
null
&&
str
.
length
==
1
&&
Integer
.
parseInt
(
str
[
0
])
<=
10
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment