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

src/main/java/com/uas/platform/b2c/advertise/news/service/impl/NewsServiceImpl.java

@@ -49,10 +49,9 @@ public class NewsServiceImpl implements NewsService {
 
 	@Override
 	public JSONObject getNewsListByPage(int page, int pageSize) {
-//		if (page <= 0) page = 1;
-//		String url = conf.getRequestUrlForNews( "/news/created/v2?pagenumber=" + page +"&pagesize=" + pageSize + "&taxonomySlug=B2C");
-//		return getDataFromRedisByUrl(url);
-		return new JSONObject();
+		if (page <= 0) page = 1;
+		String url = conf.getRequestUrlForNews( "/news/created/v2?pagenumber=" + page +"&pagesize=" + pageSize + "&taxonomySlug=B2C");
+		return getDataFromRedisByUrl(url);
 	}
 
 	@Override