Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-13 a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706

 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;
    }
@@ -154,7 +153,6 @@
            tempStr = new String(arrayOut.toByteArray());

        } catch (IOException e) {
// TODO Auto-generated catch block
            e.printStackTrace();
        }
        return tempStr;