Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mhotel/src/com/happy/action/hotelAction.java

mhotel/src/com/happy/common/http/Get_airticle.java

@@ -7,7 +7,7 @@ import com.happy.Until.HttpUtils;
 
 public class Get_airticle {
 
-    public String get(int page, int rows) throws Exception {
+    public static String get(int page, int rows) throws Exception {
         Gson gson = new Gson();
         String appid = "wx19d0b6ab36feedf4";
         String secret = "309fca4f1a682e6c3d3ecf3b577b0707";
@@ -24,4 +24,8 @@ public class Get_airticle {
         data.put("no_content", 0);
         return HttpsClient.sendJson("https://api.weixin.qq.com/cgi-bin/freepublish/batchget?access_token="+access_token, data);
     }
+
+    public static void main(String[] args) throws Exception {
+        System.out.println(get(1,6));
+    }
 }