From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java
index ed3cd19..0b25a1a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java
@@ -6,15 +6,11 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-
 import javax.servlet.http.HttpServletRequest;
 
-
 import com.alibaba.fastjson.JSONObject;
+
 import lombok.extern.slf4j.Slf4j;
-
-
-
 
 /**
  * @ClassName: IPUtil
@@ -28,91 +24,94 @@
 @Slf4j
 public class IPUtil {
 
-
-
     /**
      *
      * 描述:获取IP地址
+     * 
      * @author huaping hu
      * @date 2016年6月1日下午5:25:44
      * @param request
      * @return
      */
-    public static String getIpAddress(HttpServletRequest request){
+    public static String getIpAddress(HttpServletRequest request) {
 
         String ip = request.getHeader("x-forwarded-for");
 
-        if(ip == null || ip.length() ==0 || "nuknown".equalsIgnoreCase(ip)){
+        if (ip == null || ip.length() == 0 || "nuknown".equalsIgnoreCase(ip)) {
 
             ip = request.getHeader("Proxy-Client-IP");
         }
-        if(ip == null || ip.length() ==0 || "nuknown".equalsIgnoreCase(ip)){
+        if (ip == null || ip.length() == 0 || "nuknown".equalsIgnoreCase(ip)) {
 
             ip = request.getHeader("WL-Proxy-Client-IP");
         }
-        if(ip == null || ip.length() ==0 || "nuknown".equalsIgnoreCase(ip)){
+        if (ip == null || ip.length() == 0 || "nuknown".equalsIgnoreCase(ip)) {
 
             ip = request.getRemoteAddr();
         }
         return ip;
     }
 
-
     /**
      *
      * 描述:获取IP+[IP所属地址]
+     * 
      * @author huaping hu
      * @date 2016年6月1日下午6:01:09
      * @param request
      * @return
      */
-    public static String getIpBelongAddress(HttpServletRequest request){
+    public static String getIpBelongAddress(HttpServletRequest request) {
 
         String ip = getIpAddress(request);
         String belongIp = getIPbelongAddress(ip);
 
         return ip + belongIp;
     }
+
     /**
      *
      * 描述:获取IP所属地址
+     * 
      * @author huaping hu
      * @date 2016年6月1日下午5:59:43
      * @param ip
      * @return
      */
-    public static String getIPbelongAddress(String ip){
+    public static String getIPbelongAddress(String ip) {
 
         String ipAddress = "[]";
-        try{
-//淘宝提供的服务地址
-            String context = call("http://ip.taobao.com/service/getIpInfo.php?ip="+ip);
+        try {
+            // 淘宝提供的服务地址
+            String context = call("http://ip.taobao.com/service/getIpInfo.php?ip=" + ip);
             JSONObject fromObject = JSONObject.parseObject(context);
             String code = fromObject.getString("code");
-            if(code.equals("0")){
+            if (code.equals("0")) {
                 JSONObject jsonObject = fromObject.getJSONObject("data");
-                ipAddress =  "["+jsonObject.get("country")+"/" +jsonObject.get("city")+"]";
+                ipAddress = "[" + jsonObject.get("country") + "/" + jsonObject.get("city") + "]";
             }
-        }catch(Exception e){
+        } catch (Exception e) {
             log.error("获取IP所属地址出错");
-            //e.printStackTrace();
+            // e.printStackTrace();
         }
         return ipAddress;
     }
+
     /**
      *
      * 描述:获取Ip所属地址
+     * 
      * @author huaping hu
      * @date 2016年6月1日下午5:38:55
      * @param urlStr
      * @return
      */
-    public static String call( String urlStr ){
+    public static String call(String urlStr) {
 
         try {
 
             URL url = new URL(urlStr);
-            HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
+            HttpURLConnection httpCon = (HttpURLConnection)url.openConnection();
 
             httpCon.setConnectTimeout(3000);
             httpCon.setDoInput(true);
@@ -120,11 +119,11 @@
 
             int code = httpCon.getResponseCode();
 
-            if(code == 200){
+            if (code == 200) {
                 return streamConvertToSting(httpCon.getInputStream());
             }
         } catch (Exception e) {
-            log.error("获取IP所属地址出错",e);
+            log.error("获取IP所属地址出错", e);
             e.printStackTrace();
         }
         return null;
@@ -133,22 +132,24 @@
     /**
      *
      * 描述:将InputStream转换成String
+     * 
      * @author huaping hu
      * @date 2016年6月1日下午5:51:53
      * @param is
      * @return
      */
-    public static String streamConvertToSting(InputStream is){
+    public static String streamConvertToSting(InputStream is) {
 
         String tempStr = "";
         try {
 
-            if(is == null) return null;
+            if (is == null)
+                return null;
             ByteArrayOutputStream arrayOut = new ByteArrayOutputStream();
             byte[] by = new byte[1024];
             int len = 0;
-            while((len = is.read(by))!=-1){
-                arrayOut.write(by,0,len);
+            while ((len = is.read(by)) != -1) {
+                arrayOut.write(by, 0, len);
             }
             tempStr = new String(arrayOut.toByteArray());
 
@@ -159,7 +160,6 @@
     }
 
     public static void main(String[] args) {
-
 
         String context = call("http://ip.taobao.com/service/getIpInfo.php?ip=120.192.182.1");
 

--
Gitblit v1.7.1