From c9146805855752d7190d4137a0a9f82dfd9a1f13 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 09 十月 2025 16:49:11 +0800
Subject: [PATCH] 添加试用期字段，临近转正时提醒一下
---
src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
index c36431f..fa7de70 100644
--- a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -2,7 +2,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
@@ -25,7 +26,6 @@
public static String getRealAddressByIP(String ip)
{
- String address = UNKNOWN;
// 鍐呯綉涓嶆煡璇�
if (IpUtils.internalIp(ip))
{
@@ -41,7 +41,7 @@
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
return UNKNOWN;
}
- JSONObject obj = JSONObject.parseObject(rspStr);
+ JSONObject obj = JSON.parseObject(rspStr);
String region = obj.getString("pro");
String city = obj.getString("city");
return String.format("%s %s", region, city);
@@ -51,6 +51,6 @@
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
}
}
- return address;
+ return UNKNOWN;
}
}
--
Gitblit v1.9.3