Merge branch 'Test' into 'master'

Test

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

core/src/main/java/com/mooctest/crowd/domain/dao/CrowdTestProjectDao.java

@@ -43,7 +43,7 @@ public interface CrowdTestProjectDao extends CrudRepository<CrowdTestProjectPO,
     List<CrowdTestProjectPO> findAllHotProject();
 
     //这个指定了查询条数 适用于众测广场首页 这样性能会高一点对应热门项目
-    @Query(value = "SELECT * FROM crowd_test_project p WHERE CTP_STATUS !=4 and CTP_STATUS !=5 and CTP_IS_DELETED = 0 ORDER BY CTP_JOIN_COUNT DESC ,CTP_CREATE_TIME LIMIT 7; ", nativeQuery = true)
+    @Query(value = "SELECT * FROM crowd_test_project p WHERE CTP_STATUS !=4 and CTP_STATUS !=5 and CTP_IS_DELETED = 0 ORDER BY CTP_JOIN_COUNT DESC ,CTP_CREATE_TIME LIMIT 6; ", nativeQuery = true)
     List<CrowdTestProjectPO> findall();
 
     CrowdTestProjectPO findByIdAndIsDeleted(Long id, int isDeleted);

core/src/main/java/com/mooctest/crowd/domain/dao/CrowdTestTaskDao.java

@@ -38,7 +38,7 @@ public interface CrowdTestTaskDao extends CrudRepository<CrowdTestTaskPO, Long>,
     List<CrowdTestTaskPO> findCanAcceptTask();
 
     //热门任务
-    @Query(value = "select * FROM  crowd_test_task WHERE CTT_STATUS !=4 and CTT_STATUS !=5 and CTT_IS_DELETED = 0  ORDER BY CTT_ACCEPTED_COUNT DESC,CTT_CREATE_TIME DESC LIMIT 7", nativeQuery = true)
+    @Query(value = "select * FROM  crowd_test_task WHERE CTT_STATUS !=4 and CTT_STATUS !=5 and CTT_IS_DELETED = 0  ORDER BY CTT_ACCEPTED_COUNT DESC,CTT_CREATE_TIME DESC LIMIT 6", nativeQuery = true)
     List<CrowdTestTaskPO> findMoreHotTasks();
 
     //热门任务

site/src/main/java/com/mooctest/crowd/site/controller/CrowdTaskController.java

@@ -104,4 +104,11 @@ public class CrowdTaskController{
         Long userId = Long.parseLong((String)session.getAttribute("userId"));
         return taskService.confirmFinish(projectCode, taskCode, userId);
     }
+
+
+    @RequestMapping(value = "/jump/{projectCode}/{taskCode}/{userId}", method = RequestMethod.GET)
+    public void jumpPublicTesting(@PathVariable("projectCode") String projectCode, @PathVariable("taskCode") String taskCode,
+                                     @PathVariable("userId") Long userId){
+        taskService.jumpPublicTesting(projectCode,taskCode,userId);
+    }
 }

site/src/main/java/com/mooctest/crowd/site/controller/UserController.java

@@ -68,6 +68,11 @@ public class UserController extends BaseController{
     }
 
 
+    /**
+     * 获取用户头像接口
+     * @param userId
+     * @return
+     */
     @RequestMapping(value = "/user/image/{userId}", method = RequestMethod.GET)
     public ResponseVO<String> getUserImage(@PathVariable Long userId) {
         return new ResponseVO<>(ServerCode.SUCCESS, userService.getUserImage(userId));

site/src/main/java/com/mooctest/crowd/site/mediator/ViewMediator.java

@@ -126,4 +126,6 @@ public interface ViewMediator {
     List<CrowdTestProjectVO> crowdTestProjectsWaitingAccept();
 
     List<UserTaskCountVO> getCount();
+
+    void  jumpPublicTesting(String projectCode, String taskCode, Long userId);
 }

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

@@ -1162,6 +1162,11 @@ public class WebMediatorImpl implements ViewMediator {
         return userTaskCountVOList;
     }
 
+    @Override
+    public void jumpPublicTesting(String projectCode, String taskCode, Long userId) {
+        String url = "http://47.99.140.117/" + projectCode + "/"+taskCode+"/"+userId;
+    }
+
     /**
      * 众测广场首页展示的众测任务
      * @return

site/src/main/java/com/mooctest/crowd/site/service/CrowdTaskService.java

@@ -37,4 +37,6 @@ public interface CrowdTaskService {
     TaskDetailsDTO confirmFinish(String projectCode, String taskCode, Long userId);
 
     List<CrowdTaskVO> findMoreHotTasksList(String keyword);
+
+    void  jumpPublicTesting(String projectCode, String taskCode, Long userId);
 }

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

@@ -81,6 +81,11 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     }
 
     @Override
+    public void jumpPublicTesting(String projectCode, String taskCode, Long userId) {
+        viewMediator.jumpPublicTesting(projectCode,taskCode,userId);
+    }
+
+    @Override
     public List<CrowdTaskVO> findAll() {
         return viewMediator.crowdTaskVos();
     }

tool4deploy/Dockerfile

@@ -1,5 +1,7 @@
 FROM java:8
 EXPOSE 8080
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ADD site-0.0.1-SNAPSHOT.jar /root
 WORKDIR /root
 ENTRYPOINT ["java", "-jar", "-Djava.security.egd=file:/dev/./urandom", "site-0.0.1-SNAPSHOT.jar"]