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
46a16952
Commit
46a16952
authored
Feb 23, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复地址开关无效问题
parent
b7107a4d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
...src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+13
-9
No files found.
ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
View file @
46a16952
...
@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory;
...
@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.http.HttpUtils
;
import
com.ruoyi.common.utils.http.HttpUtils
;
import
com.ruoyi.framework.config.RuoYiConfig
;
/**
/**
* 获取地址类
* 获取地址类
...
@@ -25,6 +26,8 @@ public class AddressUtils
...
@@ -25,6 +26,8 @@ public class AddressUtils
{
{
return
"内网IP"
;
return
"内网IP"
;
}
}
if
(
RuoYiConfig
.
isAddressEnabled
())
{
String
rspStr
=
HttpUtils
.
sendPost
(
IP_URL
,
"ip="
+
ip
);
String
rspStr
=
HttpUtils
.
sendPost
(
IP_URL
,
"ip="
+
ip
);
if
(
StringUtils
.
isEmpty
(
rspStr
))
if
(
StringUtils
.
isEmpty
(
rspStr
))
{
{
...
@@ -36,6 +39,7 @@ public class AddressUtils
...
@@ -36,6 +39,7 @@ public class AddressUtils
String
region
=
data
.
getString
(
"region"
);
String
region
=
data
.
getString
(
"region"
);
String
city
=
data
.
getString
(
"city"
);
String
city
=
data
.
getString
(
"city"
);
address
=
region
+
" "
+
city
;
address
=
region
+
" "
+
city
;
}
return
address
;
return
address
;
}
}
}
}
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