Merge branch 'develop'

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

@@ -77,7 +77,7 @@ public class UploadController {
             + oldName.substring(oldName.lastIndexOf("."), oldName.length());
     ossClient.putObject(OssConstant.BUCKET, newName, inputStream);
     ossClient.shutdown();
-    String filePath = "https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName;
+    String filePath = OssConstant.DOMAIN + "/" + newName;;
     JSONObject jsObj = new JSONObject();
     jsObj.put("filePath", filePath);
     return ResultBody.success(jsObj);
@@ -196,7 +196,7 @@ public class UploadController {
         // String filePath = "https://" + OssConstant.BUCKET + '.' +
         // OssConstant.ENDPOINT + "/" +
         // newName;
-        list.add("https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
+        list.add(OssConstant.DOMAIN + "/" + newName);
       }
     }
     ossClient.shutdown(); // 关流
@@ -259,7 +259,7 @@ public class UploadController {
                   + oldName.substring(oldName.lastIndexOf("."), oldName.length());
           ossClient.putObject(OssConstant.BUCKET, newName, bis);
           log.info("视频名称：" + newName);
-          list.add("https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
+          list.add(OssConstant.DOMAIN + "/" + newName);
         }
       }
     }
@@ -325,7 +325,7 @@ public class UploadController {
           log.info("视频名称：" + newName);
           map.put(
               "filePath",
-              "https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
+              OssConstant.DOMAIN + "/" + newName);
           map.put("fileName", oldName);
           map.put("fileSize", file.getSize());
           map.put("fileType", oldName.substring(oldName.lastIndexOf(".")).replace(".", ""));
@@ -384,7 +384,7 @@ public class UploadController {
                   + oldName.substring(oldName.lastIndexOf("."), oldName.length());
           ossClient.putObject(OssConstant.BUCKET, newName, bis);
           log.info("图片名称：" + newName);
-          list.add("https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
+          list.add(OssConstant.DOMAIN + "/" + newName);
         }
       }
     }
@@ -440,7 +440,7 @@ public class UploadController {
                 + oldName.substring(oldName.lastIndexOf("."), oldName.length());
         ossClient.putObject(OssConstant.BUCKET, newName, bis);
         log.info("图片名称：" + newName);
-        list.add("https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
+        list.add(OssConstant.DOMAIN + "/" + newName);
       }
     }
     ossClient.shutdown(); // 关流
@@ -497,7 +497,7 @@ public class UploadController {
           log.info("图片名称：" + newName);
           map.put(
               "filePath",
-              "https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
+              OssConstant.DOMAIN + "/" + newName);
           map.put("fileName", oldName);
           map.put("fileSize", file.getSize());
           map.put("fileType", oldName.substring(oldName.lastIndexOf(".")).replace(".", ""));
@@ -570,7 +570,7 @@ public class UploadController {
 
           map.put(
               "filePath",
-              "https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
+              OssConstant.DOMAIN + "/" + newName);
           map.put("fileName", oldName);
           map.put("fileSize", file.getSize());
           map.put("fileType", oldName.substring(oldName.lastIndexOf(".")).replace(".", ""));