diff --git a/db/Dockerfile b/db/Dockerfile index b286c6427..7a99ac1e5 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:8.0.19 +FROM mysql:8.0.20 MAINTAINER lengleng(wangiegie@gmail.com) diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 6b4e8b043..2179e5f62 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -21,10 +21,12 @@ 3.3.1 3.0.0 1.1.21 - 8.0.19 + 8.0.20 1.5.22 3.7.0 1.2.0 + 3.0.3 + 2.3.6.RELEASE 1.2.67 3.0.52.ALL @@ -118,6 +120,11 @@ mybatis-plus-boot-starter ${mybatis-plus.version} + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-ds.version} + com.alibaba @@ -158,6 +165,7 @@ weixin-java-common ${mp.weixin.version} + com.github.javen205 IJPay @@ -168,10 +176,17 @@ alipay-sdk-java ${aliyun.version} + - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-ds.version} + org.codehaus.groovy + groovy + ${groovy.version} + + + + org.springframework.security.oauth + spring-security-oauth2 + ${security.oauth.version} diff --git a/pom.xml b/pom.xml index 956daadd9..1d0853834 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,6 @@ 2.11.4 6.0.13 2.2.0 - 2.3.6.RELEASE 5.22.0 172.17.0.111 http://172.17.0.111:2375 @@ -111,6 +110,15 @@ + + + com.pig4cloud + pigx-common-bom + ${project.version} + pom + import + + org.springframework.boot spring-boot-dependencies @@ -118,6 +126,7 @@ pom import + org.springframework.cloud spring-cloud-dependencies @@ -125,13 +134,6 @@ pom import - - com.pig4cloud - pigx-common-bom - ${project.version} - pom - import - com.alibaba.cloud @@ -140,12 +142,6 @@ pom import - - - org.springframework.security.oauth - spring-security-oauth2 - ${security.oauth.version} - org.springframework.boot