Merge remote-tracking branch 'origin/test'

src/main/java/com/ekexiu/portal/service/ArticleService.java

@@ -956,7 +956,7 @@ public class ArticleService {
	}
	@Get
	@Path("/publish")
	@Path("/publish1")
	public List<Article> proPublish(@JdbcConn Connection con, String category, String owner, @DefaultValue("\"9\"") String publishTime,@DefaultValue("Long.MAX_VALUE")long shareId, int rows)throws SQLException {
			return this.articleDao.publish(con,category, owner, publishTime,shareId, rows);
	}