diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 2899bd22..161125b0 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -129,13 +129,6 @@ ${project.parent.version} - - net.logstash.logback diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index c752f420..cb829e85 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -98,7 +98,7 @@ spring: # maxPoolSize: 20 # keepAliveSeconds: 60 - # JTA XA 事务(spring boot 3) 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖 + # JTA XA 事务(spring boot 3) jta: enabled: false diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index 1397681f..648af151 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -280,7 +280,7 @@ spring: pathmatch: matching-strategy: ANT_PATH_MATCHER - # JTA XA 事务(spring boot 3) 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖 + # JTA XA 事务(spring boot 3) jta: enabled: false diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 1060eeed..6425fe72 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -220,7 +220,7 @@ jdbc: # ds2: # type: mysql # driver: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://127.0.0.1:3306/jeesite_test?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai # username: root # password: 123456 # testSql: SELECT 1 @@ -280,7 +280,7 @@ spring: pathmatch: matching-strategy: ANT_PATH_MATCHER - # JTA XA 事务(spring boot 3) 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖 + # JTA XA 事务(spring boot 3) jta: enabled: false