本地部署真实路径隐藏

distributed-print/src/main/resources/application-dev.properties

@@ -66,8 +66,10 @@ sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=localhost:7001
-sys.config.serverHost=localhost:7001
+#sys.config.fileHost=localhost:7001
+#sys.config.serverHost=localhost:7001
+sys.config.fileHost=http://*.teachcloud-print-wl-test.cn
+sys.config.serverHost=http://*.teachcloud-print-wl-test.cn
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
 sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
@@ -131,8 +133,8 @@ com.qmth.logging.file-path=/Users/king/Downloads/distributed-print.log
 #spring.profiles.include=task
 
 #\uFFFD\uFFFD\uFFFD\u013E\uFFFD\uFFFD\uFFFD\uFFFDurl
-#sync.config.hostUrl=http://192.168.10.224:80
-sync.config.hostUrl=http://localhost:8081
+sync.config.hostUrl=http://192.168.10.224:80
+#sync.config.hostUrl=http://localhost:8081
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.examSaveUrl=/api/exam/save
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -4,9 +4,11 @@ import com.qmth.boot.core.uid.service.UidService;
 import com.qmth.teachcloud.common.annotation.DBVerify;
 import com.qmth.teachcloud.common.bean.result.DBVerifyResult;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TFCustomTypeEnum;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.Base64Util;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.cglib.beans.BeanMap;
