Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
2dedfaff
Commit
2dedfaff
authored
Jul 05, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IPCommon 重命名为 IPAdress
parent
01701847
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
AppPermissionService.java
...aoqi/security/admin/rpc/service/AppPermissionService.java
+6
-5
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @
2dedfaff
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
rpc
.
service
;
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
rpc
.
service
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.github.pagehelper.IPage
;
import
com.github.wxiaoqi.security.admin.biz.AppUserBiz
;
import
com.github.wxiaoqi.security.admin.biz.AppUserBiz
;
import
com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz
;
import
com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz
;
import
com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz
;
import
com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz
;
...
@@ -808,14 +809,14 @@ public class AppPermissionService {
...
@@ -808,14 +809,14 @@ public class AppPermissionService {
*/
*/
public
void
setCreateIPInfo
(
AppUserLogin
appUserLogin
){
public
void
setCreateIPInfo
(
AppUserLogin
appUserLogin
){
String
crtHost
=
appUserLogin
.
getCrtHost
();
String
crtHost
=
appUserLogin
.
getCrtHost
();
String
ipinfo
=
restTemplate
.
getForObject
(
String
.
format
(
"%s%s"
,
IP
Common
.
BASE_IP_PARSING_URL
,
crtHost
),
String
.
class
);
String
ipinfo
=
restTemplate
.
getForObject
(
String
.
format
(
"%s%s"
,
IP
Address
.
BASE_IP_PARSING_URL
,
crtHost
),
String
.
class
);
String
base_data
=
JSONObject
.
parseObject
(
ipinfo
).
getString
(
IP
Common
.
BASE_DATA
);
String
base_data
=
JSONObject
.
parseObject
(
ipinfo
).
getString
(
IP
Address
.
BASE_DATA
);
JSONObject
ipJsonObject
=
JSONObject
.
parseObject
(
base_data
);
JSONObject
ipJsonObject
=
JSONObject
.
parseObject
(
base_data
);
// Integer provinceCode = ipJsonObject.getInteger(IPCommon.PROVINCE_CODE);
// Integer provinceCode = ipJsonObject.getInteger(IPCommon.PROVINCE_CODE);
// Integer cityCode = ipJsonObject.getInteger(IPCommon.CITY_CODE);
// Integer cityCode = ipJsonObject.getInteger(IPCommon.CITY_CODE);
//appUserLogin.setProvinceCode(provinceCode);
//appUserLogin.setProvinceCode(provinceCode);
//appUserLogin.setCityCode(cityCode);
//appUserLogin.setCityCode(cityCode);
String
cityName
=
ipJsonObject
.
getString
(
IP
Common
.
CITY_NAME
);
String
cityName
=
ipJsonObject
.
getString
(
IP
Address
.
CITY_NAME
);
RegionDTO
regionDTO
=
regionFeign
.
getRegionByCityName
(
cityName
);
RegionDTO
regionDTO
=
regionFeign
.
getRegionByCityName
(
cityName
);
if
(
null
!=
regionDTO
){
if
(
null
!=
regionDTO
){
appUserLogin
.
setProvinceCode
(
Integer
.
valueOf
(
String
.
valueOf
(
regionDTO
.
getParentId
())));
appUserLogin
.
setProvinceCode
(
Integer
.
valueOf
(
String
.
valueOf
(
regionDTO
.
getParentId
())));
...
@@ -826,9 +827,9 @@ public class AppPermissionService {
...
@@ -826,9 +827,9 @@ public class AppPermissionService {
/**
/**
* @author libin
* @author libin
* @version 1.0.0
* @version 1.0.0
* @dec ip
返回字段名常量
* @dec ip
解析返回的地址信息
*/
*/
static
class
IP
Common
{
static
class
IP
Address
{
public
static
final
String
BASE_IP_PARSING_URL
=
"http://ip.taobao.com/service/getIpInfo.php?ip="
;
public
static
final
String
BASE_IP_PARSING_URL
=
"http://ip.taobao.com/service/getIpInfo.php?ip="
;
public
static
final
String
BASE_DATA
=
"data"
;
public
static
final
String
BASE_DATA
=
"data"
;
public
static
final
String
PROVINCE_CODE
=
"region_id"
;
public
static
final
String
PROVINCE_CODE
=
"region_id"
;
...
...
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