Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -60,6 +60,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
@@ -642,7 +643,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             registerBookPdf.setOrgName(task.getOrgName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "/"));
+            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
             registerBookPdfService.save(registerBookPdf);
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -709,7 +709,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             registerBookPdf.setOrgName(task.getOrgName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "/"));
+            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
             registerBookPdfService.save(registerBookPdf);
         }, threadPoolTaskExecutor);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -54,6 +54,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -803,7 +804,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
             //registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "\\"));
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "/"));
+            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
             if(StringUtils.isEmpty(registerBookPdf.getFileName())||StringUtils.isEmpty(pdfUrl)){
                 throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
             }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -639,7 +639,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         registerBookPdf.setOrgPath(org.getPath());
         registerBookPdf.setFileUrl(url);
         //registerBookPdf.setFileName(StringUtils.substringAfterLast(url, "\\"));
-        registerBookPdf.setFileName(StringUtils.substringAfterLast(url, "/"));
+        registerBookPdf.setFileName(StringUtils.substringAfterLast(url, File.separator));
         registerBookPdf.setOrgName(registerBookVo.getOrgName());
         if (StringUtils.isEmpty(url) || StringUtils.isEmpty(registerBookPdf.getFileName())) {
             throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);