Merge branch 'develop' of http://git.mmcuav.cn/iuav/pms into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 1a6f4013b7c1b7295ba572ba4b58a5e195b0e79d
+  newTag: 659741a9f6bb820aff6c17b29fbb88ba24d69930

src/main/java/com/mmc/pms/controller/UploadController.java

@@ -91,6 +91,7 @@ public class UploadController {
                     .build(OssConstant.ENDPOINT, OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
     File file = XmlUtil.ossUpload(uploadFile);
     String location =null;
+    String cdnURL = "https://file.iuav.com/";
     try {
       ObjectMetadata meta = new ObjectMetadata();
       // 指定上传的内容类型。
@@ -125,8 +126,9 @@ public class UploadController {
 
       // 断点续传上传。
       UploadFileResult uploadFileResult = ossClient.uploadFile(uploadFileRequest);
-      location = uploadFileResult.getMultipartUploadResult().getLocation();
-
+//      location = uploadFileResult.getMultipartUploadResult().getLocation();
+      location = cdnURL + newName;
+      log.info("location->" + location);
     } catch (OSSException oe) {
 
     } catch (Throwable ce) {

src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ spring:
     password: ${MYSQL_PASSWORD}
   redis:
     database: 1
-    host: redis.default
+    host: 172.24.1.207
     port: 6379
     password: ${REDIS_PASSWORD}
     jedis: