Server: 调整 Join 类的 表名 和 请求对象 分别对应的 变量名，避免和其它类不一致导致误解

Author: TommyLemon

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java

@@ -1002,12 +1002,12 @@ else if (join != null){
 			j.setOriginKey(key);
 			j.setOriginValue(targetPath);
 			j.setJoinType(joinType);
-			j.setName(table);
+			j.setTable(table);
 			j.setAlias(alias);
 			j.setTargetName(targetTable);
 			j.setTargetKey(targetKey);
 			j.setKeyAndType(key);
-			j.setTable(getJoinObject(table, tableObj, key));
+			j.setRequest(getJoinObject(table, tableObj, key));
 			j.setOutter((JSONObject) e.getValue());
 
 			joinList.add(j);

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java

@@ -2492,21 +2492,21 @@ public static AbstractSQLConfig parseJoin(RequestMethod method, AbstractSQLConfi
 		}
 
 
-		String name;
+		String table;
 		String alias;
 		for (Join j : joinList) {
-			name = j.getName();
+			table = j.getTable();
 			alias = j.getAlias();
 			//JOIN子查询不能设置LIMIT，因为ON关系是在子查询后处理的，会导致结果会错误
-			SQLConfig joinConfig = newSQLConfig(method, name, alias, j.getTable(), null, false, callback);
-			SQLConfig cacheConfig = newSQLConfig(method, name, alias, j.getTable(), null, false, callback).setCount(1);
+			SQLConfig joinConfig = newSQLConfig(method, table, alias, j.getRequest(), null, false, callback);
+			SQLConfig cacheConfig = newSQLConfig(method, table, alias, j.getRequest(), null, false, callback).setCount(1);
 
 			if (j.isAppJoin() == false) { //除了 @ APP JOIN，其它都是 SQL JOIN，则副表要这样配置
 				if (joinConfig.getDatabase() == null) {
 					joinConfig.setDatabase(config.getDatabase()); //解决主表 JOIN 副表，引号不一致
 				}
 				else if (joinConfig.getDatabase().equals(config.getDatabase()) == false) {
-					throw new IllegalArgumentException("主表 " + config.getTable() + " 的 @database:" + config.getDatabase() + " 和它 SQL JOIN 的副表 " + name + " 的 @database:" + joinConfig.getDatabase() + " 不一致！");
+					throw new IllegalArgumentException("主表 " + config.getTable() + " 的 @database:" + config.getDatabase() + " 和它 SQL JOIN 的副表 " + table + " 的 @database:" + joinConfig.getDatabase() + " 不一致！");
 				}
 				if (joinConfig.getSchema() == null) {
 					joinConfig.setSchema(config.getSchema()); //主表 JOIN 副表，默认 schema 一致
@@ -2521,7 +2521,7 @@ else if (joinConfig.getDatabase().equals(config.getDatabase()) == false) {
 				joinConfig.setMain(false).setKeyPrefix(true);
 
 				if (j.isLeftOrRightJoin()) {
-					SQLConfig outterConfig = newSQLConfig(method, name, alias, j.getOutter(), null, false, callback);
+					SQLConfig outterConfig = newSQLConfig(method, table, alias, j.getOutter(), null, false, callback);
 					outterConfig.setMain(false).setKeyPrefix(true).setDatabase(joinConfig.getDatabase()).setSchema(joinConfig.getSchema()); //解决主表 JOIN 副表，引号不一致
 					j.setOutterConfig(outterConfig);
 				}

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/Join.java

@@ -30,8 +30,8 @@ public class Join {
 
 	private String joinType; // "@" - APP, "&" - INNER, "|" - FULL, "!" - OUTTER, "<" - LEFT, ">" - RIGHT, "^" - SIDE, "*" - CROSS
 	private String relateType; // "" - 一对一, "{}" - 一对多, "<>" - 多对一
-	private JSONObject table; // { "id@":"/Moment/userId" }
-	private String name; //User
+	private JSONObject request; // { "id@":"/Moment/userId" }
+	private String table; //User
 	private String alias; //owner
 	private String key; //id
 	private String targetName; // Moment
@@ -76,23 +76,23 @@ public void setRelateType(String relateType) {
 		this.relateType = relateType;
 	}
 
-	public String getName() {
-		return name;
+	public String getTable() {
+		return table;
 	}
-	public void setName(String name) {
-		this.name = name;
+	public void setTable(String table) {
+		this.table = table;
 	}
 	public String getAlias() {
 		return alias;
 	}
 	public void setAlias(String alias) {
 		this.alias = alias;
 	}
-	public JSONObject getTable() {
-		return table;
+	public JSONObject getRequest() {
+		return request;
 	}
-	public void setTable(JSONObject table) {
-		this.table = table;
+	public void setRequest(JSONObject request) {
+		this.request = request;
 	}
 	public String getKey() {
 		return key;
@@ -146,7 +146,7 @@ public void setKeyAndType(@NotNull String originKey) throws Exception { //id, id
 			originKey = originKey.substring(0, originKey.length() - 1);
 		}
 		else { //TODO 暂时只允许 User.id = Moment.userId 字段关联，不允许 User.id = 82001 这种
-			throw new IllegalArgumentException(joinType + "/.../" + name + "/" + originKey + " 不合法！join:'.../refKey'" + " 中 refKey 必须以 @ 结尾！");
+			throw new IllegalArgumentException(joinType + "/.../" + table + "/" + originKey + " 不合法！join:'.../refKey'" + " 中 refKey 必须以 @ 结尾！");
 		}
 
 		if (originKey.endsWith("{}")) {