Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
test
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
邬友楠
test
Commits
0f84de0c
Commit
0f84de0c
authored
Apr 15, 2020
by
雍欢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复:com.huigou.data.dialect.Dialect#getTotleFieldsSql 没有加表别名导致MySQL查询出错
parent
ae810cb7
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
18 additions
and
17 deletions
+18
-17
pom.xml
huigou-common/pom.xml
+1
-1
pom.xml
huigou-core-api/pom.xml
+1
-1
pom.xml
huigou-core-impl/pom.xml
+1
-1
pom.xml
huigou-core-proxy/pom.xml
+1
-1
pom.xml
huigou-data/pom.xml
+1
-1
Dialect.java
...u-data/src/main/java/com/huigou/data/dialect/Dialect.java
+1
-1
pom.xml
huigou-loader/pom.xml
+1
-1
pom.xml
huigou-system-common/pom.xml
+1
-1
pom.xml
huigou-uasp/pom.xml
+2
-2
pom.xml
huigou-xt/pom.xml
+1
-1
application.properties
huigou-xt/src/main/resources/application.properties
+5
-4
pom.xml
pom.xml
+2
-2
No files found.
huigou-common/pom.xml
View file @
0f84de0c
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-common
</artifactId>
<name>
huigou-common
</name>
...
...
huigou-core-api/pom.xml
View file @
0f84de0c
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-core-api
</artifactId>
<name>
huigou-core-api
</name>
...
...
huigou-core-impl/pom.xml
View file @
0f84de0c
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-core-impl
</artifactId>
<name>
huigou-core-impl
</name>
...
...
huigou-core-proxy/pom.xml
View file @
0f84de0c
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-core-proxy
</artifactId>
<name>
huigou-core-proxy
</name>
...
...
huigou-data/pom.xml
View file @
0f84de0c
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-data
</artifactId>
<name>
huigou-data
</name>
...
...
huigou-data/src/main/java/com/huigou/data/dialect/Dialect.java
View file @
0f84de0c
...
...
@@ -304,7 +304,7 @@ public enum Dialect {
sb
.
append
(
"sum("
).
append
(
fieldName
).
append
(
") as "
).
append
(
fieldName
).
append
(
","
);
}
sb
.
replace
(
sb
.
length
()
-
1
,
sb
.
length
(),
""
);
sb
.
append
(
" from ("
).
append
(
sql
).
append
(
")"
);
sb
.
append
(
" from ("
).
append
(
sql
).
append
(
")
__t__
"
);
return
sb
.
toString
();
}
...
...
huigou-loader/pom.xml
View file @
0f84de0c
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-loader
</artifactId>
<packaging>
jar
</packaging>
...
...
huigou-system-common/pom.xml
View file @
0f84de0c
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-system-common
</artifactId>
...
...
huigou-uasp/pom.xml
View file @
0f84de0c
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-uasp
</artifactId>
<name>
huigou-uasp
</name>
...
...
@@ -348,7 +348,7 @@
<dependency>
<groupId>
com.topsunit
</groupId>
<artifactId>
query-spring
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</dependency>
</dependencies>
<build>
...
...
huigou-xt/pom.xml
View file @
0f84de0c
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
</parent>
<artifactId>
huigou-xt
</artifactId>
<name>
huigou-xt
</name>
...
...
huigou-xt/src/main/resources/application.properties
View file @
0f84de0c
pub.db.url
=
jdbc:mysql://192.168.
3.57:3306/bpmtest
?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
pub.db.user
=
topsun
pub.db.url
=
jdbc:mysql://192.168.
222.108:3306/ssrf
?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
pub.db.user
=
root
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.user
=
topsun
log.db.url
=
jdbc:mysql://192.168.
222.108:3306/ssrf
?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
log.db.user
=
root
log.db.password
=
topsunit.com
shiro.host
=
127.0.0.1
shiro.port
=
6379
shiro.expire
=
18000
shiro.passwod
=
1233
system.dataSource
=
dataSource
system.hibernate.dialect
=
com.huigou.data.dialect.MySQL5InnoDBDialect
...
...
pom.xml
View file @
0f84de0c
...
...
@@ -6,7 +6,7 @@
<groupId>
com.huigou
</groupId>
<artifactId>
root
</artifactId>
<version>
1.2.
1
</version>
<version>
1.2.
2
</version>
<packaging>
pom
</packaging>
<modules>
...
...
@@ -158,7 +158,7 @@
<!-- test -->
<junit.version>
4.9
</junit.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>
<fastjson.version>
1.2.59
</fastjson.version>
</properties>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment