forked from uav/ard-uav-server
ard-admin/src/main/resources/application-prod.yml
@@ -77,7 +77,6 @@ enable: true provider: minio endpoint: https://192.168.1.3:9001 endpoint-spare: http://111.40.46.199:9011 access-key: admin secret-key: ard12345 bucket: cloud-bucket @@ -85,14 +84,17 @@ region: us-east-1 object-dir-prefix: wayline # 机场单独用的oss配置，要http地址 http://192.168.1.3:9011 ossdock: enable: true provider: minio dock: endpoint: http://111.40.46.199:9011 access-key: admin2 secret-key: ard123456 bucket: cloud-bucket expire: 3600 region: us-east-1 object-dir-prefix: wayline # 机场单独用的oss配置，要http地址 http://192.168.1.3:9011 #ossdock: # enable: true # provider: minio # endpoint: http://111.40.46.199:9011 # access-key: admin2 # secret-key: ard123456 # bucket: cloud-bucket # expire: 3600 # region: us-east-1 # object-dir-prefix: wayline ard-oss/src/main/java/com/ard/oss/config/OssConfiguration.java
@@ -28,8 +28,6 @@ */ public static String endpoint; public static String endpointSpare; public static String accessKey; public static String secretKey; @@ -54,13 +52,7 @@ OssConfiguration.enable = enable; } public void setEndpoint(String endpoint) { OssConfiguration.endpoint = endpoint; } public void setEndpointSpare(String endpointSpare) { OssConfiguration.endpointSpare = endpointSpare; } public void setEndpoint(String endpoint) { OssConfiguration.endpoint = endpoint; } public void setAccessKey(String accessKey) { OssConfiguration.accessKey = accessKey; ard-ossdock/pom.xml
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/config/OssDockConfiguration.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/model/CredentialsDockDTO.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/model/MinioDockUploadResult.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/model/StsCredentialsDockDTO.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/model/enums/OssDockTypeEnum.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/service/IOssDockService.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/service/impl/AliyunDockOssDockServiceImpl.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/service/impl/AmazonS3DockDockServiceImpl.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/service/impl/MinIODockDockServiceImpl.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/service/impl/OssDockAspectHandler.java
File was deleted ard-ossdock/src/main/java/com/ard/ossdock/service/impl/OssDockServiceContext.java
File was deleted ard-sample/pom.xml
@@ -120,10 +120,6 @@ </dependency> <dependency> <groupId>com.ard</groupId> <artifactId>ard-ossdock</artifactId> </dependency> <dependency> <groupId>com.ard</groupId> <artifactId>ard-device</artifactId> </dependency> </dependencies> ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java
New file @@ -0,0 +1,15 @@ package com.ard.sample.config; import com.ard.common.config.OssConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @Component @ConfigurationProperties(prefix = "dock") public class DockConfiguration { public static String endpoint; public void setEndpoint(String endpoint) { DockConfiguration.endpoint = endpoint; } } 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); pom.xml
@@ -218,13 +218,6 @@ <artifactId>ard-oss</artifactId> <version>${ard.version}</version> </dependency> <!-- 机场存储模块--> <dependency> <groupId>com.ard</groupId> <artifactId>ard-ossdock</artifactId> <version>${ard.version}</version> </dependency> <!-- okhttp3--> <dependency> <groupId>com.squareup.okhttp3</groupId> @@ -275,7 +268,6 @@ <module>ard-route</module> <module>ard-device</module> <module>ard-oss</module> <module>ard-ossdock</module> </modules> <build>