@@ -59,7 +61,6 @@ public class SystemConstant {
     public static final String OSS = "oss";
     public static final String LOGO = "logo";
     public static final String UPLOAD_TYPE = "uploadType";
-    public static final String HTTP = "http://";
     public static final String ID = "id";
     public static final String MODEL = "model";
     public static final String VERSION = "version";
@@ -603,4 +604,35 @@ public class SystemConstant {
         beanMap.putAll(map);
         return bean;
     }
+
+    /**
+     * 获取本地文件host
+     *
+     * @param hostUrl
+     * @return
+     */
+    public static String getLocalFileHost(String hostUrl) {
+        CommonCacheService commonCacheService = SpringContextHolder.getBean(CommonCacheService.class);
+        if (hostUrl.contains("*")) {
+            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+            BasicSchool basicSchool = commonCacheService.schoolCache(sysUser.getSchoolId());
+            hostUrl = hostUrl.replace("*", basicSchool.getCode());
+        }
+        return hostUrl;
+    }
+
+    /**
+     * 获取本地文件路径
+     *
+     * @param filePath
+     * @return
+     */
+    public static String getLocalFilePath(String filePath) {
+        if (filePath.contains(SystemConstant.FILE_TEMP)) {
+            filePath = filePath.substring(filePath.indexOf(SystemConstant.FILE_TEMP), filePath.length());
+        } else if (filePath.contains(SystemConstant.PDF_TEMP)) {
+            filePath = filePath.substring(filePath.indexOf(SystemConstant.PDF_TEMP), filePath.length());
+        }
+        return filePath;
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/AttachmentCommonServiceImpl.java

@@ -21,7 +21,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +61,9 @@ public class AttachmentCommonServiceImpl implements AttachmentCommonService {
         String filePath = (String) jsonObject.get(SystemConstant.PATH);
         UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
         if (Objects.equals(attachmentType, SystemConstant.LOCAL)) {
-            url = SystemConstant.HTTP + dictionaryConfig.sysDomain().getFileHost() + File.separator + filePath;
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            filePath = SystemConstant.getLocalFilePath(filePath);
+            url = hostUrl + File.separator + filePath;
         } else {
             url = fileStoreUtil.getPrivateUrl(filePath, uploadFileEnum.getFssType());
         }
@@ -85,7 +86,9 @@ public class AttachmentCommonServiceImpl implements AttachmentCommonService {
 
         String pathUrl;
         if (Objects.equals(type, SystemConstant.LOCAL)) {
-            pathUrl = SystemConstant.HTTP + dictionaryConfig.sysDomain().getFileHost() + File.separator + path;
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            path = SystemConstant.getLocalFilePath(path);
+            pathUrl = hostUrl + File.separator + path;
         } else {
             pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
 
@@ -116,7 +119,9 @@ public class AttachmentCommonServiceImpl implements AttachmentCommonService {
         UploadFileEnum uploadFileEnum = jsonObject.get(SystemConstant.UPLOAD_TYPE).toString().contains(UploadFileEnum.HTML.name()) ? UploadFileEnum.HTML : UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
 
         if (Objects.equals(attachmentType, SystemConstant.LOCAL)) {
-            pathUrl = SystemConstant.HTTP + dictionaryConfig.sysDomain().getFileHost() + File.separator + filePath;
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            filePath = SystemConstant.getLocalFilePath(filePath);
+            pathUrl = hostUrl + File.separator + filePath;
         } else {
             pathUrl = fileStoreUtil.getPrivateUrl(filePath, uploadFileEnum.getFssType());
         }

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

@@ -585,15 +585,11 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         String filePath = (String) jsonObject.get(SystemConstant.PATH);
         UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
         if (Objects.equals(attachmentType, SystemConstant.LOCAL)) {
-            url = SystemConstant.HTTP + dictionaryConfig.sysDomain().getFileHost() + File.separator + filePath;
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            filePath = SystemConstant.getLocalFilePath(filePath);
+            url = hostUrl + File.separator + filePath;
         } else {
-//            if (uploadFileEnum == UploadFileEnum.PAPER) {
-//                url = ossUtil.getPrivateUrl(filePath);
             url = fileStoreUtil.getPrivateUrl(filePath, uploadFileEnum.getFssType());
-//            } else {
-//                url = dictionaryConfig.aliYunOssDomain().getUrl() + File.separator + filePath;
-//                url = fileStoreUtil.getPrivateUrl(filePath, uploadFileEnum.getFssType());
-//            }
         }
         return url;
     }
@@ -611,16 +607,15 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         if (StringUtils.isBlank(path)) {
             return null;
         }
-
         String pathUrl;
         if (Objects.equals(type, SystemConstant.LOCAL)) {
-            pathUrl = SystemConstant.HTTP + dictionaryConfig.sysDomain().getFileHost() + File.separator + path;
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            path = SystemConstant.getLocalFilePath(path);
+            pathUrl = hostUrl + File.separator + path;
         } else {
             if (isExpire) {
-//                pathUrl = ossUtil.getPrivateUrl(path);
                 pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
             } else {
-//                pathUrl = dictionaryConfig.aliYunOssDomain().getUrl() + File.separator + path;
                 pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
             }
 
@@ -651,7 +646,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         UploadFileEnum uploadFileEnum = jsonObject.get(SystemConstant.UPLOAD_TYPE).toString().contains(UploadFileEnum.HTML.name()) ? UploadFileEnum.HTML : UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
 
         if (Objects.equals(attachmentType, SystemConstant.LOCAL)) {
-            pathUrl = SystemConstant.HTTP + dictionaryConfig.sysDomain().getFileHost() + File.separator + filePath;
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            filePath = SystemConstant.getLocalFilePath(filePath);
+            pathUrl = hostUrl + File.separator + filePath;
         } else {
             pathUrl = fileStoreUtil.getPrivateUrl(filePath, uploadFileEnum.getFssType());
         }

teachcloud-report/src/main/resources/application-dev.properties

@@ -42,8 +42,8 @@ sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=localhost:7004
-sys.config.serverHost=localhost:7004
+sys.config.fileHost=http://localhost:7004
+sys.config.serverHost=http://localhost:7004
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
 sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
@@ -129,7 +129,8 @@ sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
 #\uFFFD\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
 sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 
-yun.mark.url=https://www.markingcloud.com
+#yun.mark.url=https://www.markingcloud.com
+yun.mark.url=http://192.168.10.224:80
 yun.mark.studentScoreApi=/api/exam/student/score
 
 print.open.hostUrl=http://192.168.10.86:7001

teachcloud-task/src/main/resources/application-task.properties

@@ -67,8 +67,8 @@ sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=localhost:7011
-sys.config.serverHost=localhost:7011
+sys.config.fileHost=http://*.teachcloud-print-wl-test.cn
+sys.config.serverHost=http://*.teachcloud-print-wl-test.cn
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
 sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
@@ -131,8 +131,8 @@ spring.quartz.properties.org.quartz.threadPool.threadPriority=5
 
 #\u914D\u7F6E\u6587\u4EF6
 #spring.profiles=task
-#sync.config.hostUrl=http://192.168.10.224:80
-sync.config.hostUrl=http://192.168.10.225:8000
+sync.config.hostUrl=http://192.168.10.224:80
+#sync.config.hostUrl=http://192.168.10.225:8000
 sync.config.userSaveUrl=/api/user/external/save
 sync.config.groupSaveUrl=/api/exam/mark_group/save
 sync.config.groupCountUrl=/api/exam/mark_group/count