优化

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

@@ -56,7 +56,7 @@ public class PersonalAuthenticationPO {
     private String  idCardPositivePhoto;//身份证正面照片
 
 
-    @Column(name = "PA_ID_CARD_Back_PHOTO")
+    @Column(name = "PA_ID_CARD_BACK_PHOTO")
     private String  idCardBackPhoto;//身份证正面照片
 
 

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

@@ -4,15 +4,11 @@ import com.mooctest.crowd.site.data.dto.IndexDTO;
 import com.mooctest.crowd.site.data.dto.IndexInfoDTO;
 import com.mooctest.crowd.site.data.dto.IndexPageDTO;
 import com.mooctest.crowd.site.data.dto.MyCrowdDTO;
-import com.mooctest.crowd.site.data.vo.CrowdProjectVO;
-
-import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
-import com.mooctest.crowd.site.data.vo.UserVO;
+import com.mooctest.crowd.site.data.vo.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.awt.*;
 import java.util.Map;
 
 @Service
@@ -21,7 +17,6 @@ public interface CommonService {
 
     Page<UserVO> getMoreUser(Pageable pageable);
 
-
     IndexDTO getIndexInfo();
 
     MyCrowdDTO getPersonCrowd(Long userId);
@@ -34,7 +29,7 @@ public interface CommonService {
 
     Page<CrowdTaskVO> getTaskinfo(Pageable pageable, String keyword, int deletedStatus);
 
-    IndexPageDTO getHotTesting(Pageable pageable);
+    Page<ApplicationTypeVO> getHotTesting(Pageable pageable);
 
-    IndexPageDTO getCompetition(Pageable pageable);
+    Page<CompetitionVO> getCompetition(Pageable pageable);
 }

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

@@ -15,7 +15,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.awt.*;
 import java.util.Map;
 
 @Service
@@ -94,17 +93,13 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public IndexPageDTO getHotTesting(Pageable pageable) {
-        IndexPageDTO indexPageDTO = new IndexPageDTO();
-        indexPageDTO.setApplicationTypePage(applicationTypeRepo.getHotTesting(pageable).map(applicationType -> new ApplicationTypeVO(applicationType)));
-        return  indexPageDTO;
+    public Page<ApplicationTypeVO> getHotTesting(Pageable pageable) {
+        return applicationTypeRepo.getHotTesting(pageable).map(applicationType -> new ApplicationTypeVO(applicationType));
     }
 
     @Override
-    public IndexPageDTO getCompetition(Pageable pageable) {
-        IndexPageDTO indexPageDTO = new IndexPageDTO();
-        indexPageDTO.setCompetitionPage(commonRepo.findAllCompetition(pageable).map(competition -> new CompetitionVO(competition)));
-        return indexPageDTO;
+    public Page<CompetitionVO> getCompetition(Pageable pageable) {
+        return commonRepo.findAllCompetition(pageable).map(competition -> new CompetitionVO(competition));
     }
 
 }

site/src/main/resources/application.yml

@@ -106,7 +106,8 @@ spring:
     database: 6
 user:
   service:
-    baseUrl: http://127.0.0.1:8081
+#    baseUrl: http://127.0.0.1:8081
+    baseUrl: http://59.42.10.53:8081
 
 website:
   domain: mooctest.net