Merge branch 'master-高质量运营2' into uat_code

src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java

@@ -116,7 +116,7 @@ public class HighQualityClientController {
     }
 
     @ApiOperation("oss文件下载")
-    @PostMapping("/download")
+    @GetMapping("/download")
     public void download(@RequestParam String key, HttpServletResponse response) throws IOException {
         iUploadOssService.download(response,key);
     }

src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityMaintainController.java

@@ -107,7 +107,7 @@ public class HighQualityMaintainController {
     @ApiOperation("oss文件上传")
     @PostMapping("/upload")
     @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER, operationType = EbtpLogType.SELECT, detail = "高质量-视频上传")
-    public BaseResponse upload(@RequestParam("file") MultipartFile file) throws IOException {
+    public BaseResponse upload(@RequestPart("file") MultipartFile file) throws IOException {
         return BaseResponse.success(iUploadOssService.uploadFile(file,"oss/highquality"));
     }
     @ApiOperation("后台查询列表")

src/main/resources/application-uat.yml

@@ -154,7 +154,7 @@ ribbon:
   MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1
   
 mconfig:
-  workerId: 1
+  workerId: 1servlet
   datacenterId: 1
   # 服务名
   feign: