wangliang пре 2 година
родитељ
комит
e7ef31e4ff

+ 2 - 2
distributed-print/src/main/resources/application-36dev.properties

@@ -82,8 +82,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-3
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

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

@@ -85,8 +85,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-3
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

+ 2 - 2
distributed-print/src/main/resources/application-offline.properties

@@ -81,8 +81,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/file-temp
-sys.config.pdfTempUrl=/pdf-temp
+sys.config.fileTempPath=/file-temp
+sys.config.pdfTempPath=/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

+ 2 - 2
distributed-print/src/main/resources/application-release.properties

@@ -87,8 +87,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=gdpu
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=jxutcm,sisu,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 #com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
 #com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr

+ 2 - 2
distributed-print/src/main/resources/application-test.properties

@@ -81,8 +81,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

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

@@ -279,8 +279,8 @@ public class SystemConstant {
         File fileTempDir = null, pdfTempDir = null;
         DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
 
-        if (Objects.nonNull(dictionaryConfig.sysDomain().getFileTempUrl()) && !Objects.equals("", dictionaryConfig.sysDomain().getFileTempUrl())) {
-            fileTempDir = new File(dictionaryConfig.sysDomain().getFileTempUrl().toString());
+        if (Objects.nonNull(dictionaryConfig.sysDomain().getFileTempPath()) && !Objects.equals("", dictionaryConfig.sysDomain().getFileTempPath())) {
+            fileTempDir = new File(dictionaryConfig.sysDomain().getFileTempPath().toString());
         } else {
             StringJoiner fileTempLocalPath = new StringJoiner("").add(System.getProperty(USER_DIR));
             String mkdir = fileTempLocalPath.toString().substring(0, fileTempLocalPath.toString().lastIndexOf(File.separator));
@@ -290,8 +290,8 @@ public class SystemConstant {
             fileTempDir.mkdirs();
         }
 
-        if (Objects.nonNull(dictionaryConfig.sysDomain().getPdfTempUrl()) && !Objects.equals("", dictionaryConfig.sysDomain().getPdfTempUrl())) {
-            pdfTempDir = new File(dictionaryConfig.sysDomain().getPdfTempUrl().toString());
+        if (Objects.nonNull(dictionaryConfig.sysDomain().getPdfTempPath()) && !Objects.equals("", dictionaryConfig.sysDomain().getPdfTempPath())) {
+            pdfTempDir = new File(dictionaryConfig.sysDomain().getPdfTempPath().toString());
         } else {
             StringJoiner pdfTempLocalPath = new StringJoiner("").add(System.getProperty(USER_DIR));
             String mkdir = pdfTempLocalPath.toString().substring(0, pdfTempLocalPath.toString().lastIndexOf(File.separator));

+ 10 - 10
teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SysDomain.java

@@ -54,24 +54,24 @@ public class SysDomain implements Serializable {
         return flowSchoolCodeMap;
     }
 
-    String fileTempUrl;
+    String fileTempPath;
 
-    String pdfTempUrl;
+    String pdfTempPath;
 
-    public String getFileTempUrl() {
-        return fileTempUrl;
+    public String getFileTempPath() {
+        return fileTempPath;
     }
 
-    public void setFileTempUrl(String fileTempUrl) {
-        this.fileTempUrl = fileTempUrl;
+    public void setFileTempPath(String fileTempPath) {
+        this.fileTempPath = fileTempPath;
     }
 
-    public String getPdfTempUrl() {
-        return pdfTempUrl;
+    public String getPdfTempPath() {
+        return pdfTempPath;
     }
 
-    public void setPdfTempUrl(String pdfTempUrl) {
-        this.pdfTempUrl = pdfTempUrl;
+    public void setPdfTempPath(String pdfTempPath) {
+        this.pdfTempPath = pdfTempPath;
     }
 
     public void setFlowSchoolCodeMap(Map<String, List<String>> flowSchoolCodeMap) {

+ 2 - 2
teachcloud-report/src/main/resources/application-36dev.properties

@@ -58,8 +58,8 @@ sys.config.sessionActive=2h
 sys.config.reportUrl=http://localhost:9099/#/student-report/
 sys.config.loginAuthenUrl=http://192.168.10.86:8057/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

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

@@ -58,8 +58,8 @@ sys.config.sessionActive=2h
 sys.config.reportUrl=http://localhost:9099/#/student-report/
 sys.config.loginAuthenUrl=http://127.0.0.1:8057/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

+ 2 - 2
teachcloud-report/src/main/resources/application-offline.properties

@@ -58,8 +58,8 @@ sys.config.sessionActive=2h
 sys.config.reportUrl=http://192.168.10.136/#/student-report/
 sys.config.loginAuthenUrl=http://192.168.10.136/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/file-temp
-sys.config.pdfTempUrl=/pdf-temp
+sys.config.fileTempPath=/file-temp
+sys.config.pdfTempPath=/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

+ 2 - 2
teachcloud-report/src/main/resources/application-release.properties

@@ -59,8 +59,8 @@ sys.config.sessionActive=2h
 sys.config.reportUrl=https://wdfx.qmth.com.cn/#/student-report/
 sys.config.loginAuthenUrl=https://wdfx.qmth.com.cn/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

+ 2 - 2
teachcloud-report/src/main/resources/application-test.properties

@@ -58,8 +58,8 @@ sys.config.sessionActive=2h
 sys.config.reportUrl=https://*.teachcloud-report-test.work/#/student-report/
 sys.config.loginAuthenUrl=https://*.teachcloud-report-test.work/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

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

@@ -83,8 +83,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 2 - 2
teachcloud-task/src/main/resources/application-task_36dev.properties

@@ -83,8 +83,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 2 - 2
teachcloud-task/src/main/resources/application-task_offline.properties

@@ -82,8 +82,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/file-temp
-sys.config.pdfTempUrl=/pdf-temp
+sys.config.fileTempPath=/file-temp
+sys.config.pdfTempPath=/pdf-temp
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 2 - 2
teachcloud-task/src/main/resources/application-task_release.properties

@@ -88,8 +88,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=gdpu
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=jxutcm,sisu,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 2 - 2
teachcloud-task/src/main/resources/application-task_test.properties

@@ -82,8 +82,8 @@ sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
 sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-sys.config.fileTempUrl=/Users/king/Downloads/file-temp
-sys.config.pdfTempUrl=/Users/king/Downloads/pdf-temp
+sys.config.fileTempPath=/Users/king/Downloads/file-temp
+sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss