yumeng hace 5 años
padre
commit
9a37ce89a3

+ 24 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouMaterialUploadController.java

@@ -29,24 +29,44 @@ public class KuaiShouMaterialUploadController {
     @Autowired
     private IKuaiShouVideoGetService videoGetService;
 
-    @GetMapping(value = "/video")
+    @PostMapping(value = "/video")
     public Result<JSONObject> video(@RequestBody JSONObject requestJson) throws Exception {
         Result<JSONObject> result = new Result<>();
         try {
             Long accountId = requestJson.getLong("accountId");
+            if (Check.isNull(accountId)) {
+                throw new Exception("请传入账户id");
+            }
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
             if (Check.isNull(oauthToken)) {
                 throw new Exception("未获取到账户信息");
             }
             String url = requestJson.getString("url");
+            if (Check.isNull(url)) {
+                throw new Exception("请传入视频");
+            }
+            String videoUrl;
+            if (!url.contains("https:")) {
+                videoUrl = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
+            } else {
+                videoUrl = url;
+            }
             Integer type = requestJson.getInteger("type");
+            if (Check.isNull(type)) {
+                throw new Exception("请传入视频类型");
+            }
             String signature = requestJson.getString("signature");
-            JSONObject videoJson = uploadService.video(url, type, accountId, oauthToken.getAccessToken(), signature);
+            if (Check.isNull(type)) {
+                throw new Exception("视频标识错误");
+            }
+            JSONObject videoJson = uploadService.video(videoUrl, type, accountId, oauthToken.getAccessToken(), signature);
             JSONObject returnJson = new JSONObject();
             if (videoJson.getBoolean("success")) {
                 result.setSuccess(true);
-                returnJson.put("photoId", videoJson.getLong("photoId"));
-                result.setResult(requestJson);
+                returnJson.put("photoId", videoJson.getString("photoId"));
+                returnJson.put("signature", videoJson.getString("signature"));
+                returnJson.put("videoUrl", videoUrl);
+                result.setResult(returnJson);
                 result.setMessage(videoJson.getString("message"));
             } else {
                 result.setSuccess(false);

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouMaterialUploadServiceImpl.java

@@ -57,6 +57,7 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
     public JSONObject video(String url, Integer type, Long accountId, String accessToken, String signature) {
         JSONObject returnJson = new JSONObject();
         try {
+            log.info("开始本地视频上传");
             String requestUrl = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.VIDEO_UPLOAD;
             String videoUrl = url.replace(replaceOldValue, replaceValue);
             String localUrl = LoadFileUtil.downLoadFromUrl(videoUrl, downloadUrl);