Merge remote-tracking branch 'origin/huji'

src/main/java/com/ads/business/service/impl/DocServiceImpl.java

@@ -318,7 +318,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
 
         String fileName = doc.getName();
         String docUrl = doc.getDocUrl();
-        String path = request.getScheme() + "://" + request.getServerName() + ":" + "8083" + request.getContextPath() + "/";
+        String path = request.getScheme() + "://" + request.getServerName() + ":" + "19050" + request.getContextPath() + "/";
         String filePath = pictureConfig.getServerBasePath() + "/" + pictureConfig.getUploadPath() + "/" + userNo + "/" + docId + fileName + ".pdf";
         String imageFilePath = pictureConfig.getServerBasePath() + "/" + pictureConfig.getUploadPath() + "/" + userNo + "/" + docId + fileName + File.separator;
         String createPath = pictureConfig.getBasePath() + "/" + pictureConfig.getUploadPath() + "/" + userNo + "/" + docId + fileName + ".pdf";
@@ -338,6 +338,7 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
             throw new BusinessException("生成pdf文件水印有异常！");
         }
         log.info("pdfDetail--文件路径：{}", path + filePath);
+        log.info("createPath---路径：{}", createPath);
         // 生成图片
         int pageSize = PdfUtil.toImages(createPath);
         LinkedList<String> images = new LinkedList<>();