Merge branch 'feature-V2.0' into 'master'

Feature v2.0

See merge request crowd-2019/crowd-test-service-backend!155

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

@@ -660,7 +660,7 @@ public class WebMediatorImpl implements ViewMediator {
                                 return task;
                             }
                             return null;
-                        }).collect(Collectors.toList());
+                        }).filter(Objects::nonNull).collect(Collectors.toList());
                 if(allTaskOfAgency != null && allTaskOfAgency.size() > 0){
                     unfinishedTasks = allTaskOfAgency.stream()
                             .filter(crowdTestTask -> crowdTestTask.getStatus() >= CrowdTestTaskStatus.HAS_RELEASED && crowdTestTask.getStatus() < CrowdTestTaskStatus.HAS_FINISHED)
@@ -713,7 +713,7 @@ public class WebMediatorImpl implements ViewMediator {
                         return task;
                     }
                     return null;
-                }).collect(Collectors.toList());
+                }).filter(Objects::nonNull).collect(Collectors.toList());
 //                System.out.println("userId: " + userId);
                 if(allTaskOfAgency != null && allTaskOfAgency.size() > 0){
                     unfinishedTasks = allTaskOfAgency.stream()

site/src/main/resources/application.yml

@@ -72,7 +72,6 @@ spring:
   profiles: dev
   datasource:
     url: jdbc:mysql://101.37.175.111:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-
     username: mooctest
     password: secr3t!
   redis: