|
@@ -1,10 +1,12 @@
|
|
package com.fdkankan.manage.service.impl;
|
|
package com.fdkankan.manage.service.impl;
|
|
|
|
|
|
|
|
+import cn.hutool.core.net.Ipv4Util;
|
|
import cn.hutool.extra.servlet.ServletUtil;
|
|
import cn.hutool.extra.servlet.ServletUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
+import com.fdkankan.manage.common.IpUtils;
|
|
import com.fdkankan.manage.common.PageInfo;
|
|
import com.fdkankan.manage.common.PageInfo;
|
|
import com.fdkankan.manage.common.RedisKeyUtil;
|
|
import com.fdkankan.manage.common.RedisKeyUtil;
|
|
import com.fdkankan.manage.common.ResultCode;
|
|
import com.fdkankan.manage.common.ResultCode;
|
|
@@ -24,6 +26,7 @@ import com.fdkankan.redis.util.RedisUtil;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import sun.net.util.IPAddressUtil;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
@@ -141,7 +144,7 @@ public class FeedbackServiceImpl extends ServiceImpl<IFeedbackMapper, Feedback>
|
|
@Override
|
|
@Override
|
|
public Object getDefaultAddress(HttpServletRequest request) {
|
|
public Object getDefaultAddress(HttpServletRequest request) {
|
|
//获取ip地址
|
|
//获取ip地址
|
|
- String clientIP = request.getRemoteAddr();
|
|
|
|
|
|
+ String clientIP = IpUtils.getIpAddr(request);
|
|
if(StringUtils.isBlank(clientIP)){
|
|
if(StringUtils.isBlank(clientIP)){
|
|
return new IpAddressVo();
|
|
return new IpAddressVo();
|
|
}
|
|
}
|