Server:解决HEAD查总数且字段取别名时校验不通过报错，导致不能同时查总数及有别名的数据

TommyLemon · TommyLemon · commit 791f19b57229 · 2019-03-30T17:24:32.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
@@ -502,13 +502,20 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
 		case HEAD:
 		case HEADS: //StringUtil.isEmpty(column, true) || column.contains(",") 时SQL.count(column)会return "*"
 			if (isPrepared() && column != null) {
+				String origin;
+				String alias;
+				int index;
 				for (String c : column) {
-					if (StringUtil.isName(c) == false) {
-						throw new IllegalArgumentException("HEAD请求: @column:value 中 value里面用 , 分割的每一项都必须是1个单词！");
+					index = c.lastIndexOf(":"); //StringUtil.split返回数组中，子项不会有null
+					origin = index < 0 ? c : c.substring(0, index);
+					alias = index < 0 ? null : c.substring(index + 1);
+					if (StringUtil.isName(origin) == false || (alias != null && StringUtil.isName(alias) == false)) {
+						throw new IllegalArgumentException("HEAD请求: 预编译模式下 @column:value 中 value里面用 , 分割的每一项"
+								+ " column:alias 中 column 必须是1个单词！如果有alias，则alias也必须为1个单词！并且不要有多余的空格！");
 					}
 				}
 			}
-			return SQL.count(column != null && column.size() == 1 ? getKey(column.get(0)) : "*");
+			return SQL.count(column != null && column.size() == 1 ? getKey(Pair.parseEntry(column.get(0), true).getKey()) : "*");
 		case POST:
 			if (column == null || column.isEmpty()) {
 				throw new IllegalArgumentException("POST 请求必须在Table内设置要保存的 key:value ！");
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java
@@ -218,7 +218,7 @@ public JSONObject execute(SQLConfig config) throws Exception {
 				// 	viceColumnStart = i;
 				// }
 
-				// FIXME bugfix-修复非常规数据库字段，获取表名失败导致输出异常
+				// bugfix-修复非常规数据库字段，获取表名失败导致输出异常
 				if (hasJoin && viceColumnStart > length) {
 					List<String> column = config.getColumn();
 
@@ -242,11 +242,11 @@ else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
 		rs.close();
 
 
-		//TODO @ APP JOIN 查询副表并缓存到 childMap <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		// @ APP JOIN 查询副表并缓存到 childMap <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 		executeAppJoin(config, resultMap, childMap);
 
-		//TODO @ APP JOIN 查询副表并缓存到 childMap >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+		// @ APP JOIN 查询副表并缓存到 childMap >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
 
