From 7aea32f48bf91a432428de6cd98f354e1b112f26 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 02 十二月 2021 18:44:24 +0800
Subject: [PATCH] !118 为Transactional注解设置rollback属性 Merge pull request !118 from zendwang/dev
---
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index fe00af9..29786ee 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>ruoyi-extend</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.2.0</version>
+ <version>3.4.0</version>
</parent>
<artifactId>ruoyi-xxl-job-admin</artifactId>
<packaging>jar</packaging>
@@ -71,6 +71,11 @@
<version>${mysql-connector-java.version}</version>
</dependency>
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-client</artifactId>
+ </dependency>
+
<!-- xxl-job-core -->
<dependency>
<groupId>com.xuxueli</groupId>
@@ -80,6 +85,7 @@
</dependencies>
<build>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -93,6 +99,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+ <nonFilteredFileExtension>jks</nonFilteredFileExtension>
+ <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+ <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
+ </plugin>
<!-- docker -->
<plugin>
<groupId>com.spotify</groupId>
--
Gitblit v1.9.3