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

core/src/main/java/com/mooctest/crowd/domain/Application.java

@@ -7,7 +7,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
-
 @SpringBootApplication
 @EnableConfigurationProperties
 @ServletComponentScan

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

@@ -15,9 +15,6 @@ public class BankCardPO {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "BC_NAME")
-    private String name;
-
     @Column(name="BC_USER")
     private String user;
 

core/src/main/java/com/mooctest/crowd/domain/repository/PublicationsRepo.java

@@ -38,9 +38,9 @@ public class PublicationsRepo implements IPublicationsRepo{
             public Predicate toPredicate(Root<PublicationsPO> a, CriteriaQuery<?> q, CriteriaBuilder cb) {
                 Predicate predicate = cb.conjunction();
                 if(keyword != null) {
-                    predicate.getExpressions().add(
-                            cb.like(a.<String>get("longTitle"), "%" + StringUtils.trim(keyword) + "%")
-                    );
+                    Predicate title=cb.like(a.get("title"), "%" + StringUtils.trim(keyword) + "%");
+                    Predicate author=cb.like(a.get("authorList"), "%" + StringUtils.trim(keyword) + "%");
+                    predicate.getExpressions().add(cb.or(title,author));
                 }
                 return predicate;
             }

site/pom.xml

@@ -139,7 +139,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-
 			</plugin>
 		</plugins>
 	</build>

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

@@ -7,6 +7,7 @@ import com.mooctest.crowd.site.data.vo.BankCardVO;
 import com.mooctest.crowd.site.data.vo.QualificationVO;
 import com.mooctest.crowd.site.data.vo.UserVO;
 import com.mooctest.crowd.site.service.PersonalDataService;
+import org.codehaus.jettison.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -54,7 +55,7 @@ public class PersonalDataController {
     }
 
     @RequestMapping(value = "/addbankcard/{userId:\\d+}", method = RequestMethod.POST)
-    public BankCardDTO addBankCard(@PathVariable("userId") long userId, @RequestBody BankCardVO bankCardVO){
+    public BankCardDTO addBankCard(@PathVariable("userId") long userId, @RequestBody BankCardVO bankCardVO) throws JSONException {
         return  personalDataService.addBankCard(userId,bankCardVO);
     }
 

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

@@ -13,4 +13,6 @@ public class BankCardVO {
     private String number;
     private String code;
     private Long userId;
+    private String logoUrl;
+
 }

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

@@ -7,6 +7,7 @@ import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.exception.PasswordErrorException;
 import com.mooctest.crowd.domain.model.PersonalAuthenticationPO;
 import com.mooctest.crowd.site.data.vo.*;
+import org.codehaus.jettison.json.JSONException;
 import org.springframework.data.domain.Pageable;
 import com.mooctest.crowd.site.command.LoginCommand;
 import com.mooctest.crowd.site.command.RegisterCommand;
@@ -82,7 +83,7 @@ public interface ViewMediator {
 
     BankCardDTO getBankCard(long userId);
 
-    BankCardDTO addBankCard(long userId,BankCardVO bankCardVO);
+    BankCardDTO addBankCard(long userId,BankCardVO bankCardVO) throws JSONException;
 
     BankCardDTO deleteBankCard(long id,long userId);
 

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

@@ -19,12 +19,15 @@ import com.mooctest.crowd.site.data.enums.RoleType;
 import com.mooctest.crowd.site.data.vo.*;
 import com.mooctest.crowd.site.mediator.ViewMediator;
 import lombok.extern.slf4j.Slf4j;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -835,11 +838,11 @@ public class WebMediatorImpl implements ViewMediator {
         bankCardDao.findByUserIdAndIsDeleted(userId,DeletedStatus.isNotDeleted).forEach(bankCardPO ->{
             BankCardVO bankCardVO = new BankCardVO();
             bankCardVO.setId(bankCardPO.getId());
-            bankCardVO.setName(bankCardPO.getName());
             bankCardVO.setUser(bankCardPO.getUser());
             bankCardVO.setNumber(bankCardPO.getNumber());
             Optional<BankLogoPO> bankLogo=bankLogoDao.findByCode(bankCardPO.getCode());
-            bankCardVO.setCode(bankLogo.get().getLogoUrl());
+            bankCardVO.setLogoUrl(bankLogo.get().getLogoUrl());
+            bankCardVO.setName(bankLogo.get().getName());
             bankCardVOList.add(bankCardVO);
         });
         List<BankCardVO> results = bankCardVOList.stream().distinct().collect(Collectors.toList());
@@ -848,17 +851,21 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public BankCardDTO addBankCard(long userId, BankCardVO bankCardVO) {
+    public BankCardDTO addBankCard(long userId, BankCardVO bankCardVO) throws JSONException {
         BankCardPO bankCardPO=new BankCardPO();
-        bankCardPO.setName(bankCardVO.getName());
+        String bankNo=bankCardVO.getNumber();
+        String url = "https://ccdcapi.alipay.com/validateAndCacheCardInfo.json?_input_charset=utf-8&cardNo="+bankNo+"&cardBinCheck=true";
+        RestTemplate restTemplate = new RestTemplate();
+        String result = restTemplate.getForObject(url,String.class);
+        JSONObject json = new JSONObject(result);
+        String bank = String.valueOf(json.get("bank"));
         bankCardPO.setUser(bankCardVO.getUser());
         bankCardPO.setNumber(bankCardVO.getNumber());
-        bankCardPO.setCode(bankCardVO.getCode());
+        bankCardPO.setCode(bank);
         bankCardPO.setUserId(userId);
         bankCardDao.save(bankCardPO);
         return this.getBankCard(userId);
     }
-
     @Override
     public BankCardDTO deleteBankCard(long id, long userId) {
         Optional<BankCardPO> bankCardPO=bankCardDao.findById(id);

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

@@ -6,6 +6,7 @@ import com.mooctest.crowd.site.data.dto.UserDTO;
 import com.mooctest.crowd.site.data.vo.BankCardVO;
 import com.mooctest.crowd.site.data.vo.QualificationVO;
 import com.mooctest.crowd.site.data.vo.UserVO;
+import org.codehaus.jettison.json.JSONException;
 
 
 public interface PersonalDataService {
@@ -23,7 +24,7 @@ public interface PersonalDataService {
 
     BankCardDTO getBankCard(long userId);
 
-    BankCardDTO addBankCard(long userId,BankCardVO bankCardVO);
+    BankCardDTO addBankCard(long userId,BankCardVO bankCardVO) throws JSONException;
 
     BankCardDTO deleteBankCard(long id,long userId);
 }

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

@@ -8,6 +8,7 @@ import com.mooctest.crowd.site.data.vo.QualificationVO;
 import com.mooctest.crowd.site.data.vo.UserVO;
 import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.PersonalDataService;
+import org.codehaus.jettison.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -53,7 +54,7 @@ public class PersonalDataServiceImpl implements PersonalDataService {
     }
 
     @Override
-    public BankCardDTO addBankCard(long userId, BankCardVO bankCardVO) {
+    public BankCardDTO addBankCard(long userId, BankCardVO bankCardVO) throws JSONException {
         return viewMediator.addBankCard(userId,bankCardVO);
     }