瀏覽代碼

createTxt_local改造

wangliang 2 年之前
父節點
當前提交
68bfb145ff

+ 1 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceImpl.java

@@ -188,8 +188,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                 } else {
                     ossStr = SystemConstant.LOCAL;
                     if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig()) && filePath.contains(dictionaryConfig.fssLocalFileDomain().getConfig())) {
-                        url = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + filePath;
-                        htmlFile = new File(url);
+                        htmlFile = new File(filePath);
                     } else {
                         htmlFile = new File(dictionaryConfig.fssPublicDomain().getConfig(), filePath);
                     }

+ 2 - 3
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -612,9 +612,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
             fileTempList.add(fileTemp);
             file = fileStoreUtil.ossDownload(filePath, fileTemp, uploadType.getFssType());
         } else {
-            if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig()) && !filePath.contains(dictionaryConfig.fssLocalFileDomain().getConfig())) {
-                localPath = localPath.add(dictionaryConfig.fssLocalFileDomain().getConfig()).add(File.separator).add(filePath);
-                file = new File(localPath.toString());
+            if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig())) {
+                file = new File(filePath);
             } else {
                 String suffix = filePath.substring(filePath.lastIndexOf(".")).toLowerCase();
                 File fileTemp = SystemConstant.getFileTempVar(suffix);