From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev
---
ruoyi-admin/pom.xml | 143 +++++++++++++++++++++++++++--------------------
1 files changed, 82 insertions(+), 61 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index fbb5c44..9e97804 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
- <groupId>com.ruoyi</groupId>
- <version>4.3.0-beta1</version>
+ <groupId>org.dromara</groupId>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -17,66 +17,104 @@
<dependencies>
- <!-- spring-boot-devtools -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
- </dependency>
-
<!-- Mysql椹卞姩鍖� -->
<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>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
- <!-- 鏍稿績妯″潡-->
+<!-- <!– mp鏀寔鐨勬暟鎹簱鍧囨敮鎸� 鍙渶瑕佸鍔犲搴旂殑jdbc渚濊禆鍗冲彲 –>-->
+<!-- <!– Oracle –>-->
+<!-- <dependency>-->
+<!-- <groupId>com.oracle.database.jdbc</groupId>-->
+<!-- <artifactId>ojdbc8</artifactId>-->
+<!-- </dependency>-->
+<!-- <!– 鍏煎oracle浣庣増鏈� –>-->
+<!-- <dependency>-->
+<!-- <groupId>com.oracle.database.nls</groupId>-->
+<!-- <artifactId>orai18n</artifactId>-->
+<!-- </dependency>-->
+<!-- <!– PostgreSql –>-->
+<!-- <dependency>-->
+<!-- <groupId>org.postgresql</groupId>-->
+<!-- <artifactId>postgresql</artifactId>-->
+<!-- </dependency>-->
+<!-- <!– SqlServer –>-->
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.sqlserver</groupId>-->
+<!-- <artifactId>mssql-jdbc</artifactId>-->
+<!-- </dependency>-->
+
<dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-framework</artifactId>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-common-social</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-common-ratelimiter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-common-mail</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-oss</artifactId>
</dependency>
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId>
</dependency>
<!-- demo妯″潡 -->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
</dependency>
+
+ <!-- 宸ヤ綔娴佹ā鍧� -->
+ <dependency>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-workflow</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-client</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>
@@ -87,9 +125,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
- <configuration>
- <fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
- </configuration>
<executions>
<execution>
<goals>
@@ -100,30 +135,16 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.2</version>
+ <version>${maven-war-plugin.version}</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