chengxiaowen 3 meses atrás
pai
commit
1c6a2a5f78

+ 3 - 3
src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -288,7 +288,7 @@ public class OrderController extends BaseWebController {
                     File imageFile = ossUtils.generateCover(tempFile2);
                     dto = distinctionService.checkImg(imageFile,orderId,uidList);
                     if(dto.getOrderId() ==null){
-                        VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,new FileInputStream(tempFile2));
+                        VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file.getOriginalFilename(),orderId,new FileInputStream(tempFile2));
                         dto.setUrl(vaultsResponse.getData());
                     }
                     imageFile.delete();
@@ -297,7 +297,7 @@ public class OrderController extends BaseWebController {
                     File imageFile = ossUtils.generateCover(tempFile);
                     dto = distinctionService.checkImg(imageFile,orderId,uidList);
                     if(dto.getOrderId() ==null){
-                        VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,inputStream);
+                        VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file.getOriginalFilename(),orderId,inputStream);
                         dto.setUrl(vaultsResponse.getData());
                     }
                     imageFile.delete();
@@ -308,7 +308,7 @@ public class OrderController extends BaseWebController {
                 //图片处理
                 dto = distinctionService.checkImg(tempFile,orderId,uidList);
                 if(dto.getOrderId() ==null){
-                    VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,inputStream);
+                    VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file.getOriginalFilename(),orderId,inputStream);
                     dto.setUrl(vaultsResponse.getData());
                 }
             }

+ 5 - 5
src/main/java/com/poteviohealth/cgp/statistics/utils/OssUtils.java

@@ -44,7 +44,7 @@ public class OssUtils {
     private String dir;
     public VaultsResponse<String> uploadOneFile(MultipartFile dto, Long orderId) {
         try {
-            return uploadOneFile(dto,orderId,dto.getInputStream());
+            return uploadOneFile(dto.getOriginalFilename(),orderId,dto.getInputStream());
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -52,18 +52,18 @@ public class OssUtils {
     }
 
 
-    public VaultsResponse<String> uploadOneFile(MultipartFile dto, Long orderId,InputStream inputStream) {
+    public VaultsResponse<String> uploadOneFile(String filename, Long orderId,InputStream inputStream) {
         // 创建OSSClient实例。
 
         log.info("开始上传===");
         OSS ossClient = new OSSClientBuilder().build(endPoint, accessKeyId, secretAccessKey);
         try {
-            log.info("fileName==="+dto.getOriginalFilename());
+            log.info("fileName==="+filename);
             //设置文件名
-                Integer pos = dto.getOriginalFilename().lastIndexOf('.');
+                Integer pos = filename.lastIndexOf('.');
                 String suffix = "";
                 if (pos != -1) {
-                    suffix = dto.getOriginalFilename().substring(pos);
+                    suffix = filename.substring(pos);
                 }
 
             SimpleDateFormat format = new SimpleDateFormat("yyMM");

+ 1 - 1
src/main/resources/develop/application.yml

@@ -107,7 +107,7 @@ sync:
 aliyun:
   oss:
     internetpoint: oss-cn-beijing.aliyuncs.com # oss对外服务的访问域名
-    endpoint: oss-cn-beijing-internal.aliyuncs.com # oss对内服务的访问域名
+    endpoint:  oss-cn-beijing.aliyuncs.com # oss对内服务的访问域名
     accessKeyId: LTAIKYgOt8D3W9kz # 访问身份验证中用到用户标识
     accessKeySecret: yHszJ0sEyQXq90Ad7cxRh4Ake0qfbd # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
     bucketName: ptsubsidy # oss的存储空间