From d2b1177580be66dcb3069c8ea268146ccb0cea19 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 15 十二月 2022 14:52:19 +0800
Subject: [PATCH] !263 优化：代码规范 Merge pull request !263 from hzf/dev
---
ruoyi-admin/pom.xml | 68 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index b46acd5..a588f62 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.0.0</version>
+ <version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,8 +26,23 @@
<!-- Mysql椹卞姩鍖� -->
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</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>
<!-- 鏍稿績妯″潡-->
@@ -36,10 +51,14 @@
<artifactId>ruoyi-framework</artifactId>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
+ <artifactId>ruoyi-system</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-job</artifactId>
</dependency>
<dependency>
@@ -58,6 +77,24 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- skywalking 鏁村悎 logback -->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.skywalking</groupId>-->
+<!-- <artifactId>apm-toolkit-logback-1.x</artifactId>-->
+<!-- <version>${涓庝綘鐨刟gent鎺㈤拡鐗堟湰淇濇寔涓�鑷磢</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.skywalking</groupId>-->
+<!-- <artifactId>apm-toolkit-trace</artifactId>-->
+<!-- <version>${涓庝綘鐨刟gent鎺㈤拡鐗堟湰淇濇寔涓�鑷磢</version>-->
+<!-- </dependency>-->
</dependencies>
@@ -82,29 +119,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.2</version>
<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