Prechádzať zdrojové kódy

Merge branch 'test' of https://gitee.com/hcst/adsp-boot into test

# Conflicts:
#	module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
xuzuoyun 5 rokov pred
rodič
commit
21f2c47f42

+ 1 - 5
module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java

@@ -277,11 +277,7 @@ public class MpsUtils {
         JSONObject videoWatermarkInput = new JSONObject();
         videoWatermarkInput.put("Location", ossLocation);
         videoWatermarkInput.put("Bucket", "ctop-media");
-        try {
-            videoWatermarkInput.put("Object", URLEncoder.encode(videoPath, "utf-8"));
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("videoWatetmark Input URL encode failed");
-        }
+        videoWatermarkInput.put("Object", videoPath);
         JSONObject videoWatermark = new JSONObject();
         videoWatermark.put("WaterMarkTemplateId", watermarkTemplateId);
         videoWatermark.put("Type", "Image");