diff --git a/src/main/java/com/jsh/util/Tools.java b/src/main/java/com/jsh/util/Tools.java index c37f976e..00826344 100644 --- a/src/main/java/com/jsh/util/Tools.java +++ b/src/main/java/com/jsh/util/Tools.java @@ -1,5 +1,6 @@ package com.jsh.util; +import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.InetAddress; @@ -266,8 +267,9 @@ public class Tools { return str.replace("'", ""); } + /** - * 获取用户IP地址 + * 获取用户IP地址(停用) * @return 用户IP * @see [类、类#方法、类#成员] */ @@ -283,6 +285,36 @@ public class Tools return "127.0.0.1"; } } + + /** + * 从Request对象中获得客户端IP，处理了HTTP代理服务器和Nginx的反向代理截取了ip + * @param request + * @return ip + */ + public static String getLocalIp(HttpServletRequest request) { + String remoteAddr = request.getRemoteAddr(); + String forwarded = request.getHeader("X-Forwarded-For"); + String realIp = request.getHeader("X-Real-IP"); + + String ip = null; + if (realIp == null) { + if (forwarded == null) { + ip = remoteAddr; + } else { + ip = remoteAddr + "/" + forwarded.split(",")[0]; + } + } else { + if (realIp.equals(forwarded)) { + ip = realIp; + } else { + if(forwarded != null){ + forwarded = forwarded.split(",")[0]; + } + ip = realIp + "/" + forwarded; + } + } + return ip; + } /** * 转化前台批量传入的ID值 diff --git a/src/main/webapp/pages/asset/asset.jsp b/src/main/webapp/pages/asset/asset.jsp index fff5574d..21ff00cc 100644 --- a/src/main/webapp/pages/asset/asset.jsp +++ b/src/main/webapp/pages/asset/asset.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/asset/report.jsp b/src/main/webapp/pages/asset/report.jsp index 4ef9031f..7033fe3b 100644 --- a/src/main/webapp/pages/asset/report.jsp +++ b/src/main/webapp/pages/asset/report.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/common/admin.jsp b/src/main/webapp/pages/common/admin.jsp index acf217aa..8f506d0b 100644 --- a/src/main/webapp/pages/common/admin.jsp +++ b/src/main/webapp/pages/common/admin.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/common/head.jsp b/src/main/webapp/pages/common/head.jsp index 7d4d215c..578c7c62 100644 --- a/src/main/webapp/pages/common/head.jsp +++ b/src/main/webapp/pages/common/head.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/common/home.jsp b/src/main/webapp/pages/common/home.jsp index 283ce99d..597bed70 100644 --- a/src/main/webapp/pages/common/home.jsp +++ b/src/main/webapp/pages/common/home.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); String type = request.getParameter("type"); String location = "首页"; if(null != type) diff --git a/src/main/webapp/pages/common/main.jsp b/src/main/webapp/pages/common/main.jsp index 7179f832..2f6b55a4 100644 --- a/src/main/webapp/pages/common/main.jsp +++ b/src/main/webapp/pages/common/main.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/common/templateforjsp.jsp b/src/main/webapp/pages/common/templateforjsp.jsp index a17f253d..de125b8d 100644 --- a/src/main/webapp/pages/common/templateforjsp.jsp +++ b/src/main/webapp/pages/common/templateforjsp.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/financial/advance_in.jsp b/src/main/webapp/pages/financial/advance_in.jsp index abac2eb1..8b2d9691 100644 --- a/src/main/webapp/pages/financial/advance_in.jsp +++ b/src/main/webapp/pages/financial/advance_in.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/financial/giro.jsp b/src/main/webapp/pages/financial/giro.jsp index 4222a3b9..a9aff1ed 100644 --- a/src/main/webapp/pages/financial/giro.jsp +++ b/src/main/webapp/pages/financial/giro.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/financial/item_in.jsp b/src/main/webapp/pages/financial/item_in.jsp index ef51319f..539811de 100644 --- a/src/main/webapp/pages/financial/item_in.jsp +++ b/src/main/webapp/pages/financial/item_in.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/financial/item_out.jsp b/src/main/webapp/pages/financial/item_out.jsp index 511bfd79..33da0a64 100644 --- a/src/main/webapp/pages/financial/item_out.jsp +++ b/src/main/webapp/pages/financial/item_out.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/financial/money_in.jsp b/src/main/webapp/pages/financial/money_in.jsp index 446d089c..0611f646 100644 --- a/src/main/webapp/pages/financial/money_in.jsp +++ b/src/main/webapp/pages/financial/money_in.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/financial/money_out.jsp b/src/main/webapp/pages/financial/money_out.jsp index 19320eb4..8950fb6d 100644 --- a/src/main/webapp/pages/financial/money_out.jsp +++ b/src/main/webapp/pages/financial/money_out.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/account.jsp b/src/main/webapp/pages/manage/account.jsp index 82d3a2e5..d2241a8a 100644 --- a/src/main/webapp/pages/manage/account.jsp +++ b/src/main/webapp/pages/manage/account.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/app.jsp b/src/main/webapp/pages/manage/app.jsp index 2347565f..83ff4657 100644 --- a/src/main/webapp/pages/manage/app.jsp +++ b/src/main/webapp/pages/manage/app.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/assetname.jsp b/src/main/webapp/pages/manage/assetname.jsp index ae0fec60..1191326c 100644 --- a/src/main/webapp/pages/manage/assetname.jsp +++ b/src/main/webapp/pages/manage/assetname.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/category.jsp b/src/main/webapp/pages/manage/category.jsp index bcdada96..94ffa1ee 100644 --- a/src/main/webapp/pages/manage/category.jsp +++ b/src/main/webapp/pages/manage/category.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/customer.jsp b/src/main/webapp/pages/manage/customer.jsp index 6a1c7777..22bbf44d 100644 --- a/src/main/webapp/pages/manage/customer.jsp +++ b/src/main/webapp/pages/manage/customer.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/depot.jsp b/src/main/webapp/pages/manage/depot.jsp index 80c8a9f2..93ca988b 100644 --- a/src/main/webapp/pages/manage/depot.jsp +++ b/src/main/webapp/pages/manage/depot.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/depotGift.jsp b/src/main/webapp/pages/manage/depotGift.jsp index 0fc3a85c..3b2ea261 100644 --- a/src/main/webapp/pages/manage/depotGift.jsp +++ b/src/main/webapp/pages/manage/depotGift.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/functions.jsp b/src/main/webapp/pages/manage/functions.jsp index 7b2d4073..a1863817 100644 --- a/src/main/webapp/pages/manage/functions.jsp +++ b/src/main/webapp/pages/manage/functions.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/inOutItem.jsp b/src/main/webapp/pages/manage/inOutItem.jsp index 1f910b63..9967b568 100644 --- a/src/main/webapp/pages/manage/inOutItem.jsp +++ b/src/main/webapp/pages/manage/inOutItem.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/log.jsp b/src/main/webapp/pages/manage/log.jsp index ce9bea2c..9456e77e 100644 --- a/src/main/webapp/pages/manage/log.jsp +++ b/src/main/webapp/pages/manage/log.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/member.jsp b/src/main/webapp/pages/manage/member.jsp index a9948ff2..ebffb678 100644 --- a/src/main/webapp/pages/manage/member.jsp +++ b/src/main/webapp/pages/manage/member.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/role.jsp b/src/main/webapp/pages/manage/role.jsp index 52cf45b6..5804ef13 100644 --- a/src/main/webapp/pages/manage/role.jsp +++ b/src/main/webapp/pages/manage/role.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/roleApp.jsp b/src/main/webapp/pages/manage/roleApp.jsp index 294bf259..f4914fc9 100644 --- a/src/main/webapp/pages/manage/roleApp.jsp +++ b/src/main/webapp/pages/manage/roleApp.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/roleFunctions.jsp b/src/main/webapp/pages/manage/roleFunctions.jsp index 69182ea4..42714ea3 100644 --- a/src/main/webapp/pages/manage/roleFunctions.jsp +++ b/src/main/webapp/pages/manage/roleFunctions.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/rolePushBtn.jsp b/src/main/webapp/pages/manage/rolePushBtn.jsp index efc4b6fc..5425f015 100644 --- a/src/main/webapp/pages/manage/rolePushBtn.jsp +++ b/src/main/webapp/pages/manage/rolePushBtn.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/unit.jsp b/src/main/webapp/pages/manage/unit.jsp index 7b38ad9c..cc10eea4 100644 --- a/src/main/webapp/pages/manage/unit.jsp +++ b/src/main/webapp/pages/manage/unit.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/user.jsp b/src/main/webapp/pages/manage/user.jsp index b96483e7..5ecbb2f5 100644 --- a/src/main/webapp/pages/manage/user.jsp +++ b/src/main/webapp/pages/manage/user.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/manage/vendor.jsp b/src/main/webapp/pages/manage/vendor.jsp index fdaecafb..55115f67 100644 --- a/src/main/webapp/pages/manage/vendor.jsp +++ b/src/main/webapp/pages/manage/vendor.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/allocation_out_list.jsp b/src/main/webapp/pages/materials/allocation_out_list.jsp index 73c7c6fb..d191b9f5 100644 --- a/src/main/webapp/pages/materials/allocation_out_list.jsp +++ b/src/main/webapp/pages/materials/allocation_out_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/gift_out_list.jsp b/src/main/webapp/pages/materials/gift_out_list.jsp index 70cb7a83..abdc7623 100644 --- a/src/main/webapp/pages/materials/gift_out_list.jsp +++ b/src/main/webapp/pages/materials/gift_out_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/gift_recharge_list.jsp b/src/main/webapp/pages/materials/gift_recharge_list.jsp index eba94171..e61ad91d 100644 --- a/src/main/webapp/pages/materials/gift_recharge_list.jsp +++ b/src/main/webapp/pages/materials/gift_recharge_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/material.jsp b/src/main/webapp/pages/materials/material.jsp index a13316df..2c2203e9 100644 --- a/src/main/webapp/pages/materials/material.jsp +++ b/src/main/webapp/pages/materials/material.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/materialcategory.jsp b/src/main/webapp/pages/materials/materialcategory.jsp index 553d9619..48c88de0 100644 --- a/src/main/webapp/pages/materials/materialcategory.jsp +++ b/src/main/webapp/pages/materials/materialcategory.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/other_in_list.jsp b/src/main/webapp/pages/materials/other_in_list.jsp index 7a6d2ddd..10630e6a 100644 --- a/src/main/webapp/pages/materials/other_in_list.jsp +++ b/src/main/webapp/pages/materials/other_in_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/other_out_list.jsp b/src/main/webapp/pages/materials/other_out_list.jsp index b344f2ec..7782459c 100644 --- a/src/main/webapp/pages/materials/other_out_list.jsp +++ b/src/main/webapp/pages/materials/other_out_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/person.jsp b/src/main/webapp/pages/materials/person.jsp index 825dc4f6..6a499b5f 100644 --- a/src/main/webapp/pages/materials/person.jsp +++ b/src/main/webapp/pages/materials/person.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/purchase_back_list.jsp b/src/main/webapp/pages/materials/purchase_back_list.jsp index 8610a06d..bdb26955 100644 --- a/src/main/webapp/pages/materials/purchase_back_list.jsp +++ b/src/main/webapp/pages/materials/purchase_back_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/purchase_in_list.jsp b/src/main/webapp/pages/materials/purchase_in_list.jsp index 3bff6e69..91559756 100644 --- a/src/main/webapp/pages/materials/purchase_in_list.jsp +++ b/src/main/webapp/pages/materials/purchase_in_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/retail_back_list.jsp b/src/main/webapp/pages/materials/retail_back_list.jsp index 3e3c6943..8f2d1156 100644 --- a/src/main/webapp/pages/materials/retail_back_list.jsp +++ b/src/main/webapp/pages/materials/retail_back_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/retail_out_list.jsp b/src/main/webapp/pages/materials/retail_out_list.jsp index 90c2282e..c47b2493 100644 --- a/src/main/webapp/pages/materials/retail_out_list.jsp +++ b/src/main/webapp/pages/materials/retail_out_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/sale_back_list.jsp b/src/main/webapp/pages/materials/sale_back_list.jsp index 874f2150..4463ecff 100644 --- a/src/main/webapp/pages/materials/sale_back_list.jsp +++ b/src/main/webapp/pages/materials/sale_back_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/materials/sale_out_list.jsp b/src/main/webapp/pages/materials/sale_out_list.jsp index 47073079..814c37ca 100644 --- a/src/main/webapp/pages/materials/sale_out_list.jsp +++ b/src/main/webapp/pages/materials/sale_out_list.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/other/clock.jsp b/src/main/webapp/pages/other/clock.jsp index 3f54cf5a..364e73c4 100644 --- a/src/main/webapp/pages/other/clock.jsp +++ b/src/main/webapp/pages/other/clock.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/other/preview.jsp b/src/main/webapp/pages/other/preview.jsp index 312c9b28..928ed448 100644 --- a/src/main/webapp/pages/other/preview.jsp +++ b/src/main/webapp/pages/other/preview.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/account_report.jsp b/src/main/webapp/pages/reports/account_report.jsp index 907291e5..cfebdeaa 100644 --- a/src/main/webapp/pages/reports/account_report.jsp +++ b/src/main/webapp/pages/reports/account_report.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/buy_in_report.jsp b/src/main/webapp/pages/reports/buy_in_report.jsp index dab00a83..fec19dc9 100644 --- a/src/main/webapp/pages/reports/buy_in_report.jsp +++ b/src/main/webapp/pages/reports/buy_in_report.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/gift_manage_report.jsp b/src/main/webapp/pages/reports/gift_manage_report.jsp index 9721b238..7d206c7c 100644 --- a/src/main/webapp/pages/reports/gift_manage_report.jsp +++ b/src/main/webapp/pages/reports/gift_manage_report.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/in_detail.jsp b/src/main/webapp/pages/reports/in_detail.jsp index 60a15427..b4668bd3 100644 --- a/src/main/webapp/pages/reports/in_detail.jsp +++ b/src/main/webapp/pages/reports/in_detail.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/in_material_count.jsp b/src/main/webapp/pages/reports/in_material_count.jsp index 1ecf981d..5aeb6436 100644 --- a/src/main/webapp/pages/reports/in_material_count.jsp +++ b/src/main/webapp/pages/reports/in_material_count.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/in_out_stock_report.jsp b/src/main/webapp/pages/reports/in_out_stock_report.jsp index bc81f544..f04061ae 100644 --- a/src/main/webapp/pages/reports/in_out_stock_report.jsp +++ b/src/main/webapp/pages/reports/in_out_stock_report.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/out_detail.jsp b/src/main/webapp/pages/reports/out_detail.jsp index 5d66befa..0a1b9e3a 100644 --- a/src/main/webapp/pages/reports/out_detail.jsp +++ b/src/main/webapp/pages/reports/out_detail.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/out_material_count.jsp b/src/main/webapp/pages/reports/out_material_count.jsp index 5e71ae16..f95fbcbc 100644 --- a/src/main/webapp/pages/reports/out_material_count.jsp +++ b/src/main/webapp/pages/reports/out_material_count.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/reports/sale_out_report.jsp b/src/main/webapp/pages/reports/sale_out_report.jsp index ccf31515..a7243985 100644 --- a/src/main/webapp/pages/reports/sale_out_report.jsp +++ b/src/main/webapp/pages/reports/sale_out_report.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/user/password.jsp b/src/main/webapp/pages/user/password.jsp index 689752d3..26640674 100644 --- a/src/main/webapp/pages/user/password.jsp +++ b/src/main/webapp/pages/user/password.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/user/userCustomer.jsp b/src/main/webapp/pages/user/userCustomer.jsp index b3d3d7d2..1bad325b 100644 --- a/src/main/webapp/pages/user/userCustomer.jsp +++ b/src/main/webapp/pages/user/userCustomer.jsp @@ -2,7 +2,7 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <% String path = request.getContextPath(); - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/user/userDepot.jsp b/src/main/webapp/pages/user/userDepot.jsp index f283e579..15cc052a 100644 --- a/src/main/webapp/pages/user/userDepot.jsp +++ b/src/main/webapp/pages/user/userDepot.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/user/userRole.jsp b/src/main/webapp/pages/user/userRole.jsp index 9b71f555..79590e24 100644 --- a/src/main/webapp/pages/user/userRole.jsp +++ b/src/main/webapp/pages/user/userRole.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %> diff --git a/src/main/webapp/pages/user/userinfo.jsp b/src/main/webapp/pages/user/userinfo.jsp index ee6a314f..5fcc22a7 100644 --- a/src/main/webapp/pages/user/userinfo.jsp +++ b/src/main/webapp/pages/user/userinfo.jsp @@ -3,7 +3,7 @@ <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); + String clientIp = Tools.getLocalIp(request); %>