Merge remote-tracking branch 'origin/dev' into test

src/main/java/com/ekexiu/portal/dao/ArticleDao.java

@@ -853,7 +853,7 @@ public abstract class ArticleDao {
	@Exclude("articleContent")
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC ")
	@Where("STATUS='1'")
	public abstract PageQueryResult<Article> queryFind(Connection con, Integer colNum, int pageSize, int pageNo) throws SQLException;
	public abstract PageQueryResult<Article> queryFind(Connection con, Integer colNum,@Nullable @In(include=false) String[] articleId, int pageSize, int pageNo) throws SQLException;
	@LimitSelect
	@Exclude("articleContent")

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

@@ -898,8 +898,8 @@ public class ArticleService {
	
	@Path("/find")
	@Get
	public PageQueryResult<Article> find(@JdbcConn Connection con,@DefaultValue("0") int col,@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
			return this.articleDao.queryFind(con,col>0?col:null, pageSize, pageNo);
	public PageQueryResult<Article> find(@JdbcConn Connection con,@DefaultValue("0") int col,@Nullable String[] exclude,@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
			return this.articleDao.queryFind(con,col>0?col:null,exclude, pageSize, pageNo);
	}
	@Path("/lastestPublished")
	@Get