update

core/src/main/java/com/mooctest/crowd/domain/IpAddress/Area.java

@@ -14,7 +14,6 @@ public class Area {
     private String pro;//省
     private String city;
 
-
     public Area(String pro, String city) {
         this.pro = pro;
         this.city = city;

site/src/main/java/com/mooctest/crowd/site/constants/CommonConstant.java

@@ -12,6 +12,8 @@ public class CommonConstant {
 
     public static final Integer SQUARE_ROWS_ON_PAGE = 9;
 
+    public static final Integer SQUARE_ROWS_ON_PAGE_MODIFY = 12;
+
     public static final Integer TECHNOLOGY_ROWS_ON_PAGE = 5;
 
     public static final Integer TEST = 3;

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

@@ -1,7 +1,6 @@
 package com.mooctest.crowd.site.controller;
 
 import com.mooctest.crowd.site.data.dto.CrowdTestSquareIndexDTO;
-import com.mooctest.crowd.site.data.dto.ProjectAndTaskDTO;
 import com.mooctest.crowd.site.data.response.ResponseVO;
 import com.mooctest.crowd.site.data.response.ServerCode;
 import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
@@ -17,11 +16,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**
@@ -76,7 +71,7 @@ public class CrowTestSquareController extends BaseSearchController {
      * @return
      */
 
-    @GetMapping("hotProject/list/more")
+    @PostMapping("/hotProject/list/more")
     public ResponseVO findMoreHotProjects(@RequestBody SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
         List<CrowdTestProjectVO> crowdTestProjectVOList = crowdProjectService.findAllMoreHotProjects();
@@ -91,7 +86,7 @@ public class CrowTestSquareController extends BaseSearchController {
      * @return
      */
 
-    @GetMapping("hotTasks/list/more")
+    @PostMapping("/hotTasks/list/more")
     public ResponseVO findMoreHotTasks(@RequestBody SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
         List<CrowdTaskVO> crowdTestProjectVOList = crowdTaskService.findMoreHotTasks();

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

@@ -70,7 +70,7 @@ public class TechnicalArticlesController extends BaseSearchController{
         return  technical.updateRanking(id);
     }
 
-    @RequestMapping(value = "/morearticles", method = RequestMethod.POST)
+    @RequestMapping(value = "/more", method = RequestMethod.POST)
     public ResponseVO<TechnicalArticlesDTO> moreArticles(@RequestBody SearchConditionVO searchConditionVO){
         Map<String, String> extraCondition = searchConditionVO.getColumnFilters()==null? new HashMap<>() :super.getExtraCondition(searchConditionVO);
         Pageable pageable = this.getMore(searchConditionVO);

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

@@ -74,7 +74,7 @@ public class CrowdTestSquareServiceImpl implements CrowdTestSquareService {
                 }
             }
         }
-        return new PageRequest(activePage - 1, CommonConstant.SQUARE_ROWS_ON_PAGE, sort);
+        return new PageRequest(activePage - 1, CommonConstant.SQUARE_ROWS_ON_PAGE_MODIFY, sort);
     }
 
     Map<String, String> getExtraCondition(SearchConditionVO searchConditionVO) {

site/src/main/resources/application.yml

@@ -56,7 +56,7 @@ oss:
 
 cache:
   expire:
-    duration: 72000
+    duration: 3600
 
 agency: 7