From 0e75aa6250b4e244b83823e3fd7d941e84c2897d Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 20 九月 2022 10:45:06 +0800 Subject: [PATCH] !235 update 多排序参数支持 Merge pull request !235 from 抓蛙师/auto-7465549-dev-e641f38b --- ruoyi-admin/pom.xml | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 94ac14d..be5e8ea 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>3.5.0</version> + <version>4.3.0</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -28,6 +28,21 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> + </dependency> + <!-- Oracle --> + <dependency> + <groupId>com.oracle.database.jdbc</groupId> + <artifactId>ojdbc8</artifactId> + </dependency> + <!-- PostgreSql --> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + <!-- SqlServer --> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>mssql-jdbc</artifactId> </dependency> <!-- 鏍稿績妯″潡--> @@ -90,25 +105,6 @@ <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> <warName>${project.artifactId}</warName> - </configuration> - </plugin> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>${docker.plugin.version}</version> - <configuration> - <imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName> - <dockerDirectory>${project.basedir}</dockerDirectory> - <dockerHost>${docker.registry.host}</dockerHost> - <registryUrl>${docker.registry.url}</registryUrl> - <serverId>${docker.registry.url}</serverId> - <resources> - <resource> - <targetPath>/</targetPath> - <directory>${project.build.directory}</directory> - <include>${project.build.finalName}.jar</include> - </resource> - </resources> </configuration> </plugin> </plugins> -- Gitblit v1.9.3