From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index c0ff2fa..f71190d 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -9,6 +9,11 @@
<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>
<dependency>
@@ -93,11 +98,14 @@
<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