Merge branch 'feature/joint_log' into 'pre'

获取用户信息调整

See merge request infra/oss!30
This commit is contained in:
田立勇 2022-12-09 06:26:32 +00:00
commit fd702ab7b3

View File

@ -38,7 +38,6 @@ import static cn.axzo.oss.common.enums.CodeEnum.FILE_NAME_TOO_LONG;
* @author zhangtianyu * @author zhangtianyu
* @date 2022/4/14 2:56 PM * @date 2022/4/14 2:56 PM
**/ **/
@PreBuildContext
@RestController @RestController
@RequestMapping("/webApi") @RequestMapping("/webApi")
public class WebFileController { public class WebFileController {
@ -75,6 +74,7 @@ public class WebFileController {
@PostMapping("/v2/file") @PostMapping("/v2/file")
@CrossOrigin @CrossOrigin
@SneakyThrows @SneakyThrows
@PreBuildContext
public CommonResponse<FileInformationVo> uploadV2(@Valid @RequestParam String appCode, public CommonResponse<FileInformationVo> uploadV2(@Valid @RequestParam String appCode,
@Valid @RequestParam String bizScene, @Valid @RequestParam String bizScene,
@Valid @RequestParam String serviceName, @Valid @RequestParam String serviceName,
@ -101,6 +101,7 @@ public class WebFileController {
@SneakyThrows @SneakyThrows
@PostMapping("/v1/file/getUrl") @PostMapping("/v1/file/getUrl")
@CrossOrigin @CrossOrigin
@PreBuildContext
public CommonResponse<List<FindFileUrlVo>> getUrl(@Valid @RequestBody FindFileUrlDto dto) { public CommonResponse<List<FindFileUrlVo>> getUrl(@Valid @RequestBody FindFileUrlDto dto) {
List<FindFileUrlResponse> response = fileService.findFileUrl(dto); List<FindFileUrlResponse> response = fileService.findFileUrl(dto);
return CommonResponse.success(BeanConverter.convert(response, FindFileUrlVo.class)); return CommonResponse.success(BeanConverter.convert(response, FindFileUrlVo.class));
@ -109,6 +110,7 @@ public class WebFileController {
@SneakyThrows @SneakyThrows
@GetMapping("/v1/file/download") @GetMapping("/v1/file/download")
@CrossOrigin @CrossOrigin
@PreBuildContext
public void download(@Valid @RequestParam String fileKey, HttpServletResponse response) { public void download(@Valid @RequestParam String fileKey, HttpServletResponse response) {
ServerFileDownloadDto dto = ServerFileDownloadDto.builder() ServerFileDownloadDto dto = ServerFileDownloadDto.builder()
.fileKey(fileKey) .fileKey(fileKey)