Server：APIJSONORM 解决 SQL 函数中参数的 : 被转成 AS；APIJSONBoot：数据库 URI 改为 localhost

TommyLemon · TommyLemon · commit e3a748e056c9 · 2019-10-27T16:29:34.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLConfig.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLConfig.java
@@ -89,13 +89,13 @@ public String getDBVersion() {
 	@Override
 	public String getDBUri() {
 		if (isMySQL()) {
-			return "jdbc:mysql://apijson.cn:3306"; //TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000
+			return "jdbc:mysql://localhost:3306"; //TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000
 		}
 		if (isPostgreSQL()) {
 			return "jdbc:postgresql://localhost:5432/postgres"; //TODO 改成你自己的
 		}
 		if (isSQLServer()) {
-			return "jdbc:jtds:sqlserver://apijson.org:1433/pubs;instance=SQLEXPRESS"; //TODO 改成你自己的
+			return "jdbc:jtds:sqlserver://localhost:1433/pubs;instance=SQLEXPRESS"; //TODO 改成你自己的
 		}
 		if (isOracle()) {
 			return "jdbc:oracle:thin:@localhost:1521:orcl"; //TODO 改成你自己的
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
@@ -929,7 +929,7 @@ else if (StringUtil.isName(origin)) {
 			}
 
 			String c = StringUtil.getString(keys);
-			c = (c.contains(":") == false ? c : c.replaceAll(":", " AS ")) + (StringUtil.isEmpty(joinColumn, true) ? "" : ", " + joinColumn);//不能在这里改，后续还要用到:
+			c = c + (StringUtil.isEmpty(joinColumn, true) ? "" : ", " + joinColumn);//不能在这里改，后续还要用到:
 			return isMain() && isDistinct() ? PREFFIX_DISTINCT + c : c;
 		default:
 			throw new UnsupportedOperationException(

Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,13 @@ public String getDBVersion() {`
`89`	`89`	`@Override`
`90`	`90`	`public String getDBUri() {`
`91`	`91`	`if (isMySQL()) {`
`92`		`- return "jdbc:mysql://apijson.cn:3306"; //TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000`
	`92`	`+ return "jdbc:mysql://localhost:3306"; //TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000`
`93`	`93`	`}`
`94`	`94`	`if (isPostgreSQL()) {`
`95`	`95`	`return "jdbc:postgresql://localhost:5432/postgres"; //TODO 改成你自己的`
`96`	`96`	`}`
`97`	`97`	`if (isSQLServer()) {`
`98`		`- return "jdbc:jtds:sqlserver://apijson.org:1433/pubs;instance=SQLEXPRESS"; //TODO 改成你自己的`
	`98`	`+ return "jdbc:jtds:sqlserver://localhost:1433/pubs;instance=SQLEXPRESS"; //TODO 改成你自己的`
`99`	`99`	`}`
`100`	`100`	`if (isOracle()) {`
`101`	`101`	`return "jdbc:oracle:thin:@localhost:1521:orcl"; //TODO 改成你自己的`
Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ else if (StringUtil.isName(origin)) {`
`929`	`929`	`}`
`930`	`930`
`931`	`931`	`String c = StringUtil.getString(keys);`
`932`		`- c = (c.contains(":") == false ? c : c.replaceAll(":", " AS ")) + (StringUtil.isEmpty(joinColumn, true) ? "" : ", " + joinColumn);//不能在这里改，后续还要用到:`
	`932`	`+ c = c + (StringUtil.isEmpty(joinColumn, true) ? "" : ", " + joinColumn);//不能在这里改，后续还要用到:`
`933`	`933`	`return isMain() && isDistinct() ? PREFFIX_DISTINCT + c : c;`
`934`	`934`	`default:`
`935`	`935`	`throw new UnsupportedOperationException(`