Merge branch 'dev_v3.2.0' into release_v3.2.0

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

@@ -948,7 +948,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         }
                         sourceFiles.add(htmlFile);
                     }
-                    FileUtil.doZip(zipFile, sourceFiles);
+//                    FileUtil.doZip(zipFile, sourceFiles);
+                    Zip4jUtil.zipEncryptFile(zipFile.getPath(), sourceFiles, SystemConstant.ZIP_ENCRYPT_PWD);
                     String ossDirName = dirName.toString().replaceAll("\\\\", "/");
                     JSONObject jsonObject = new JSONObject();
                     if (oss) {//上传至oss

distributed-print/src/main/java/com/qmth/distributed/print/auth/DistributedPrintSession.java

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.common.entity.TBSession;
 import com.qmth.teachcloud.common.util.RedisUtil;
 
 import java.util.Collection;
+import java.util.Objects;
 
 public class DistributedPrintSession implements AccessEntity {
 
@@ -32,7 +33,7 @@ public class DistributedPrintSession implements AccessEntity {
     public String getSecret() {
         RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
         TBSession tbSession = (TBSession) redisUtil.getUserSession(identity);
-        return tbSession.getAccessToken();
+        return Objects.nonNull(tbSession) ? tbSession.getAccessToken() : null;
     }
 
     @Override