From a3ecc71558bbbc8243a4fdefff252ca3bc2234a2 Mon Sep 17 00:00:00 2001
From: Yjoioooo <5403234+zj_Gitttttttte@user.noreply.gitee.com>
Date: 星期四, 09 三月 2023 17:54:55 +0800
Subject: [PATCH] !301 fix 修复 租户套餐导出接口地址错误 修复 删除弹窗提示错误 fix 修复 租户套餐导出接口地址错误 fix 修复 删除弹窗提示错误
---
ruoyi-admin/pom.xml | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 234ff0b..c792d02 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,8 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>4.3.1</version>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -16,13 +17,6 @@
</description>
<dependencies>
-
- <!-- spring-boot-devtools -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
- </dependency>
<!-- Mysql椹卞姩鍖� -->
<dependency>
@@ -45,10 +39,9 @@
<artifactId>mssql-jdbc</artifactId>
</dependency>
- <!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-framework</artifactId>
+ <artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
@@ -61,11 +54,6 @@
<artifactId>ruoyi-job</artifactId>
</dependency>
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-oss</artifactId>
- </dependency>
-
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -76,6 +64,11 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
<dependency>
@@ -105,9 +98,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>
@@ -118,8 +108,13 @@
</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>
--
Gitblit v1.9.3