liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yss
2023-04-26 10:21:16 +08:00
parent 8ec481c718 e780cd393c
commit eab622be62
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
src/main/resources/application-uat.yml
View File

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