Commit b430966d by yangyang

日志提交(西藏)

parent fd74e490
...@@ -51,4 +51,39 @@ public class NetworkUtil { ...@@ -51,4 +51,39 @@ public class NetworkUtil {
} }
return ipAddress; 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;
}
} }
...@@ -198,7 +198,7 @@ public class CodeYymcController { ...@@ -198,7 +198,7 @@ public class CodeYymcController {
sysYhczrz.setYhdwGajgjgdm(user.getUnitcode()); sysYhczrz.setYhdwGajgjgdm(user.getUnitcode());
sysYhczrz.setYhdwGajgmc(user.getUnitname()); sysYhczrz.setYhdwGajgmc(user.getUnitname());
sysYhczrz.setYhXm(user.getTrueName()); sysYhczrz.setYhXm(user.getTrueName());
sysYhczrz.setYhIp(NetworkUtil.getIpAddr(request));// IP使用真实ip sysYhczrz.setYhIp(NetworkUtil.getRealIp(request));// IP使用真实ip
sysYhczrz.setYymcJyqk(skCodeYymc.getName()); sysYhczrz.setYymcJyqk(skCodeYymc.getName());
sysYhczrz.setYymcdm(logcode); sysYhczrz.setYymcdm(logcode);
sysYhczrz.setCzlxdm(skCodeYymc.getCzlxdm()); sysYhczrz.setCzlxdm(skCodeYymc.getCzlxdm());
......
...@@ -75,7 +75,7 @@ public class SysUserController extends ApiController { ...@@ -75,7 +75,7 @@ public class SysUserController extends ApiController {
return MapRestResult.build(500, "账号、密码不正确", null); return MapRestResult.build(500, "账号、密码不正确", null);
} }
// 拿到真实ip // 拿到真实ip
one.setIp(NetworkUtil.getIpAddr(request)); one.setIp(NetworkUtil.getRealIp(request));
JwtUser util = new JwtUser(); JwtUser util = new JwtUser();
//密码加密与刑专一致 //密码加密与刑专一致
Token tokenEntity=new Token(one,DigestUtil.encrypt(password)); Token tokenEntity=new Token(one,DigestUtil.encrypt(password));
...@@ -117,7 +117,7 @@ public class SysUserController extends ApiController { ...@@ -117,7 +117,7 @@ public class SysUserController extends ApiController {
return MapRestResult.build(500, "该用户不存在", null); return MapRestResult.build(500, "该用户不存在", null);
} }
// 拿到真实ip // 拿到真实ip
one.setIp(NetworkUtil.getIpAddr(request)); one.setIp(NetworkUtil.getRealIp(request));
JwtUser util = new JwtUser(); JwtUser util = new JwtUser();
String ip = request.getRemoteAddr(); String ip = request.getRemoteAddr();
Token tokenEntity=new Token(one,one.getPassword()); Token tokenEntity=new Token(one,one.getPassword());
......
...@@ -190,10 +190,10 @@ public class TokenInterceptor implements HandlerInterceptor { ...@@ -190,10 +190,10 @@ public class TokenInterceptor implements HandlerInterceptor {
/** /**
* 校验第三方token * 校验第三方token
*/ */
public String verifyToken(HttpServletRequest request,ThirdToken token) { public String verifyToken(HttpServletRequest request,ThirdToken token) {
String str = ""; String str = "";
// ip验证 // ip验证
if(!token.getIp().contains(NetworkUtil.getIpAddr(request))){ if(!token.getIp().contains(NetworkUtil.getRealIp(request))){
return "ip限制!"; return "ip限制!";
} }
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
...@@ -256,7 +256,7 @@ public class TokenInterceptor implements HandlerInterceptor { ...@@ -256,7 +256,7 @@ public class TokenInterceptor implements HandlerInterceptor {
sysYhczrz.setYhdwGajgjgdm(user.getUnitcode()); sysYhczrz.setYhdwGajgjgdm(user.getUnitcode());
sysYhczrz.setYhdwGajgmc(user.getUnitname()); sysYhczrz.setYhdwGajgmc(user.getUnitname());
sysYhczrz.setYhXm(user.getTrueName()); sysYhczrz.setYhXm(user.getTrueName());
sysYhczrz.setYhIp(NetworkUtil.getIpAddr(request));// IP使用真实ip sysYhczrz.setYhIp(NetworkUtil.getRealIp(request));// IP使用真实ip
sysYhczrz.setYymcJyqk(skCodeYymc.getName()); sysYhczrz.setYymcJyqk(skCodeYymc.getName());
sysYhczrz.setYymcdm(logcode); sysYhczrz.setYymcdm(logcode);
sysYhczrz.setCzlxdm(skCodeYymc.getCzlxdm()); sysYhczrz.setCzlxdm(skCodeYymc.getCzlxdm());
......
...@@ -172,8 +172,8 @@ public class SysLogAspect { ...@@ -172,8 +172,8 @@ public class SysLogAspect {
toString()); toString());
LOG.info("HTTP_METHOD : " + request.getMethod()); LOG.info("HTTP_METHOD : " + request.getMethod());
LOG.info("IP : " + NetworkUtil.getIpAddr(request)); LOG.info("IP : " + NetworkUtil.getRealIp(request));
sysLog.setIp(NetworkUtil.getIpAddr(request)); sysLog.setIp(NetworkUtil.getRealIp(request));
//开始调用时间 //开始调用时间
// 计时并调用目标函数 // 计时并调用目标函数
......
...@@ -761,7 +761,7 @@ public class KshSlServiceController { ...@@ -761,7 +761,7 @@ public class KshSlServiceController {
SysUser sysUser = (SysUser) request.getAttribute("user"); SysUser sysUser = (SysUser) request.getAttribute("user");
String trueName = sysUser.getTrueName();// 请求人姓名 String trueName = sysUser.getTrueName();// 请求人姓名
String identitycard = sysUser.getIdentitycard();// 请求人证件 String identitycard = sysUser.getIdentitycard();// 请求人证件
String ipAddr = NetworkUtil.getIpAddr(request);// 请求人ip String ipAddr = NetworkUtil.getRealIp(request);// 请求人ip
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
// System.out.println("token=========" + NmTokenUtils.getToken()); // System.out.println("token=========" + NmTokenUtils.getToken());
System.out.println("请求人姓名=========" + trueName); System.out.println("请求人姓名=========" + trueName);
...@@ -1199,7 +1199,7 @@ public class KshSlServiceController { ...@@ -1199,7 +1199,7 @@ public class KshSlServiceController {
map.put("zjhm", zjhm);//证件号码(身份证号或护照号) map.put("zjhm", zjhm);//证件号码(身份证号或护照号)
map.put("qqyhm", sysUser.getTrueName()); map.put("qqyhm", sysUser.getTrueName());
map.put("qqrsfzh", sysUser.getIdentitycard()); map.put("qqrsfzh", sysUser.getIdentitycard());
map.put("qqip", NetworkUtil.getIpAddr(request)); map.put("qqip", NetworkUtil.getRealIp(request));
String s = null; String s = null;
try { try {
...@@ -1241,7 +1241,7 @@ public class KshSlServiceController { ...@@ -1241,7 +1241,7 @@ public class KshSlServiceController {
map.put("type", "01"); map.put("type", "01");
map.put("qqyhm", sysUser.getTrueName()); map.put("qqyhm", sysUser.getTrueName());
map.put("qqrsfzh", sysUser.getIdentitycard()); map.put("qqrsfzh", sysUser.getIdentitycard());
map.put("qqip", NetworkUtil.getIpAddr(request)); map.put("qqip", NetworkUtil.getRealIp(request));
String s = null; String s = null;
try { try {
...@@ -1272,7 +1272,7 @@ public class KshSlServiceController { ...@@ -1272,7 +1272,7 @@ public class KshSlServiceController {
map.put("type", "03"); map.put("type", "03");
map.put("qqyhm", sysUser.getTrueName()); map.put("qqyhm", sysUser.getTrueName());
map.put("qqrsfzh", sysUser.getIdentitycard()); map.put("qqrsfzh", sysUser.getIdentitycard());
map.put("qqip", NetworkUtil.getIpAddr(request)); map.put("qqip", NetworkUtil.getRealIp(request));
String s = null; String s = null;
try { try {
...@@ -1303,7 +1303,7 @@ public class KshSlServiceController { ...@@ -1303,7 +1303,7 @@ public class KshSlServiceController {
map.put("zjhm", zjhm);//证件号码(身份证号或护照号) map.put("zjhm", zjhm);//证件号码(身份证号或护照号)
map.put("qqyhm", sysUser.getTrueName()); map.put("qqyhm", sysUser.getTrueName());
map.put("qqrsfzh", sysUser.getIdentitycard()); map.put("qqrsfzh", sysUser.getIdentitycard());
map.put("qqip", NetworkUtil.getIpAddr(request)); map.put("qqip", NetworkUtil.getRealIp(request));
try { try {
String s = ""; String s = "";
JSONObject object = JSONObject.parseObject(s); JSONObject object = JSONObject.parseObject(s);
......
...@@ -83,7 +83,7 @@ public class NmDataUtil { ...@@ -83,7 +83,7 @@ public class NmDataUtil {
SysUser sysUser = (SysUser)request.getAttribute("user"); SysUser sysUser = (SysUser)request.getAttribute("user");
pairsData.add(new BasicNameValuePair("qqyhm", sysUser.getTrueName()));// 请求人姓名 pairsData.add(new BasicNameValuePair("qqyhm", sysUser.getTrueName()));// 请求人姓名
pairsData.add(new BasicNameValuePair("qqrsfzh", sysUser.getIdentitycard()));// 请求人证件 pairsData.add(new BasicNameValuePair("qqrsfzh", sysUser.getIdentitycard()));// 请求人证件
pairsData.add(new BasicNameValuePair("qqip", NetworkUtil.getIpAddr(request)));// 请求人ip pairsData.add(new BasicNameValuePair("qqip", NetworkUtil.getRealIp(request)));// 请求人ip
CloseableHttpResponse response = null; CloseableHttpResponse response = null;
String resultString = ""; String resultString = "";
// token获取 // token获取
......
...@@ -47,7 +47,7 @@ public class RyxxQgInterface { ...@@ -47,7 +47,7 @@ public class RyxxQgInterface {
map.put("qqrGmsfzh",user.getIdentitycard()); map.put("qqrGmsfzh",user.getIdentitycard());
map.put("qqrJgmc",user.getUnitname()); map.put("qqrJgmc",user.getUnitname());
map.put("qqrJgdm",user.getUnitcode()); map.put("qqrJgdm",user.getUnitcode());
map.put("qqrIp", NetworkUtil.getIpAddr(request)); map.put("qqrIp", NetworkUtil.getRealIp(request));
String resultStr=""; String resultStr="";
try { try {
System.out.println("常口调用开始==============="+zjhm); System.out.println("常口调用开始==============="+zjhm);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment