lyhzzz 2 месяцев назад
Родитель
Сommit
d2ebac5ccd

+ 1 - 0
src/main/java/com/fdkankan/ucenter/controller/ContactUsController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.ucenter.controller;
 
 
+import cn.hutool.extra.servlet.ServletUtil;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.RequestBase;
 import com.fdkankan.ucenter.common.Result;

+ 3 - 22
src/main/java/com/fdkankan/ucenter/geo/IPUtils.java

@@ -1,5 +1,7 @@
 package com.fdkankan.ucenter.geo;
 
+import cn.hutool.extra.servlet.ServletUtil;
+
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,28 +39,7 @@ public class IPUtils {
     }
 
     public static String getIpAddr(HttpServletRequest request) {
-        String ipAddress = null;
-        ipAddress = request.getHeader("x-forwarded-for");
-        if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-            ipAddress = request.getHeader("Proxy-Client-IP");
-        }
-        if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-            ipAddress = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-            ipAddress = request.getRemoteAddr();
-        }
-
-// 对于通过多个代理的情况,第一个IP为客户端真实IP,多个IP按照','分割
-        if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
-            // = 15
-            if (ipAddress.indexOf(",") > 0) {
-                ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
-            }
-        }
-        // 或者这样也行,对于通过多个代理的情况,第一个IP为客户端真实IP,多个IP按照','分割
-//return ipAddress!=null&&!"".equals(ipAddress)?ipAddress.split(",")[0]:null;
-        return ipAddress;
+        return ServletUtil.getClientIP(request);
     }
 
 }

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/ContactUsServiceImpl.java

@@ -81,8 +81,8 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
         }
         contactUs.setCountry(IPUtils.getCountry(contactUs.getIpAddress()));
         this.save(contactUs);
-        redisUtil.set(redisKey, uuid,15 * 60);
-        redisUtil.set(redisKey2, JSONObject.toJSONString(contactUs),15 * 60);
+        redisUtil.set(redisKey, uuid,7* 24 * 60 * 60);
+        redisUtil.set(redisKey2, JSONObject.toJSONString(contactUs),7* 24 * 60 * 60);
     }
 
     @Override