Merge remote-tracking branch 'origin/uat' into uat

4dkankan-common/src/main/java/com/fdkankan/common/exception/GlobalExceptionHandler.java

@@ -82,7 +82,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(BaseRuntimeException.class)
     @ResponseStatus(HttpStatus.OK)
     public Result runtimeExceptionHandler(HttpServletRequest request, BaseRuntimeException e) {
-        log.error("uri:{},exception:{}",request.getRequestURI(),e);
+        log.error("uri:{},stack trace:",request.getRequestURI(),e);
         return Result.failure(e.getCode() == null ? Result.CODE_FAILURE : e.getCode(), e.getMsg());
     }
 

4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneEditController.java

@@ -1149,7 +1149,7 @@ public class SceneEditController extends BaseController {
     @CheckCurrentUser(description = "控制球幕视频")
     @CheckScene
     @PostMapping("/operaVideo")
-    public ViewResult operaVideo(@RequestBody OperaVideoParam operaVideoDTO) throws Exception{
+    public ViewResult operaVideo(OperaVideoParam operaVideoDTO) throws Exception{
         sceneProService.operaVideo(operaVideoDTO);
         return ViewResult.success();
     }
@@ -1158,7 +1158,7 @@ public class SceneEditController extends BaseController {
     @ApiOperation("下载球幕视频")
     @CheckCurrentUser(description = "下载球幕视频")
 //    @CheckScene
-    @GetMapping("/downloadVideo")
+    @PostMapping("/downloadVideo")
     public ViewResult<DownlVideoVO> downloadVideo(DownloadVideoParam downloadVideoParam) throws Exception{
         String url = sceneProService.downloadVideo(downloadVideoParam);
         return ViewResult.success(new DownlVideoVO(url));