增加是否为需要密码导入的配置

site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTaskVO.java

@@ -59,6 +59,7 @@ public class CrowdTaskVO implements Serializable{
     private EndPointVO endPointVO;
     private String writeReportUrl;
     private String exportUrl;
+    private String acceptedPassword;
 
     public CrowdTaskVO(CrowdTestTask task){
         BeanUtils.copyProperties(task, this);
@@ -82,6 +83,7 @@ public class CrowdTaskVO implements Serializable{
         datetime = task.getDeadTime();
         participantCount = task.getParticipantCount();
         acceptedCount = task.getAcceptedCount();
+        acceptedPassword = this.projectId.substring(this.projectId.length() - 2) + this.code.substring(this.code.length() - 2);
         joinCount = task.getAcceptedCount();
         createTime = task.getCreateTime();
         participantHasCommittedCount = task.getParticipantHasCommittedCount();

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1686,6 +1686,13 @@ public class WebMediatorImpl implements ViewMediator {
         Optional<EndPointPO> endPointPOOptional = endPointDao.findByTaskCode(task.getCode());
         TaskOperationControl taskOperationControl = new TaskOperationControl();
 
+        if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("SystemAdministrator"))
+                || (user.getRegionalManager() != null && user.getId().equals(project.getRegionalManagerId()))) {
+            // 不管何时都可以导出任务
+            taskOperationControl.setExportTask(true);
+            taskOperationControl.setForkTask(true);
+        }
+
         if (user == null || task.getStatus() == CrowdTestTaskStatus.HAS_TIME_OUT) {
             return taskOperationControl;
         }
@@ -1697,12 +1704,6 @@ public class WebMediatorImpl implements ViewMediator {
                     taskOperationControl.setTaskDemonstrate(true);
                 }
             }
-            if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("SystemAdministrator"))
-                    || (user.getRegionalManager() != null && user.getId().equals(project.getRegionalManagerId()))) {
-                // 不管何时都可以导出任务
-                taskOperationControl.setExportTask(true);
-                taskOperationControl.setForkTask(true);
-            }
         }else{
             //区域管理员或系统管理员视角
             if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("SystemAdministrator"))

site/src/main/java/com/mooctest/crowd/site/service/impl/CommonServiceImpl.java

@@ -73,6 +73,9 @@ public class CommonServiceImpl implements CommonService {
     @Value("${feature.task.recommend}")
     private String featureTaskRecommend;
 
+    @Value("${feature.task.acceptedpwd}")
+    private Boolean featureTaskAcceptedPWD;
+
     @Override
     public List<UserVO> getMoreUser(Pageable pageable,String keyword) {
         return  viewMediator.renderMoreUser(pageable,keyword);
@@ -330,6 +333,7 @@ public class CommonServiceImpl implements CommonService {
         Map<String, String> configurationMap = commonRepo.getConfigurationListMap();
         configurationMap.put("feature_task_import", "{\"feature_task_import\":" + featureTaskImport + "}");
         configurationMap.put("feature_task_recommend", "{\"feature_task_recommend\":" + featureTaskRecommend + "}");
+        configurationMap.put("feature_task_acceptedpwd", "{\"feature_task_acceptedpwd\":" + featureTaskAcceptedPWD + "}");
         return new ConfigurationVO(configurationMap);
     }
 

site/src/main/resources/application.yml

@@ -93,8 +93,9 @@ feature:
   client:
     oss: true
   task:
-    import: true
-    recommend: false
+    import: true  #任务导入
+    recommend: false #任务推荐
+    acceptedpwd: false #使用密码接收任务
 
 ---
 spring:
@@ -163,8 +164,13 @@ user:
 #  save:
 #    path: /var/www/
 feature:
+  private: true
   client:
     oss: true
+  task:
+    import: true  #任务导入
+    recommend: false #任务推荐
+    acceptedpwd: true #使用密码接收任务
 
 file:
   save: