From 944d62da4af38068544b2ac99c84d62aaa08e950 Mon Sep 17 00:00:00 2001
From: ronger <1207296860@qq.com>
Date: Sun, 19 Feb 2017 17:42:20 +0800
Subject: [PATCH] modify project manager: handle openhub_project

---
 .../ossean/projectmanager/model/OpenhubProject.java   | 11 ++++++-----
 .../projectmanager/projectsfilter/ProjectsFilter.java |  4 ++--
 .../src/main/resource/applicationContext-myBatis.xml  |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

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 ef0177840..f4129a1fb 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 codeRepository;
+	private String code_repository;
 	public String getDescription() {
 		return description;
 	}
@@ -16,10 +16,11 @@ public class OpenhubProject {
 	public void setName(String name) {
 		this.name = name;
 	}
-	public String getCodeRepository() {
-		return codeRepository;
+	public String getCode_repository() {
+		return code_repository;
 	}
-	public void setCodeRepository(String codeRepository) {
-		this.codeRepository = codeRepository;
+	public void setCode_repository(String code_repository) {
+		this.code_repository = code_repository;
 	}
+	
 }
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 fb842c92f..db2f32fca 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
@@ -82,8 +82,8 @@ public class ProjectsFilter {
 								&& !"".equals(openhubProject.getName())
 								&& openhubProject.getDescription() != null
 								&& !"".equals(openhubProject.getDescription())
-								&& openhubProject.getCodeRepository() != null
-								&& !openhubProject.getCodeRepository().contains(
+								&& openhubProject.getCode_repository() != null
+								&& !openhubProject.getCode_repository().contains(
 										"add a code location")) { // openhub的筛选条件为name、description不为空，且该项目有版本库
 								lastProjectDao.updateFiltratedPrj(project.getId(),
 										1); // 筛选标识从0变为1，表示该项目经过筛选新增的
diff --git a/project_manager/src/main/resource/applicationContext-myBatis.xml b/project_manager/src/main/resource/applicationContext-myBatis.xml
index 992a3e477..d75abb8e7 100644
--- a/project_manager/src/main/resource/applicationContext-myBatis.xml
+++ b/project_manager/src/main/resource/applicationContext-myBatis.xml
@@ -39,9 +39,9 @@
 		destroy-method="close">
 		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
 		<property name="url"
-			value="jdbc:mysql://localhost:3306/ossean_new?characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull&amp;autoReconnect=true" />
+			value="jdbc:mysql://localhost:3306/ossean_production?characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull&amp;autoReconnect=true" />
 		<property name="username" value="root" />
-		<property name="password" value="123456" />
+		<property name="password" value="1234" />
 		<property name="validationQuery" value="SELECT 1" />
   		<property name="testOnBorrow" value="true"/>
 	</bean>