From c7840a73825da4034cdd231702ec5d16bcc92930 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Thu, 19 May 2022 23:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=B8=8E=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E5=BA=93=E5=90=8D=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=20nacos=E6=9C=8D=E5=8A=A1=E6=A8=A1=E5=9D=97=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg-boot-base-core/pom.xml | 15 --------------- jeecg-boot/jeecg-boot-module-system/pom.xml | 9 +++++++++ .../jeecg-cloud-nacos/pom.xml | 1 + .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- jeecg-boot/pom.xml | 17 ++++++++++++++++- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml index 3d0c2ffa..6aa643d0 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml @@ -106,21 +106,6 @@ dynamic-datasource-spring-boot-starter ${dynamic-datasource-spring-boot-starter.version} - - org.hibernate - hibernate-core - - - commons-collections - commons-collections - - - - - org.jeecgframework.boot - hibernate-re - 3.2.0-beta - diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml index db303589..7e2de71b 100644 --- a/jeecg-boot/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot/jeecg-boot-module-system/pom.xml @@ -34,6 +34,15 @@ org.jeecgframework.boot jeecg-system-local-api + + org.hibernate + hibernate-core + + + org.jeecgframework.boot + hibernate-re + + org.jeecgframework diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml index f8f44595..87105e58 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml @@ -5,6 +5,7 @@ jeecg-cloud-nacos jeecg-cloud-nacos nacos启动模块 + 3.2.0 diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml index 8dd004de..05842505 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml @@ -11,7 +11,7 @@ spring: # 设置 账号数据源配置 account: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3300/jeecg-account?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/jeecg_account?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false username: root password: root schema: classpath:sql/schema-account.sql diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml index edad7dda..a79bb2f1 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml @@ -11,7 +11,7 @@ spring: # 设置 账号数据源配置 order: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3300/jeecg-order?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/jeecg_order?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false username: root password: root schema: classpath:sql/schema-order.sql diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml index 58b811f8..b38c4d87 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml @@ -11,7 +11,7 @@ spring: # 设置 账号数据源配置 product: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3300/jeecg-product?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/jeecg_product?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false username: root password: root schema: classpath:sql/schema-product.sql diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index 2eb1b2a6..0fe1c7f1 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -203,7 +203,22 @@ jeecg-boot-starter-shardingsphere ${jeecgboot.version} - + + org.hibernate + hibernate-core + 5.6.7.Final + + + commons-collections + commons-collections + + + + + org.jeecgframework.boot + hibernate-re + 3.2.0-beta +