Merge branch 'feature-V2.0' of http://git.mooctest.com/crowd-2019/crowd-test-service-backend into feature-V2.0

 Conflicts:

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

core/src/main/java/com/mooctest/crowd/domain/model/UserPO.java

@@ -59,9 +59,6 @@ public class UserPO {
     @Column(name="U_BIRTHDAY")
     private Date birthday;
 
-    @Column(name="U_DETAILED_ADDRESS")
-    private String  detailedAddress;
-
     @Column(name="U_PERSONAL_COMPETENCE")
     private String personalCompetence;
 

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

@@ -52,6 +52,13 @@ public class TechnicalArticlesController extends BaseSearchController{
         return  new PageRequest(0,10,sort);
     }
 
+    Pageable getMore(SearchConditionVO searchConditionVO){
+        int activePage = searchConditionVO.getActivePage() == 0?1:searchConditionVO.getActivePage();
+        Sort sort = new Sort(Sort.Direction.DESC,"reading");
+        return new PageRequest(activePage-1, CommonConstant.TECHNOLOGY_ROWS_ON_PAGE, sort);
+    }
+
+
     @RequestMapping(value = "/ranking", method = RequestMethod.GET)
     public ResponseVO<TechnicalArticlesDTO> ranking(){
         Pageable pageable = this.getRanking();
@@ -62,4 +69,12 @@ public class TechnicalArticlesController extends BaseSearchController{
     public  TechnicalArticlesDTO updateRanking(@PathVariable("id") long id){
         return  technical.updateRanking(id);
     }
+
+    @RequestMapping(value = "/morearticles", 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);
+        String keyword = searchConditionVO.getKeyword();
+        return new ResponseVO<>(ServerCode.SUCCESS, technical.getArticles(pageable, keyword,extraCondition));
+    }
 }

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

@@ -33,7 +33,6 @@ public class UserVO implements Serializable {
     private String authType;
     private Long taskCount;
     private Date birthday;
-    private String detailedAddress;
     private String personalCompetence;
     private String unit;
     private String county;

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

@@ -18,6 +18,7 @@ import com.mooctest.crowd.site.data.dto.*;
 import com.mooctest.crowd.site.data.enums.RoleType;
 import com.mooctest.crowd.site.data.vo.*;
 import com.mooctest.crowd.site.mediator.ViewMediator;
+import com.mooctest.crowd.site.service.UploadService;
 import lombok.extern.slf4j.Slf4j;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -28,8 +29,12 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.awt.*;
+import java.io.File;
 import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -96,6 +101,9 @@ public class WebMediatorImpl implements ViewMediator {
     @Autowired
     private BankLogoDao bankLogoDao;
 
+    @Autowired
+    private UploadService uploadService;
+
     @Value("${agency}")
     private String agencyId;
 
@@ -128,10 +136,7 @@ public class WebMediatorImpl implements ViewMediator {
 
     @Override
     public UserDTO loginByMobileAndPwd(LoginCommand cmd) {
-         
-
-
-        return  null;
+        return null;
     }
 
     @Override
@@ -785,6 +790,7 @@ public class WebMediatorImpl implements ViewMediator {
             userVO.setProvince(userPO.get().getProvince());
             userVO.setCity(userPO.get().getCity());
             userVO.setCounty(userPO.get().getCounty());
+            userVO.setDetailedAddress(userPO.get().getDetailedAddress());
             userVO.setPersonalCompetence(userPO.get().getPersonalCompetence());
             userDTO.setUserVO(userVO);
             return userDTO;
@@ -795,13 +801,15 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public UserDTO updateInformation(long userId, UserVO userVO) {
         Optional<UserPO> userPO = userDao.findById(userId);
+        if(userVO.getUnit()==null||userVO.getUnit().length()<=0){
+            throw new HttpBadRequestException("请输入企业简称");
+        }
         userPO.get().setUnit(userVO.getUnit());
         userPO.get().setGender(userVO.getGender());
         userPO.get().setBirthday(userVO.getBirthday());
         userPO.get().setProvince(userVO.getProvince());
         userPO.get().setCity(userVO.getCity());
         userPO.get().setCounty(userVO.getCounty());
-//        userPO.get().setDetailedAddress(userVO.getDetailedAddress());
         userPO.get().setPersonalCompetence(userVO.getPersonalCompetence());
         userDao.save(userPO.get());
         return this.getInformation(userId);
@@ -886,6 +894,10 @@ public class WebMediatorImpl implements ViewMediator {
         RestTemplate restTemplate = new RestTemplate();
         String result = restTemplate.getForObject(url, String.class);
         JSONObject json = new JSONObject(result);
+        String validated = String.valueOf(json.get("validated"));
+        if("false".equals(validated)){
+            throw new HttpBadRequestException("请输入正确的卡号");
+        }
         String bank = String.valueOf(json.get("bank"));
         bankCardPO.setUser(bankCardVO.getUser());
         bankCardPO.setNumber(bankCardVO.getNumber());

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

@@ -2,6 +2,7 @@ package com.mooctest.crowd.site.service;
 
 import org.springframework.web.multipart.MultipartFile;
 
+import java.awt.*;
 import java.io.IOException;
 
 /**

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

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.awt.*;
+
 /**
  * @author: Diors.Po
  * @Email: 171256175@qq.com