Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
Details
Activity
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
常超
map-parent
Commits
b430966d
Commit
b430966d
authored
Jun 05, 2024
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日志提交(西藏)
parent
fd74e490
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
49 additions
and
14 deletions
+49
-14
common/common_utils/src/main/java/com/founder/commonutils/util/NetworkUtil.java
+35
-0
common/service_base/src/main/java/com/founder/servicebase/controller/CodeYymcController.java
+1
-1
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
+2
-2
common/service_base/src/main/java/com/founder/servicebase/interceptor/TokenInterceptor.java
+2
-2
common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java
+2
-2
service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java
+5
-5
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/NmDataUtil.java
+1
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/RyxxQgInterface.java
+1
-1
No files found.
common/common_utils/src/main/java/com/founder/commonutils/util/NetworkUtil.java
View file @
b430966d
...
...
@@ -51,4 +51,39 @@ public class NetworkUtil {
}
return
ipAddress
;
}
public
static
String
getRealIp
(
HttpServletRequest
request
)
{
String
ip
=
request
.
getHeader
(
"X-Forwarded-For"
);
if
(
ip
==
null
||
ip
.
length
()
==
0
||
"unknown"
.
equalsIgnoreCase
(
ip
))
{
ip
=
request
.
getHeader
(
"Proxy-Client-IP"
);
}
if
(
ip
==
null
||
ip
.
length
()
==
0
||
"unknown"
.
equalsIgnoreCase
(
ip
))
{
ip
=
request
.
getHeader
(
"WL-Proxy-Client-IP"
);
}
if
(
ip
==
null
||
ip
.
length
()
==
0
||
"unknown"
.
equalsIgnoreCase
(
ip
))
{
ip
=
request
.
getHeader
(
"HTTP_CLIENT_IP"
);
}
if
(
ip
==
null
||
ip
.
length
()
==
0
||
"unknown"
.
equalsIgnoreCase
(
ip
))
{
ip
=
request
.
getHeader
(
"HTTP_X_FORWARDED_FOR"
);
}
if
(
ip
==
null
||
ip
.
length
()
==
0
||
"unknown"
.
equalsIgnoreCase
(
ip
))
{
ip
=
request
.
getHeader
(
"X-Real-IP"
);
}
if
(
ip
==
null
||
ip
.
length
()
==
0
||
"unknown"
.
equalsIgnoreCase
(
ip
))
{
ip
=
request
.
getRemoteAddr
();
}
//有些网络通过多层代理,那么获取到的ip就会有多个,一般都是通过逗号(,)分割开来,并且第一个ip为客户端的真实IP
if
(
ip
!=
null
&&
ip
.
length
()
!=
0
)
{
ip
=
ip
.
split
(
","
)[
0
];
}
if
(
"127.0.0.1"
.
equals
(
ip
)
||
ip
==
"127.0.0.1"
||
"0:0:0:0:0:0:0:1"
.
equals
(
ip
)
||
ip
==
"0:0:0:0:0:0:0:1"
)
{
try
{
ip
=
InetAddress
.
getLocalHost
().
getHostAddress
();
}
catch
(
UnknownHostException
e
)
{
e
.
printStackTrace
();
}
}
return
ip
;
}
}
common/service_base/src/main/java/com/founder/servicebase/controller/CodeYymcController.java
View file @
b430966d
...
...
@@ -198,7 +198,7 @@ public class CodeYymcController {
sysYhczrz
.
setYhdwGajgjgdm
(
user
.
getUnitcode
());
sysYhczrz
.
setYhdwGajgmc
(
user
.
getUnitname
());
sysYhczrz
.
setYhXm
(
user
.
getTrueName
());
sysYhczrz
.
setYhIp
(
NetworkUtil
.
get
IpAddr
(
request
));
// IP使用真实ip
sysYhczrz
.
setYhIp
(
NetworkUtil
.
get
RealIp
(
request
));
// IP使用真实ip
sysYhczrz
.
setYymcJyqk
(
skCodeYymc
.
getName
());
sysYhczrz
.
setYymcdm
(
logcode
);
sysYhczrz
.
setCzlxdm
(
skCodeYymc
.
getCzlxdm
());
...
...
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
View file @
b430966d
...
...
@@ -75,7 +75,7 @@ public class SysUserController extends ApiController {
return
MapRestResult
.
build
(
500
,
"账号、密码不正确"
,
null
);
}
// 拿到真实ip
one
.
setIp
(
NetworkUtil
.
get
IpAddr
(
request
));
one
.
setIp
(
NetworkUtil
.
get
RealIp
(
request
));
JwtUser
util
=
new
JwtUser
();
//密码加密与刑专一致
Token
tokenEntity
=
new
Token
(
one
,
DigestUtil
.
encrypt
(
password
));
...
...
@@ -117,7 +117,7 @@ public class SysUserController extends ApiController {
return
MapRestResult
.
build
(
500
,
"该用户不存在"
,
null
);
}
// 拿到真实ip
one
.
setIp
(
NetworkUtil
.
get
IpAddr
(
request
));
one
.
setIp
(
NetworkUtil
.
get
RealIp
(
request
));
JwtUser
util
=
new
JwtUser
();
String
ip
=
request
.
getRemoteAddr
();
Token
tokenEntity
=
new
Token
(
one
,
one
.
getPassword
());
...
...
common/service_base/src/main/java/com/founder/servicebase/interceptor/TokenInterceptor.java
View file @
b430966d
...
...
@@ -193,7 +193,7 @@ public class TokenInterceptor implements HandlerInterceptor {
public
String
verifyToken
(
HttpServletRequest
request
,
ThirdToken
token
)
{
String
str
=
""
;
// ip验证
if
(!
token
.
getIp
().
contains
(
NetworkUtil
.
get
IpAddr
(
request
))){
if
(!
token
.
getIp
().
contains
(
NetworkUtil
.
get
RealIp
(
request
))){
return
"ip限制!"
;
}
QueryWrapper
queryWrapper
=
new
QueryWrapper
();
...
...
@@ -256,7 +256,7 @@ public class TokenInterceptor implements HandlerInterceptor {
sysYhczrz
.
setYhdwGajgjgdm
(
user
.
getUnitcode
());
sysYhczrz
.
setYhdwGajgmc
(
user
.
getUnitname
());
sysYhczrz
.
setYhXm
(
user
.
getTrueName
());
sysYhczrz
.
setYhIp
(
NetworkUtil
.
get
IpAddr
(
request
));
// IP使用真实ip
sysYhczrz
.
setYhIp
(
NetworkUtil
.
get
RealIp
(
request
));
// IP使用真实ip
sysYhczrz
.
setYymcJyqk
(
skCodeYymc
.
getName
());
sysYhczrz
.
setYymcdm
(
logcode
);
sysYhczrz
.
setCzlxdm
(
skCodeYymc
.
getCzlxdm
());
...
...
common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java
View file @
b430966d
...
...
@@ -172,8 +172,8 @@ public class SysLogAspect {
toString
());
LOG
.
info
(
"HTTP_METHOD : "
+
request
.
getMethod
());
LOG
.
info
(
"IP : "
+
NetworkUtil
.
get
IpAddr
(
request
));
sysLog
.
setIp
(
NetworkUtil
.
get
IpAddr
(
request
));
LOG
.
info
(
"IP : "
+
NetworkUtil
.
get
RealIp
(
request
));
sysLog
.
setIp
(
NetworkUtil
.
get
RealIp
(
request
));
//开始调用时间
// 计时并调用目标函数
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java
View file @
b430966d
...
...
@@ -761,7 +761,7 @@ public class KshSlServiceController {
SysUser
sysUser
=
(
SysUser
)
request
.
getAttribute
(
"user"
);
String
trueName
=
sysUser
.
getTrueName
();
// 请求人姓名
String
identitycard
=
sysUser
.
getIdentitycard
();
// 请求人证件
String
ipAddr
=
NetworkUtil
.
get
IpAddr
(
request
);
// 请求人ip
String
ipAddr
=
NetworkUtil
.
get
RealIp
(
request
);
// 请求人ip
Map
<
String
,
String
>
map
=
new
HashMap
<>();
// System.out.println("token=========" + NmTokenUtils.getToken());
System
.
out
.
println
(
"请求人姓名========="
+
trueName
);
...
...
@@ -1199,7 +1199,7 @@ public class KshSlServiceController {
map
.
put
(
"zjhm"
,
zjhm
);
//证件号码(身份证号或护照号)
map
.
put
(
"qqyhm"
,
sysUser
.
getTrueName
());
map
.
put
(
"qqrsfzh"
,
sysUser
.
getIdentitycard
());
map
.
put
(
"qqip"
,
NetworkUtil
.
get
IpAddr
(
request
));
map
.
put
(
"qqip"
,
NetworkUtil
.
get
RealIp
(
request
));
String
s
=
null
;
try
{
...
...
@@ -1241,7 +1241,7 @@ public class KshSlServiceController {
map
.
put
(
"type"
,
"01"
);
map
.
put
(
"qqyhm"
,
sysUser
.
getTrueName
());
map
.
put
(
"qqrsfzh"
,
sysUser
.
getIdentitycard
());
map
.
put
(
"qqip"
,
NetworkUtil
.
get
IpAddr
(
request
));
map
.
put
(
"qqip"
,
NetworkUtil
.
get
RealIp
(
request
));
String
s
=
null
;
try
{
...
...
@@ -1272,7 +1272,7 @@ public class KshSlServiceController {
map
.
put
(
"type"
,
"03"
);
map
.
put
(
"qqyhm"
,
sysUser
.
getTrueName
());
map
.
put
(
"qqrsfzh"
,
sysUser
.
getIdentitycard
());
map
.
put
(
"qqip"
,
NetworkUtil
.
get
IpAddr
(
request
));
map
.
put
(
"qqip"
,
NetworkUtil
.
get
RealIp
(
request
));
String
s
=
null
;
try
{
...
...
@@ -1303,7 +1303,7 @@ public class KshSlServiceController {
map
.
put
(
"zjhm"
,
zjhm
);
//证件号码(身份证号或护照号)
map
.
put
(
"qqyhm"
,
sysUser
.
getTrueName
());
map
.
put
(
"qqrsfzh"
,
sysUser
.
getIdentitycard
());
map
.
put
(
"qqip"
,
NetworkUtil
.
get
IpAddr
(
request
));
map
.
put
(
"qqip"
,
NetworkUtil
.
get
RealIp
(
request
));
try
{
String
s
=
""
;
JSONObject
object
=
JSONObject
.
parseObject
(
s
);
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/NmDataUtil.java
View file @
b430966d
...
...
@@ -83,7 +83,7 @@ public class NmDataUtil {
SysUser
sysUser
=
(
SysUser
)
request
.
getAttribute
(
"user"
);
pairsData
.
add
(
new
BasicNameValuePair
(
"qqyhm"
,
sysUser
.
getTrueName
()));
// 请求人姓名
pairsData
.
add
(
new
BasicNameValuePair
(
"qqrsfzh"
,
sysUser
.
getIdentitycard
()));
// 请求人证件
pairsData
.
add
(
new
BasicNameValuePair
(
"qqip"
,
NetworkUtil
.
get
IpAddr
(
request
)));
// 请求人ip
pairsData
.
add
(
new
BasicNameValuePair
(
"qqip"
,
NetworkUtil
.
get
RealIp
(
request
)));
// 请求人ip
CloseableHttpResponse
response
=
null
;
String
resultString
=
""
;
// token获取
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/RyxxQgInterface.java
View file @
b430966d
...
...
@@ -47,7 +47,7 @@ public class RyxxQgInterface {
map
.
put
(
"qqrGmsfzh"
,
user
.
getIdentitycard
());
map
.
put
(
"qqrJgmc"
,
user
.
getUnitname
());
map
.
put
(
"qqrJgdm"
,
user
.
getUnitcode
());
map
.
put
(
"qqrIp"
,
NetworkUtil
.
get
IpAddr
(
request
));
map
.
put
(
"qqrIp"
,
NetworkUtil
.
get
RealIp
(
request
));
String
resultStr
=
""
;
try
{
System
.
out
.
println
(
"常口调用开始==============="
+
zjhm
);
...
...
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