refactor(core): 替换IP工具类实现

- 将IpUtil和NetUtil迁移至deprecated包并注释掉原始代码
- 引入新的IPTool工具类替代原有功能
- 更新JobTrigger中的IP获取逻辑
- 修改XxlJobExecutor中的IP和端口处理方式
- 使用StringTool替代原有的字符串判断逻辑

Author: xuxueli

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java

@@ -13,9 +13,9 @@
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
-import com.xxl.job.core.util.IpUtil;
 import com.xxl.tool.core.StringTool;
 import com.xxl.tool.exception.ThrowableTool;
+import com.xxl.tool.http.IPTool;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -192,7 +192,7 @@ private void processTrigger(XxlJobGroup group,
         // 5、collection trigger info
         StringBuilder triggerMsgSb = new StringBuilder();
         triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append("：").append(triggerType.getTitle());
-        triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append("：").append(IpUtil.getIp());
+        triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append("：").append(IPTool.getIp());
         triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append("：")
                 .append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
         triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append("：").append(group.getRegistryList());

xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java

@@ -10,8 +10,8 @@
 import com.xxl.job.core.thread.JobLogFileCleanThread;
 import com.xxl.job.core.thread.JobThread;
 import com.xxl.job.core.thread.TriggerCallbackThread;
-import com.xxl.job.core.util.IpUtil;
-import com.xxl.job.core.util.NetUtil;
+import com.xxl.tool.core.StringTool;
+import com.xxl.tool.http.IPTool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -147,12 +147,13 @@ public static List<AdminBiz> getAdminBizList(){
     private void initEmbedServer(String address, String ip, int port, String appname, String accessToken) throws Exception {
 
         // fill ip port
-        port = port>0?port: NetUtil.findAvailablePort(9999);
-        ip = (ip!=null&&ip.trim().length()>0)?ip: IpUtil.getIp();
+        port = port>0?port: IPTool.getAvailablePort(9999);
+        ip = StringTool.isNotBlank(ip) ? ip : IPTool.getIp();
 
         // generate address
-        if (address==null || address.trim().length()==0) {
-            String ip_port_address = IpUtil.getIpPort(ip, port);   // registry-address：default use address to registry , otherwise use ip:port if address is null
+        if (StringTool.isBlank(address)) {
+            // registry-address：default use address to registry , otherwise use ip:port if address is null
+            String ip_port_address = IPTool.toAddressString(IPTool.toAddress(ip, port));
             address = "http://{ip_port}/".replace("{ip_port}", ip_port_address);
         }