Merge branch 'feature/realIp' into 'master'

feat: [1004857] 运营需求：指定书刊指定地区扫码后推送不同内容

See merge request rays/pcloud-book!1318

pcloud-service-book/src/main/java/com/pcloud/book/record/facade/BookBrowseRecordFacade.java

@@ -4,7 +4,6 @@ import com.pcloud.book.book.constant.BookConstant;
 import com.pcloud.book.record.biz.BookBrowseRecordBiz;
 import com.pcloud.book.record.entity.AreaStatistics;
 import com.pcloud.book.record.entity.BookDetail;
-import com.pcloud.book.record.entity.BookDetailDTO;
 import com.pcloud.book.record.entity.BookMapStatistics;
 import com.pcloud.book.record.entity.MapData;
 import com.pcloud.book.record.entity.RegionMap;
@@ -14,13 +13,9 @@ import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
-import com.pcloud.erp.project.dto.BookDTO;
+import com.pcloud.common.utils.nginx.NginxUtils;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +23,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * @ClassName com.pcloud.book.record.facade.BookBrowseRecordFacade
  * @Author 吴博
@@ -41,6 +41,8 @@ public class BookBrowseRecordFacade {
 
     @Autowired
     private BookBrowseRecordBiz bookBrowseRecordBiz;
+    @Autowired
+    private HttpServletRequest httpServletRequest;
 
     @GetMapping("getBookCount")
     public ResponseDto<List<BookMapStatistics>> getBookCount4Country(@RequestHeader("token") String token,
@@ -120,4 +122,9 @@ public class BookBrowseRecordFacade {
         return new ResponseDto<>();
     }
 
+    @ApiOperation(value = "根据用户IP获取用户信息", httpMethod = "GET")
+    @GetMapping("/getCustomerLocation4Ip")
+    ResponseDto<?> getCustomerLocation4Ip() {
+        return new ResponseDto<>(bookBrowseRecordBiz.getCityByIP(NginxUtils.getClientIp(httpServletRequest)));
+    }
 }
\ No newline at end of file