Server:同步idea版至eclipse版

TommyLemon · TommyLemon · commit 51272e664f07 · 2017-04-11T21:46:33.000+08:00
diff --git a/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Pair.java b/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Pair.java
@@ -110,7 +110,7 @@ public static Entry<String, String> parseEntry(String pair, boolean isRightValue
 	 * "key":null不应该出现？因为FastJSON内默认不存null
 	 * @param pair leftKey:rightValue
 	 * @param isRightValueDefault 右边值缺省，当pair不包含 : 时默认整个pair为leftKey；false-相反
-	 * @param defaultKey 缺省值
+	 * @param defaultValue 缺省值
 	 * @return @NonNull
 	 */
 	public static Entry<String, String> parseEntry(String pair, boolean isRightValueDefault, String defaultValue) {
diff --git a/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Parser.java b/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Parser.java
@@ -987,8 +987,8 @@ private void updateRelation(String path, String replacePath) {
 	}
 
 	/**将已获取完成的object的内容替换requestObject里对应的值
-	 * @param valuePath object的路径
-	 * @param value 需要被关联的object
+	 * @param path object的路径
+	 * @param result 需要被关联的object
 	 */
 	private synchronized void putQueryResult(String path, Object result) {
 		Log.i(TAG, "\n putQueryResult  valuePath = " + path + "; result = " + result + "\n <<<<<<<<<<<<<<<<<<<<<<<");
diff --git a/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/sql/QueryHelper.java b/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/sql/QueryHelper.java
@@ -59,7 +59,6 @@ private synchronized Connection getConnection() throws Exception {
 		return DriverManager.getConnection(YOUR_MYSQL_URL + YOUR_MYSQL_SCHEMA, YOUR_MYSQL_ACCOUNT, YOUR_MYSQL_PASSWORD);
 	}
 
-	//TODO key应该改成SQL
 	private synchronized void saveCache(String sql, Map<Integer, JSONObject> map) {
 		if (sql == null || map == null || map.isEmpty()) {
 			Log.i(TAG, "saveList  sql == null || map == null || map.isEmpty() >> return;");
@@ -180,6 +179,12 @@ public JSONObject select(QueryConfig config) throws Exception {
 			Object value;
 			Object json;
 			for (int i = 0; i < columnArray.length; i++) {
+				if (columnArray[i] == null || columnArray[i].isEmpty() || columnArray[i].startsWith("_")) {
+					Log.i(TAG, "select while (rs.next()){ ..."
+							+ " >>  columnArray[i] == " + columnArray[i]
+							+ " >> continue;");
+					continue;
+				}//允许 key:_alias, 但不允许_key, _key:alias
 				columnArray[i] = Pair.parseEntry(columnArray[i]).getValue();
 				try {
 					value = rs.getObject(rs.findColumn(columnArray[i]));
