From c7c9bd6b08c9da9749a74929e9f9ae4a39b334ed Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 04 十一月 2021 18:49:46 +0800
Subject: [PATCH] fix 修复 用户逻辑删除 差异问题
---
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index c0ff2fa..a2b198f 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -4,10 +4,15 @@
<parent>
<artifactId>ruoyi-extend</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</parent>
<artifactId>ruoyi-xxl-job-admin</artifactId>
<packaging>jar</packaging>
+
+ <properties>
+ <mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
+ <mysql-connector-java.version>8.0.23</mysql-connector-java.version>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -70,12 +75,12 @@
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
- <version>${xxl-job-core-version}</version>
</dependency>
</dependencies>
<build>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -89,15 +94,30 @@
</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>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.4.13</version>
+ <version>${docker.plugin.version}</version>
<configuration>
<!-- made of '[a-z0-9-_.]' -->
- <imageName>${project.artifactId}:${project.version}</imageName>
+ <imageName>${docker.namespace}/${project.artifactId}:${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>
--
Gitblit v1.9.3