Merge branch 'test_future_wangge' into test

CeDo

2021-06-08 d4b9ab5678abe6835e26d8984a5c10dbb6092f30

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java

@@ -94,9 +94,8 @@
                ipAddress =  "["+jsonObject.get("country")+"/" +jsonObject.get("city")+"]";
            }
        }catch(Exception e){

            log.error("获取IP所属地址出错",e);
            e.printStackTrace();
            log.error("获取IP所属地址出错");
            //e.printStackTrace();
        }
        return ipAddress;
    }