Merge branch 'developer' into 'master'

Developer

See merge request !32

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FreeQueryController.java

@@ -196,18 +196,32 @@ public class FreeQueryController {
 					start = sql.indexOf("LIMIT") + 6;
 				}
 				curLimit = sql.substring(start);
-				if(curLimit.indexOf(",") > 0){
-					curLimit = curLimit.substring(curLimit.indexOf(",")+1);
-				}
-				if(Integer.valueOf(curLimit) > 1000){
-					curLimit = 1000+"";
+				int i = curLimit.indexOf(",");
+				if(i > 0){
+					curLimit = curLimit.substring(i+1);
+					if(Integer.parseInt(curLimit.trim()) > 1000){
+						curLimit = 1000+"";
+					}
+					sql = sql.substring(0, start+i+1) + " "+curLimit;
+				} else {
+					if(Integer.parseInt(curLimit.trim()) > 1000){
+						curLimit = 1000+"";
+					}
+					sql = sql.substring(0, start) + " "+curLimit;
 				}
+			} else {
+				sql = sql + " limit " + curLimit;
 			}
-			sql = sql + " limit " + curLimit;
 		}
 		return sql;
 	}
 
+	public static void main(String[] args) {
+		String sql = "SELECT * FROM tab_gic_store limit  10000";
+		String s = new FreeQueryController().parseSql(sql);
+		System.out.println("s = " + s);
+	}
+
 	/** 获取指定表明的所有字段
 	 * @param tableName
 	 * @param request