pdf转化

cloud-web-manage/src/main/java/com/yizhi/application/exam/controller/LibrarySubjectXmlExport.java

@@ -208,7 +208,7 @@ public class LibrarySubjectXmlExport extends AbstractDefaultTask<String, Map<Str
                 fileDir.mkdir();
             }
 
-            String path = requestPath + File.separator + fileName;
+            String path = requestPath + File.separator + fileName.getName();
             FileOutputStream os = null;
             File file = null;
             XMLWriter writer = null;
@@ -220,7 +220,7 @@ public class LibrarySubjectXmlExport extends AbstractDefaultTask<String, Map<Str
                 writer.write(document);
 
                 // 阿里云返回url
-                upLoadUrl = OssUpload.upload(path, fileName.toString());
+                upLoadUrl = OssUpload.upload(path, fileName.getName());
                 file = new File(path);
                 success(taskContext, "成功", upLoadUrl);
             } catch (Exception e1) {

cloud-web-manage/src/main/java/com/yizhi/application/portal/controller/SiteInformationManageController.java

@@ -2,11 +2,11 @@ package com.yizhi.application.portal.controller;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yizhi.application.course.constant.UtilConstants;
-import com.yizhi.application.course.util.OssUpload;
 import com.yizhi.application.course.util.WebUpConvert;
 import com.yizhi.core.application.enums.InternationalEnums;
 import com.yizhi.core.application.context.ContextHolder;
 import com.yizhi.core.application.context.RequestContext;
+import com.yizhi.core.application.file.util.OssUpload;
 import com.yizhi.core.application.task.AbstractTaskHandler;
 import com.yizhi.core.application.task.TaskExecutor;
 import com.yizhi.lecturer.application.enums.DeleteFlag;
@@ -63,6 +63,9 @@ public class SiteInformationManageController {
     @Autowired
     private PortalManagePCFeignClients portalManagePCFeignClient;
 
+    @Value("${pc.host.url}")
+    String pcHostUrl;
+
     /**
      * 资讯列表
      *
@@ -286,7 +289,8 @@ public class SiteInformationManageController {
             for (File file : files) {
                 uploadFile = file.getAbsolutePath();
                 key = pdfFileName.substring(0, pdfFileName.lastIndexOf(".")) + "/" + file.getName();
-                String result = OssUpload.upload(uploadFile, key, active);
+                OssUpload.upload(uploadFile, key);
+                String  result = pcHostUrl+"/api/v1/buckets/upload/objects/download/?preview=true&prefix="+key;
                 imageOssPathList.add(result);
             }
         }

cloud-web-manage/src/main/java/com/yizhi/application/util/PdfPagesAsynchronizationDeal.java

@@ -9,6 +9,7 @@ import com.yizhi.core.application.context.TaskContext;
 import com.yizhi.core.application.file.task.AbstractDefaultTask;
 import com.yizhi.core.application.file.util.OssUpload;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
@@ -25,6 +26,9 @@ public class PdfPagesAsynchronizationDeal extends AbstractDefaultTask<String, Ma
 
     @Autowired
     PdfPagesClient pdfPagesClient;
+
+    @Value("${pc.host.url}")
+    String pcHostUrl;
     
     @Override
     protected String execute(Map<String, Object> stringObjectMap) {
@@ -50,7 +54,8 @@ public class PdfPagesAsynchronizationDeal extends AbstractDefaultTask<String, Ma
                 for (File file : files) {
                     uploadFile = file.getAbsolutePath();
                     key = name + "/" + System.currentTimeMillis()+"/"+file.getName();
-                    String result = OssUpload.upload(uploadFile, key);
+                    OssUpload.upload(uploadFile, key);
+                    String  result = pcHostUrl+"/api/v1/buckets/upload/objects/download/?preview=true&prefix="+key;
                     PdfPagesVo pdfPage = new PdfPagesVo();
                     pdfPage.setPdfPage(Integer.parseInt(file.getName().substring(0, file.getName().lastIndexOf("."))));
                     pdfPage.setImageUrl(result);