diff --git a/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java b/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java index de4859d..cb2db71 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java @@ -1,5 +1,6 @@ package cn.axzo.oss.client.controller; +import cn.axzo.core.utils.converter.BeanConverter; import cn.axzo.oss.common.utils.BeanConvertUtil; import cn.axzo.oss.http.api.ServerFileServiceApi; import cn.axzo.oss.http.model.ServerFileDeleteRequest; @@ -32,7 +33,7 @@ public class ServerFileController implements ServerFileServiceApi { public CommonResponse upload(@Valid @RequestBody ServerFileUploadRequest request) { ServerFileUploadDto dto = BeanConvertUtil.copyBean(request, ServerFileUploadDto.class); request.setFileContent(null); - return CommonResponse.success(fileService.upload(dto)); + return CommonResponse.success(BeanConverter.convert(fileService.upload(dto),ServerFileUploadResponse.class)); } /** diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/CodeGenerator.java b/oss-dal/src/main/java/cn/axzo/oss/dal/CodeGenerator.java index 4d963a3..f6aec5d 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/CodeGenerator.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/CodeGenerator.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.InjectionConfig; import com.baomidou.mybatisplus.generator.config.DataSourceConfig; @@ -20,6 +19,8 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import java.util.Collections; import java.util.Scanner; +import org.apache.commons.lang3.StringUtils; + /** * 通用响应对象 *