fangyeqing / xkl-interface · Commits

Go to a project

Authored by zhaoyue
Commit 57b353f7847edaa9672e16a2fcc6e81934b6d86e 2 parents 452cb4ec 708af4da

Merge branch 'zhaoyue-dev4' into 'master' 

Mod get real ip



See merge request !61
Inline Side-by-side
Showing 1 changed file with 6 additions and 1 deletions
@@ -49,7 +49,12 @@ public class CurrentAdminMethodArgumentResolver implements HandlerMethodArgument @@ -49,7 +49,12 @@ public class CurrentAdminMethodArgumentResolver implements HandlerMethodArgument
49 //从数据库中查询并返回 49 //从数据库中查询并返回
50 XklAdminEntity admin = adminRepository.findByIdAndStatus(Long.parseLong(currentAdminId), Constants.STATUS_OK); 50 XklAdminEntity admin = adminRepository.findByIdAndStatus(Long.parseLong(currentAdminId), Constants.STATUS_OK);
51 HttpServletRequest request = ((ServletWebRequest) webRequest).getRequest(); 51 HttpServletRequest request = ((ServletWebRequest) webRequest).getRequest();
52 - String ip = request.getRemoteAddr(); 52 + String ip = null;
  53 + if (request.getHeader("x-forwarded-for") == null) {
  54 + ip = request.getRemoteAddr();
  55 + } else {
  56 + ip = request.getHeader("x-forwarded-for");
  57 + }
53 admin.setIp(ip); 58 admin.setIp(ip);
54 return admin; 59 return admin;
55 } 60 }