查找方法条件修改；prod配置文件导入

donate-console/src/main/java/com/uas/console/donate/controller/ProjectController.java

@@ -252,9 +252,26 @@ public class ProjectController {
         return projectService.getDisagreedProjects(pageInfo, filter);
     }
 
+    /**
+     * 获取项目详情
+     * @param id
+     * @return
+     */
     @RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
     @ResponseBody
     public Project getProjectDetail(@PathVariable("id") Long id) {
         return projectService.findOne(id);
     }
+
+    /**
+     * 保存基本信息
+     * @param json
+     * @return
+     */
+
+    @RequestMapping(value = "/save/baseInfo", method = RequestMethod.POST)
+    public Project saveBaseInfo(@RequestBody String json) {
+        Project project = JSONObject.parseObject(json, Project.class);
+        return projectService.save(project);
+    }
 }

donate-console/src/main/java/com/uas/console/donate/model/SearchFilter.java

@@ -14,7 +14,7 @@ public class SearchFilter {
 	/**
 	 * 捐赠领域
 	 */
-	private Short area;
+	private String area;
 	/**
 	 * 开始日期
 	 */
@@ -84,11 +84,11 @@ public class SearchFilter {
 		this.endPrice = endPrice;
 	}
 
-	public Short getArea() {
+	public String getArea() {
 		return area;
 	}
 
-	public void setArea(Short area) {
+	public void setArea(String area) {
 		this.area = area;
 	}
 }

donate-console/src/main/java/com/uas/console/donate/service/impl/ProjectServiceImpl.java

@@ -162,7 +162,7 @@ public class ProjectServiceImpl implements ProjectService {
                                 PredicateUtils.like("orgName", keyword, false)));
                     }
                     // 默认全部分类设置值为0
-                    if (null != filter.getArea() && 0 != filter.getArea()) {
+                    if (null != filter.getArea() && !"".equals(filter.getArea()) && !"全部".equals(filter.getArea())) {
                         pageInfo.expression(PredicateUtils.eq("area", filter.getArea(), false));
                     }
                 }

donate-console/src/main/resources/config/application-prod.properties

@@ -0,0 +1,58 @@
+datasource.url=jdbc:mysql://192.168.253.12:3306/donate?characterEncoding=utf-8
+datasource.username=root
+datasource.password=select111***
+datasource.driverClassName=com.mysql.jdbc.Driver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+security.basic.enabled=true
+security.basic.path=/service
+security.user.name=admin
+security.user.password=select111***
+security.user.role=ADMIN
+security.ignored=false
+
+## message config
+message.send.url=http://message.ubtob.com/sms/send
+message.tplInvitationForB2B=
+message.msgInvitationForB2B=
+
+
+
+### sso config
+#sso.app=donate
+## token secretkey
+#sso.secretkey=
+#sso.cookie.domain=.ubtob.com
+#sso.cookie.secure=false
+#sso.login.url=https://account.ubtob.com/sso/login
+
+
+
+spring.jpa.hibernate.show-sql= true  
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.dialect=org.hibernate.dialect.5DiGlect  
+spring.jackson.serialization.indent_output=false  
+
+zk.url=zookeeper://10.10.100.11:2181
+dubbo.owner=prod
+dubbo.group=prod
+
+#设定ftl文件路径
+spring.freemarker.template-loader-path=classpath:/templates
+#设定静态文件路径，js,css等
+spring.mvc.static-path-pattern=/static/*
+spring.freemarker.cache=false

donate-service/src/main/java/com/uas/service/donate/model/SearchFilter.java

@@ -14,7 +14,7 @@ public class SearchFilter {
 	/**
 	 * 捐赠领域
 	 */
-	private Short area;
+	private String area;
 	/**
 	 * 开始日期
 	 */
@@ -84,11 +84,11 @@ public class SearchFilter {
 		this.endPrice = endPrice;
 	}
 
-	public Short getArea() {
+	public String getArea() {
 		return area;
 	}
 
-	public void setArea(Short area) {
+	public void setArea(String area) {
 		this.area = area;
 	}
 }

donate-service/src/main/java/com/uas/service/donate/service/impl/ProjectServiceImpl.java

@@ -103,7 +103,7 @@ public class ProjectServiceImpl implements ProjectService {
                                 PredicateUtils.like("orgName", keyword, false)));
                     }
                     // 默认全部分类设置值为0
-                    if (null != filter.getArea() && 0 != filter.getArea()) {
+                    if (null != filter.getArea() && !"".equals(filter.getArea()) && !"全部".equals(filter.getArea())) {
                         pageInfo.expression(PredicateUtils.eq("area", filter.getArea(), false));
                     }
                 }

donate-service/src/main/resources/config/application-prod.properties

@@ -0,0 +1,58 @@
+datasource.url=jdbc:mysql://192.168.253.12:3306/donate?characterEncoding=utf-8
+datasource.username=root
+datasource.password=select111***
+datasource.driverClassName=com.mysql.jdbc.Driver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+security.basic.enabled=true
+security.basic.path=/service
+security.user.name=admin
+security.user.password=select111***
+security.user.role=ADMIN
+security.ignored=false
+
+## message config
+message.send.url=http://message.ubtob.com/sms/send
+message.tplInvitationForB2B=
+message.msgInvitationForB2B=
+
+
+
+### sso config
+#sso.app=donate
+## token secretkey
+#sso.secretkey=
+#sso.cookie.domain=.ubtob.com
+#sso.cookie.secure=false
+#sso.login.url=https://account.ubtob.com/sso/login
+
+
+
+spring.jpa.hibernate.show-sql= true  
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.dialect=org.hibernate.dialect.5DiGlect  
+spring.jackson.serialization.indent_output=false  
+
+zk.url=zookeeper://10.10.100.11:2181
+dubbo.owner=prod
+dubbo.group=prod
+
+#设定ftl文件路径
+spring.freemarker.template-loader-path=classpath:/templates
+#设定静态文件路径，js,css等
+spring.mvc.static-path-pattern=/static/*
+spring.freemarker.cache=false