diff --git a/project_manager/src/main/java/com/ossean/projectmanager/model/OpenhubProject.java b/project_manager/src/main/java/com/ossean/projectmanager/model/OpenhubProject.java index 9bbdfcfbf..ef0177840 100644 --- a/project_manager/src/main/java/com/ossean/projectmanager/model/OpenhubProject.java +++ b/project_manager/src/main/java/com/ossean/projectmanager/model/OpenhubProject.java @@ -3,7 +3,7 @@ package com.ossean.projectmanager.model; public class OpenhubProject { private String description; private String name; - private String codeLocation; + private String codeRepository; public String getDescription() { return description; } @@ -16,12 +16,10 @@ public class OpenhubProject { public void setName(String name) { this.name = name; } - public String getCodeLocation() { - return codeLocation; + public String getCodeRepository() { + return codeRepository; } - public void setCodeLocation(String codeLocation) { - this.codeLocation = codeLocation; + public void setCodeRepository(String codeRepository) { + this.codeRepository = codeRepository; } - - } diff --git a/project_manager/src/main/java/com/ossean/projectmanager/parttabledao/PartProjectDao.java b/project_manager/src/main/java/com/ossean/projectmanager/parttabledao/PartProjectDao.java index f5c29921d..23cb472c7 100644 --- a/project_manager/src/main/java/com/ossean/projectmanager/parttabledao/PartProjectDao.java +++ b/project_manager/src/main/java/com/ossean/projectmanager/parttabledao/PartProjectDao.java @@ -9,7 +9,7 @@ import com.ossean.projectmanager.model.SourceForgeProject; public interface PartProjectDao { - @Select("select name,description,codeLocation from openhub_project where url = #{url}") + @Select("select name,description,code_repository from openhub_project where url = #{url}") public OpenhubProject getOpenHubPrjByUrl( @Param("url") String url); @Select("select name,description,download_num,stars from sourceforge_project where url = #{url}") diff --git a/project_manager/src/main/java/com/ossean/projectmanager/projectsfilter/ProjectsFilter.java b/project_manager/src/main/java/com/ossean/projectmanager/projectsfilter/ProjectsFilter.java index 04ac09972..84f00abda 100644 --- a/project_manager/src/main/java/com/ossean/projectmanager/projectsfilter/ProjectsFilter.java +++ b/project_manager/src/main/java/com/ossean/projectmanager/projectsfilter/ProjectsFilter.java @@ -71,7 +71,8 @@ public class ProjectsFilter { && openhubProject.getName() != "" && openhubProject.getDescription() != null && openhubProject.getDescription() != "" - && !openhubProject.getCodeLocation().contains( + && openhubProject.getCodeRepository()!=null + && !openhubProject.getCodeRepository().contains( "add a code location")) { // openhub的筛选条件为name、description不为空,且该项目有版本库 if (project.getFilration() == 0) { lastProjectDao.updateFiltratedPrj(project.getId(),