Bladeren bron

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 jaren geleden
bovenliggende
commit
4a0e47665d
1 gewijzigde bestanden met toevoegingen van 2 en 12 verwijderingen
  1. 2 12
      module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java

+ 2 - 12
module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java

@@ -280,11 +280,7 @@ public class MpsUtils {
         JSONObject input = new JSONObject();
         input.put("Location", ossLocation);
         input.put("Bucket", "ctop-media");
-        try {
-            input.put("Object", URLEncoder.encode(videoPath, "utf-8"));
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("input URL encode failed");
-        }
+        input.put("Object", videoPath);
         request.setInput(input.toJSONString());
         JSONObject videoWatermarkInput = new JSONObject();
         videoWatermarkInput.put("Location", ossLocation);
@@ -298,14 +294,8 @@ public class MpsUtils {
         videoWatermark.put("Height", height);
         videoWatermark.put("Dx", "0");
         videoWatermark.put("Dy", "0");
-        String outputOSSObject;
-        try {
-            outputOSSObject = URLEncoder.encode(outputFilename, "utf-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("output URL encode failed");
-        }
         JSONObject output = new JSONObject();
-        output.put("OutputObject", outputOSSObject);
+        output.put("OutputObject", outputFilename);
         JSONArray watermarks = new JSONArray();
         watermarks.add(videoWatermark);
         output.put("WaterMarks", watermarks.toJSONString());