Commit 0f84de0c authored by 雍欢's avatar 雍欢

修复:com.huigou.data.dialect.Dialect#getTotleFieldsSql 没有加表别名导致MySQL查询出错

parent ae810cb7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-common</artifactId> <artifactId>huigou-common</artifactId>
<name>huigou-common</name> <name>huigou-common</name>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-core-api</artifactId> <artifactId>huigou-core-api</artifactId>
<name>huigou-core-api</name> <name>huigou-core-api</name>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-core-impl</artifactId> <artifactId>huigou-core-impl</artifactId>
<name>huigou-core-impl</name> <name>huigou-core-impl</name>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-core-proxy</artifactId> <artifactId>huigou-core-proxy</artifactId>
<name>huigou-core-proxy</name> <name>huigou-core-proxy</name>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-data</artifactId> <artifactId>huigou-data</artifactId>
<name>huigou-data</name> <name>huigou-data</name>
......
...@@ -304,7 +304,7 @@ public enum Dialect { ...@@ -304,7 +304,7 @@ public enum Dialect {
sb.append("sum(").append(fieldName).append(") as ").append(fieldName).append(","); sb.append("sum(").append(fieldName).append(") as ").append(fieldName).append(",");
} }
sb.replace(sb.length() - 1, sb.length(), ""); sb.replace(sb.length() - 1, sb.length(), "");
sb.append(" from (").append(sql).append(")"); sb.append(" from (").append(sql).append(") __t__");
return sb.toString(); return sb.toString();
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-loader</artifactId> <artifactId>huigou-loader</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-system-common</artifactId> <artifactId>huigou-system-common</artifactId>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-uasp</artifactId> <artifactId>huigou-uasp</artifactId>
<name>huigou-uasp</name> <name>huigou-uasp</name>
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
<dependency> <dependency>
<groupId>com.topsunit</groupId> <groupId>com.topsunit</groupId>
<artifactId>query-spring</artifactId> <artifactId>query-spring</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
</parent> </parent>
<artifactId>huigou-xt</artifactId> <artifactId>huigou-xt</artifactId>
<name>huigou-xt</name> <name>huigou-xt</name>
......
pub.db.url=jdbc:mysql://192.168.3.57:3306/bpmtest?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false pub.db.url=jdbc:mysql://192.168.222.108:3306/ssrf?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
pub.db.user=topsun pub.db.user=root
pub.db.password=topsunit.com pub.db.password=topsunit.com
log.db.url=jdbc:mysql://192.168.3.57:3306/bpmtest?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false log.db.url=jdbc:mysql://192.168.222.108:3306/ssrf?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
log.db.user=topsun log.db.user=root
log.db.password=topsunit.com log.db.password=topsunit.com
shiro.host=127.0.0.1 shiro.host=127.0.0.1
shiro.port=6379 shiro.port=6379
shiro.expire=18000 shiro.expire=18000
shiro.passwod=1233
system.dataSource=dataSource system.dataSource=dataSource
system.hibernate.dialect=com.huigou.data.dialect.MySQL5InnoDBDialect system.hibernate.dialect=com.huigou.data.dialect.MySQL5InnoDBDialect
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<!-- test --> <!-- test -->
<junit.version>4.9</junit.version> <junit.version>4.9</junit.version>
<spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version> <spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version>
<huigou.uasp.version>1.2.1</huigou.uasp.version> <huigou.uasp.version>1.2.2</huigou.uasp.version>
<classgraph.version>4.8.43</classgraph.version> <classgraph.version>4.8.43</classgraph.version>
<fastjson.version>1.2.59</fastjson.version> <fastjson.version>1.2.59</fastjson.version>
</properties> </properties>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment