Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -166,7 +166,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     }
                     mouldFileMapper.insert(projectFile);
                     PdfFile pdfFile = new PdfFile();
-                    pdfFile.setPdfUrl("/upload/"+dFile1);
+                    pdfFile.setPdfUrl("/upload/"+dFile1.substring(path.length()));
                     pdfFile.setFileId(projectFile.getId());
                     pdfFile.setType(0);
                     pdfFile.setRafId(projectFile.getModelId());
@@ -174,7 +174,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     pdfFileMapper.insert(pdfFile);
                     if(blongType == 5 && file2 != null && !file2.isEmpty()){
                         pdfFile = new PdfFile();
-                        pdfFile.setPdfUrl("/upload/"+dFile2);
+                        pdfFile.setPdfUrl("/upload/"+dFile2.substring(path.length()));
                         pdfFile.setFileId(projectFile.getId());
                         pdfFile.setType(0);
                         pdfFile.setRafId(projectFile.getModelId());
@@ -736,11 +736,12 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     file.transferTo(saveFile);
                     //上传完，需要生成pdf
                     String dFile1 = path+UUID.randomUUID().toString().replaceAll("-", "")+".pdf";
+
                     File newFile = new File(dFile1);
                     if(!newFile .exists()){
                         openOfficeService.office2PDF(path + fileName,dFile1);
                         PdfFile pdfFile = new PdfFile();
-                        pdfFile.setPdfUrl("/upload/"+dFile1);
+                        pdfFile.setPdfUrl("/upload/"+dFile1.substring(path.length()));
                         pdfFile.setFileId(partFile.getId());
                         pdfFile.setType(1);
                         pdfFile.setRafId(partFile.getModelId());

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectFileServiceImpl.java

@@ -87,7 +87,7 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
                         if(!newFile .exists()){
                             openOfficeService.office2PDF(path + fileName,dFile1);
                             PdfFile pdfFile = new PdfFile();
-                            pdfFile.setPdfUrl("/upload/"+dFile1);
+                            pdfFile.setPdfUrl("/upload/"+dFile1.substring(path.length()));
                             pdfFile.setFileId(projectFile.getId());
                             pdfFile.setType(1);
                             pdfFile.setRafId(projectFile.getProjectId());