通用规则去掉，保存BUG修复，资源文件修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicExamRule.java

@@ -39,25 +39,24 @@ public class BasicExamRule extends BaseEntity implements Serializable {
      */
     @TableField("required_fields")
     private String requiredFields;
+
     /**
      * 扩展字段
      */
     @TableField("extend_fields")
     private String extendFields;
+
     /**
      * 0-禁用，1-启用
      */
     private Boolean review;
+
     /**
      * 0-禁用，1-启用
      */
     @TableField("include_paper")
     private Boolean includePaper;
-    /**
-     * 0-禁用，1-启用
-     */
-    @TableField("custom_card")
-    private Boolean customCard;
+
     /**
      * AUTO-自动，MANUAL-手动
      */
@@ -116,14 +115,6 @@ public class BasicExamRule extends BaseEntity implements Serializable {
         this.includePaper = includePaper;
     }
 
-    public Boolean getCustomCard() {
-        return customCard;
-    }
-
-    public void setCustomCard(Boolean customCard) {
-        this.customCard = customCard;
-    }
-
     public PrintMethodEnum getPrintMethod() {
         return printMethod;
     }
@@ -131,5 +122,4 @@ public class BasicExamRule extends BaseEntity implements Serializable {
     public void setPrintMethod(PrintMethodEnum printMethod) {
         this.printMethod = printMethod;
     }
-
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicExamRuleServiceImpl.java

@@ -9,7 +9,6 @@ import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.mapper.BasicExamRuleMapper;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.distributed.print.business.service.ExamPrintPlanService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -102,9 +101,6 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
                 if (!basicExamRule.getIncludePaper().equals(examRule.getIncludePaper())) {
                     throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改包含试卷控制");
                 }
-                if (!basicExamRule.getCustomCard().equals(examRule.getCustomCard())) {
-                    throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改客服制卡控制");
-                }
                 if (!basicExamRule.getPrintMethod().equals(examRule.getPrintMethod())) {
                     throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改印刷方式控制");
                 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -448,9 +448,6 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         if (StringUtils.isBlank(examCardParams.getMakeMethod().name())) {
             throw ExceptionResultEnum.ERROR.exception("题卡制作方式不能为空");
         }
-        if (!basicExamRule.getCustomCard() && MakeMethodEnum.CUST.name().equals(examCardParams.getMakeMethod().name())) {
-            throw ExceptionResultEnum.ERROR.exception("未启用客服制卡，不能选择该方式制作题卡");
-        }
         if (examCardParams.getStatus() == null) {
             throw ExceptionResultEnum.ERROR.exception("提交方式不能为空");
         }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TSyncExamStudentScoreServiceImpl.java

@@ -65,17 +65,17 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
     public IPage<TSyncExamStudentScoreResult> list(IPage<Map> iPage, Long semesterId, Long examId, Long clazzId, String courseCode) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         IPage<TSyncExamStudentScoreResult> list = tSyncExamStudentScoreMapper.list(iPage, sysUser.getSchoolId(), semesterId, examId, clazzId, courseCode);
-         list.getRecords().stream().map(m->{
-             String localSheetUrls = m.getLocalSheetUrls();
-             if(StringUtils.isNotBlank(localSheetUrls)) {
-                 List<String> trailUrlsList = new ArrayList<>();
-                 List<String> jsonArray = JSON.parseArray(localSheetUrls, String.class);
-                 for (String s : jsonArray) {
-                     trailUrlsList.add(teachcloudCommonService.filePreview(s));
-                 }
-                 m.setSheetUrls(JSON.toJSONString(trailUrlsList));
-             }
-             return m;
+        list.getRecords().stream().map(m -> {
+            String localSheetUrls = m.getLocalSheetUrls();
+            if (StringUtils.isNotBlank(localSheetUrls)) {
+                List<String> trailUrlsList = new ArrayList<>();
+                List<String> jsonArray = JSON.parseArray(localSheetUrls, String.class);
+                for (String s : jsonArray) {
+                    trailUrlsList.add(teachcloudCommonService.filePreview(s));
+                }
+                m.setSheetUrls(JSON.toJSONString(trailUrlsList));
+            }
+            return m;
         }).collect(Collectors.toList());
 
         return list;
@@ -127,7 +127,7 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
             stringJoiner.add(dictionaryConfig.fssLocalFileDomain().getConfig()).add(File.separator);
             List<String> trailUrlsList = tSyncExamStudentScore.getTrailUrls();
 
-            String hostUrl = SystemConstant.getLocalFileHostByUserId(dictionaryConfig.sysDomain().getFileHost(), userId);
+            String hostUrl = SystemConstant.getLocalFileHostByUserId(dictionaryConfig.fssLocalFileDomain().getServer(), userId);
 
             if (needSync || Objects.isNull(tSyncExamStudentScore.getLocalSheetUrls()) || Objects.isNull(tSyncExamStudentScore.getTrajectoryUrls())) {
                 JSONArray jsonArray = JSONArray.parseArray(tSyncExamStudentScore.getSheetUrls());
@@ -147,7 +147,7 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
                     JSONArray jsonImageTrajectoryPathArray = new JSONArray();
                     for (int i = 0; i < jsonArray.size(); i++) {
                         String url = (String) jsonArray.get(i);
-                        String sheetName = url.substring(url.lastIndexOf("/") +1 );
+                        String sheetName = url.substring(url.lastIndexOf("/") + 1);
                         LocalDateTime nowTime = LocalDateTime.now();
                         StringJoiner dirJpgName = new StringJoiner("");
                         dirJpgName.add(UploadFileEnum.FILE.getTitle()).add(File.separator)
@@ -184,7 +184,7 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
                         jsonImageSourcePathArray.add(sheetObject);
 
                         // 轨迹
-                        if(markTagsJson.isEmpty()){
+                        if (markTagsJson.isEmpty()) {
                             continue;
                         }
                         JSONArray markTagJsonArray = (JSONArray) markTagsJson.get(i + 1);
@@ -226,7 +226,7 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
                             jsonImageTrajectoryPathArray.add((stringJoiner.toString() + dirTargetJpgName.toString()).replaceAll("\\\\", "/"));
                         }
                     }
-                    if(!jsonImageSourcePathArray.isEmpty()){
+                    if (!jsonImageSourcePathArray.isEmpty()) {
                         tSyncExamStudentScore.setLocalSheetUrls(jsonImageSourcePathArray.toJSONString());
                     }
                     if (!jsonImageTrajectoryPathArray.isEmpty()) {

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamRuleController.java

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.api;
 
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.teachcloud.common.util.Result;
@@ -51,7 +50,7 @@ public class BasicExamRuleController {
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Result save(@RequestBody BasicExamRule examRule) {
-        return ResultUtil.ok(basicExamRuleService.saveExamRule(examRule));
+        return ResultUtil.ok(String.valueOf(basicExamRuleService.saveExamRule(examRule)));
     }
 
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -372,7 +372,7 @@ public class SysController {
             authInfoService.appHasExpired(code);
             Map<String, String> map = new HashMap<>();
             if (Objects.nonNull(basicSchool.getLogo()) && (!basicSchool.getLogo().startsWith("http") || !basicSchool.getLogo().startsWith("https"))) {
-                String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+                String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.fssLocalFileDomain().getServer());
                 String filePath = SystemConstant.getLocalFilePath(hostUrl, basicSchool.getLogo());
                 String url = null;
                 if (filePath.startsWith("/")) {

distributed-print/src/main/java/com/qmth/distributed/print/start/StartRunning.java

@@ -20,17 +20,12 @@ import javax.annotation.Resource;
 public class StartRunning implements CommandLineRunner {
     private final static Logger log = LoggerFactory.getLogger(StartRunning.class);
 
-//    @Resource
-//    private OrgCenterDataDisposeService orgCenterDataDisposeService;
-
     @Resource
     AuthInfoService authInfoService;
 
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
-//        SystemConstant.initTempFiles();
-//        orgCenterDataDisposeService.updateSchoolInfo();
         authInfoService.appInfoInit();
         log.info("服务器启动时执行 end");
     }

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

@@ -51,6 +51,10 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -58,8 +62,6 @@ 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=http://127.0.0.1
-sys.config.serverHost=http://127.0.0.1
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
@@ -67,8 +69,6 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-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

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

@@ -12,9 +12,9 @@ spring.application.name=distributed-print
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=dps-print-v3.2.0
+db.name=distributed-v3.2.0
 db.username=root
-db.password=88888888
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
@@ -51,28 +51,24 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
-com.qmth.fss.localfile.config=E:/localFile/print-v3.2.0/file-temp
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
 com.qmth.fss.localfile.server=http://127.0.0.1:7001
-com.qmth.fss.localpdf.config=E:/localFile/print-v3.2.0/pdf-temp
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
 com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=false
+sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-#sys.config.fileHost=http://127.0.0.1:7001
-#sys.config.serverHost=http://127.0.0.1:7001
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=E:/devUtils/wkhtmltopdf/bin/wkhtmltopdf.exe
+sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-#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
@@ -122,8 +118,7 @@ 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
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.examSaveUrl=/api/exam/save
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD

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

@@ -51,6 +51,10 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qm
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-private
+com.qmth.fss.localfile.config=/file-temp
+com.qmth.fss.localfile.server=http://192.168.10.138:7781
+com.qmth.fss.localpdf.config=/pdf-temp
+com.qmth.fss.localpdf.server=http://192.168.10.138:7781
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
@@ -58,8 +62,6 @@ 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=http://192.168.10.138:7781
-sys.config.serverHost=http://192.168.10.138:7781
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
@@ -67,8 +69,6 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-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

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

@@ -51,6 +51,10 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qm
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-private
+com.qmth.fss.localfile.config=/file-temp
+com.qmth.fss.localfile.server=https://*.teach-cloud-test.com
+com.qmth.fss.localpdf.config=/pdf-temp
+com.qmth.fss.localpdf.server=https://*.teach-cloud-test.com
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -58,8 +62,6 @@ 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=https://*.teach-cloud-test.com
-sys.config.serverHost=https://*.teach-cloud-test.com
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
@@ -67,8 +69,6 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-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

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

@@ -15,7 +15,10 @@ import org.apache.commons.io.IOUtils;
 import org.springframework.cglib.beans.BeanMap;
 
 import javax.annotation.Resource;
-import java.io.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
@@ -82,7 +85,7 @@ public class SystemConstant {
     public static final String PDF_PREFIX = ".pdf";
     public static final String FTL_PREFIX = ".ftl";
     public static final String ZIP_PREFIX = ".zip";
-//    public static final String JPG_PREFIX = ".jpg";
+    //    public static final String JPG_PREFIX = ".jpg";
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final int PAGE_NUMBER = 0;
     public static final int PAGE_SIZE = 10000000;
@@ -96,7 +99,7 @@ public class SystemConstant {
     public static final String COMMA = ",";
     public static final int FINAL_SCALE = 1;
     public static final int CALCULATE_SCALE = 4;
-//    public static final int OPER_SCALE = 8;
+    //    public static final int OPER_SCALE = 8;
     public static final BigDecimal PERCENT = new BigDecimal(100);
     public static final String HYPHEN = "-";
     public static final String DEFAULT_SIGN = "#";
@@ -198,8 +201,8 @@ public class SystemConstant {
     /**
      * 变量
      */
-    public static String TEMP_FILES_DIR;
-    public static String PDF_TEMP_FILES_DIR;
+//    public static String TEMP_FILES_DIR;
+//    public static String PDF_TEMP_FILES_DIR;
 
     /**
      * excel相关

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

@@ -23,10 +23,6 @@ public class SysDomain implements Serializable {
 
     String serverUpload;
 
-    String fileHost;
-
-    String serverHost;
-
     String adminLogoUrl;
 
     String htmlToPdfUrl;
@@ -43,36 +39,6 @@ public class SysDomain implements Serializable {
 
     String loginAuthenUrl;
 
-//    Map<String, List<String>> flowSchoolCodeMap;
-
-//    public Map<String, List<String>> getFlowSchoolCodeMap() {
-//        return flowSchoolCodeMap;
-//    }
-
-    String fileTempPath;
-
-    String pdfTempPath;
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-    public void setFileTempPath(String fileTempPath) {
-        this.fileTempPath = fileTempPath;
-    }
-
-    public String getPdfTempPath() {
-        return pdfTempPath;
-    }
-
-    public void setPdfTempPath(String pdfTempPath) {
-        this.pdfTempPath = pdfTempPath;
-    }
-
-//    public void setFlowSchoolCodeMap(Map<String, List<String>> flowSchoolCodeMap) {
-//        this.flowSchoolCodeMap = flowSchoolCodeMap;
-//    }
-
     public String getLoginAuthenUrl() {
         return loginAuthenUrl;
     }
@@ -137,22 +103,6 @@ public class SysDomain implements Serializable {
         this.adminLogoUrl = adminLogoUrl;
     }
 
-    public String getFileHost() {
-        return fileHost;
-    }
-
-    public void setFileHost(String fileHost) {
-        this.fileHost = fileHost;
-    }
-
-    public String getServerHost() {
-        return serverHost;
-    }
-
-    public void setServerHost(String serverHost) {
-        this.serverHost = serverHost;
-    }
-
     public Integer getAttachmentLength() {
         return attachmentLength;
     }

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

@@ -285,7 +285,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
                     BasicSchool tbSchool = Objects.nonNull(user.getSchoolId()) ? commonCacheService.schoolCache(user.getSchoolId()) : null;
                     SysOrg org = Objects.nonNull(user.getOrgId()) ? commonCacheService.orgCache(user.getOrgId()) : null;
                     List<SysPrivilege> sysPrivilegeList = new ArrayList<>();
-                    if (privilegeIds.size() > 0){
+                    if (privilegeIds.size() > 0) {
                         sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
                                 .eq(SysPrivilege::getType, PrivilegeEnum.URL)
                                 .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
@@ -477,7 +477,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
         String pathUrl;
         if (Objects.equals(type, SystemConstant.LOCAL)) {
-            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.fssLocalFileDomain().getServer());
             path = SystemConstant.getLocalFilePath(hostUrl, path);
             if (path.startsWith("/")) {
                 pathUrl = hostUrl + path;
@@ -518,7 +518,7 @@ 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)) {
-            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.fssLocalFileDomain().getServer());
             filePath = SystemConstant.getLocalFilePath(hostUrl, filePath);
             if (filePath.startsWith("/")) {
                 pathUrl = hostUrl + filePath;

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -236,7 +236,7 @@ public class SysController {
             authInfoService.appHasExpired(code);
             Map<String, String> map = new HashMap<>();
             if (Objects.nonNull(basicSchool.getLogo()) && (!basicSchool.getLogo().startsWith("http") || !basicSchool.getLogo().startsWith("https"))) {
-                String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.sysDomain().getFileHost());
+                String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.fssLocalFileDomain().getServer());
                 String filePath = SystemConstant.getLocalFilePath(hostUrl, basicSchool.getLogo());
                 String url = null;
                 if (filePath.startsWith("/")) {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/start/StartRunning.java

@@ -20,17 +20,12 @@ import javax.annotation.Resource;
 public class StartRunning implements CommandLineRunner {
     private final static Logger log = LoggerFactory.getLogger(StartRunning.class);
 
-//    @Resource
-//    private OrgCenterDataDisposeService orgCenterDataDisposeService;
-
     @Resource
     AuthInfoService authInfoService;
 
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
-        SystemConstant.initTempFiles();
-//        orgCenterDataDisposeService.updateSchoolInfo();
         authInfoService.appInfoInit();
         log.info("服务器启动时执行 end");
     }

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

@@ -28,14 +28,17 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7004
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7004
+
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=localhost:7004
-sys.config.serverHost=localhost:7004
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
@@ -43,8 +46,6 @@ 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.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

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

@@ -12,9 +12,9 @@ spring.application.name=teachcloud-report
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=dps-report-v3.2.0
+db.name=teachcloud-report-v3.1.0
 db.username=root
-db.password=88888888
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
@@ -28,14 +28,17 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
+
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=http://localhost:7004
-sys.config.serverHost=http://localhost:7004
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
@@ -43,8 +46,6 @@ 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.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

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

@@ -28,14 +28,17 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
+com.qmth.fss.localfile.config=/file-temp
+com.qmth.fss.localfile.server=http://192.168.10.136:7783
+com.qmth.fss.localpdf.config=/pdf-temp
+com.qmth.fss.localpdf.server=http://192.168.10.136:7783
+
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=http://192.168.10.136:7783
-sys.config.serverHost=http://192.168.10.136:7783
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
@@ -43,8 +46,6 @@ 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.fileTempPath=/file-temp
-sys.config.pdfTempPath=/pdf-temp
 
 org.center.url=https://solar.qmth.com.cn
 org.center.orgQueryApi=/api/open/org/query

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

@@ -28,14 +28,17 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
+com.qmth.fss.localfile.config=/file-temp
+com.qmth.fss.localfile.server=https://*.teachcloud-report-test.work
+com.qmth.fss.localpdf.config=/pdf-temp
+com.qmth.fss.localpdf.server=https://*.teachcloud-report-test.work
+
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=https://*.teachcloud-report-test.work
-sys.config.serverHost=https://*.teachcloud-report-test.work
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
@@ -43,8 +46,6 @@ 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.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

teachcloud-task/src/main/java/com/qmth/teachcloud/task/start/StartRunning.java

@@ -1,9 +1,11 @@
 package com.qmth.teachcloud.task.start;
 
 import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.task.enums.JobEnum;
-import com.qmth.teachcloud.task.job.*;
+import com.qmth.teachcloud.task.job.RedisMqSyncJob;
+import com.qmth.teachcloud.task.job.ResendSmsJob;
+import com.qmth.teachcloud.task.job.SendSmsExpireJob;
+import com.qmth.teachcloud.task.job.SendSmsOverdueJob;
 import com.qmth.teachcloud.task.job.service.JobService;
 import com.qmth.teachcloud.task.service.QuartzService;
 import org.slf4j.Logger;
@@ -38,11 +40,9 @@ public class StartRunning implements CommandLineRunner {
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
-//        SystemConstant.initTempFiles();
         jobService.machineHeart();
         printCommonService.updateStatus();
 
-
 //        log.info("增加重新生成pdf定时任务 start");
 //        Map taskJobMap = new HashMap();
 //        schoolJobMap.computeIfAbsent("name", v -> ResetCreatePdfJob.class.getName());

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

@@ -13,9 +13,9 @@ spring.application.name=teachcloud-task
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=dps-print-v3.2.0
+db.name=distributed-v3.2.0
 db.username=root
-db.password=88888888
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
@@ -52,29 +52,24 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.
 com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
-com.qmth.fss.localfile.config=E:/localFile/print-v3.2.0/file-temp
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
 com.qmth.fss.localfile.server=http://127.0.0.1:7001
-com.qmth.fss.localpdf.config=E:/localFile/print-v3.2.0/pdf-temp
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
 com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=false
+sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-#sys.config.fileHost=http://*.teachcloud-print-wl-test.cn
-#sys.config.serverHost=http://*.teachcloud-print-wl-test.cn
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-#sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-sys.config.htmlToPdfUrl=E:/devUtils/wkhtmltopdf/bin/wkhtmltopdf.exe
+sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-#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
@@ -123,8 +118,7 @@ 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://localhost:8081
+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

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

@@ -52,6 +52,10 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7871
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7871
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -59,8 +63,6 @@ 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:7871
-sys.config.serverHost=localhost:7871
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
@@ -68,8 +70,6 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-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

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

@@ -52,6 +52,10 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qm
 com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-private
+com.qmth.fss.localfile.config=/file-temp
+com.qmth.fss.localfile.server=http://192.168.10.138:7781
+com.qmth.fss.localpdf.config=/pdf-temp
+com.qmth.fss.localpdf.server=http://192.168.10.138:7781
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
@@ -59,8 +63,6 @@ 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=http://192.168.10.138:7781
-sys.config.serverHost=http://192.168.10.138:7781
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
@@ -68,8 +70,6 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-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

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

@@ -52,6 +52,10 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qm
 com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-private
+com.qmth.fss.localfile.config=/file-temp
+com.qmth.fss.localfile.server=https://*.teach-cloud-test.com
+com.qmth.fss.localpdf.config=/pdf-temp
+com.qmth.fss.localpdf.server=https://*.teach-cloud-test.com
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -59,8 +63,6 @@ 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=https://*.teach-cloud-test.com
-sys.config.serverHost=https://*.teach-cloud-test.com
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
@@ -68,8 +70,6 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-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