diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 0242bb0a..d919c256 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -16,7 +16,7 @@ 2.4.1 2023.0.3.3 - 2.4.0 + 2.5.0 2.5.1 3.3.5 3.3.1 diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml index 7c84b201..90fa04ef 100644 --- a/ruoyi-visual/ruoyi-seata-server/pom.xml +++ b/ruoyi-visual/ruoyi-seata-server/pom.xml @@ -27,11 +27,10 @@ jar - 2.4.0 + 2.5.0 2.7.18 5.3.39 2.0 - 9.0.105 7.2 3.8.0 1.9.13 @@ -84,11 +83,6 @@ snakeyaml ${snakeyaml-for-server.version} - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat-embed.version} - org.apache.seata seata-dependencies @@ -100,53 +94,23 @@ - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat-embed.version} - - - org.apache.tomcat.embed - tomcat-embed-el - ${tomcat-embed.version} - - - org.apache.tomcat.embed - tomcat-embed-websocket - ${tomcat-embed.version} - - + org.springframework.boot - spring-boot-starter-web - - - log4j-to-slf4j - org.apache.logging.log4j - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.apache.tomcat.embed - tomcat-embed-websocket - - - org.apache.tomcat.embed - tomcat-embed-el - - - org.yaml - snakeyaml - - + spring-boot-starter + + + org.springframework + spring-web org.yaml snakeyaml - + + javax.servlet + javax.servlet-api + org.apache.seata seata-server @@ -161,12 +125,6 @@ ${seata.version} - - org.apache.seata - seata-all - ${seata.version} - - org.apache.seata seata-core @@ -233,7 +191,10 @@ org.postgresql postgresql - + + com.dameng + DmJdbcDriver18 + com.beust jcommander diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/org/apache/seata/core/store/db/AbstractDataSourceProvider.java b/ruoyi-visual/ruoyi-seata-server/src/main/java/org/apache/seata/core/store/db/AbstractDataSourceProvider.java index a1aa3c1d..0e00647f 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/java/org/apache/seata/core/store/db/AbstractDataSourceProvider.java +++ b/ruoyi-visual/ruoyi-seata-server/src/main/java/org/apache/seata/core/store/db/AbstractDataSourceProvider.java @@ -16,7 +16,6 @@ */ package org.apache.seata.core.store.db; -import org.apache.seata.common.ConfigurationKeys; import org.apache.seata.common.exception.ShouldNeverHappenException; import org.apache.seata.common.exception.StoreException; import org.apache.seata.common.executor.Initialize; @@ -24,6 +23,7 @@ import org.apache.seata.common.util.ConfigTools; import org.apache.seata.common.util.StringUtils; import org.apache.seata.config.Configuration; import org.apache.seata.config.ConfigurationFactory; +import org.apache.seata.core.constants.ConfigurationKeys; import org.apache.seata.core.constants.DBType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,12 +62,12 @@ public abstract class AbstractDataSourceProvider implements DataSourceProvider, private static final String MYSQL_DRIVER_FILE_PREFIX = "mysql-connector-j"; - private static final Map MYSQL_DRIVER_LOADERS; + private static final Map DRIVER_LOADERS; private static final long DEFAULT_DB_MAX_WAIT = 5000; static { - MYSQL_DRIVER_LOADERS = createMysqlDriverClassLoaders(); + DRIVER_LOADERS = createMysqlDriverClassLoaders(); } @Override @@ -161,8 +161,7 @@ public abstract class AbstractDataSourceProvider implements DataSourceProvider, } protected ClassLoader getDriverClassLoader() { - return MYSQL_DRIVER_LOADERS.getOrDefault( - getDriverClassName(), this.getClass().getClassLoader()); + return DRIVER_LOADERS.getOrDefault(getDriverClassName(), this.getClass().getClassLoader()); } private static Map createMysqlDriverClassLoaders() { diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml b/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml index 190bf7aa..f20f8368 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml @@ -1,9 +1,11 @@ server: - port: 7091 + port: 8091 spring: application: name: ruoyi-seata-server + main: + web-application-type: none profiles: # 环境配置 active: @profiles.active@ diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.4.0.jar b/ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.4.0.jar deleted file mode 100644 index da7bf12d..00000000 Binary files a/ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.4.0.jar and /dev/null differ diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.5.0.jar b/ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.5.0.jar new file mode 100644 index 00000000..988822d8 Binary files /dev/null and b/ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.5.0.jar differ