From a5f04d4925f77fd741abecdc37cfc6674894cefe Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 13 Dec 2025 10:54:04 +0800
Subject: [PATCH] 2025-12-13 zwy 修改机场航线文件取path，转换http地址，配置文件oss去掉endpoint-spare字段，增加dock:endpoint,增加DockConfiguration.java配置文件，删除ossdock模块
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 1d31974..a4ac847 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -4,6 +4,7 @@
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.service.IArdRouteInfoService;
+import com.ard.sample.config.DockConfiguration;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -221,7 +222,7 @@
md5 = DigestUtils.md5Hex(inputStream);
url = new URL(ardRouteOpt.getPath());
log.info("机场任务航线文件url地址转换前：{}", url);
- httpUrl = url.toString().replace(OssConfiguration.endpoint, OssConfiguration.endpointSpare);
+ httpUrl = url.toString().replace(OssConfiguration.endpoint, DockConfiguration.endpoint);
log.info("机场任务航线文件url地址转换后：{}", httpUrl);
log.info("机场任务航线文件md5值：{}", md5);
} catch (Exception e) {
@@ -334,7 +335,7 @@
md5 = DigestUtils.md5Hex(inputStream);
url = new URL(ardRouteOpt.getPath());
log.info("机场任务航线文件url地址转换前：{}", url);
- httpUrl = url.toString().replace(OssConfiguration.endpoint, OssConfiguration.endpointSpare);
+ httpUrl = url.toString().replace(OssConfiguration.endpoint, DockConfiguration.endpoint);
log.info("机场任务航线文件url地址转换后：{}", httpUrl);
log.info("机场任务航线文件md5值：{}", md5);
} catch (Exception e) {
@@ -867,7 +868,7 @@
url = new URL(ardRouteOpt.getPath());
log.info("机场通过flightTaskResourceGet获取航线文件地址转换前：{}", url);
- httpUrl = url.toString().replace(OssConfiguration.endpoint, OssConfiguration.endpointSpare);
+ httpUrl = url.toString().replace(OssConfiguration.endpoint, DockConfiguration.endpoint);
log.info("机场通过flightTaskResourceGet获取航线文件地址转换后：{}", httpUrl);
log.info("机场通过flightTaskResourceGet获取航线文件地址，jobId: " + jobId + " 返回信息为url：" + httpUrl + " md5：" + md5);
--
Gitblit v1.9.3