From d868d6c8f188fef4a0b6b63a269efb67d5429081 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 12 四月 2023 22:18:29 +0800
Subject: [PATCH] fix 修复 test 表租户id没有设置默认值问题
---
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index 3e745cb..a95a04a 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -3,13 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ruoyi-extend</artifactId>
- <groupId>com.ruoyi</groupId>
- <version>4.2.0-beta1</version>
+ <groupId>org.dromara</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>ruoyi-xxl-job-admin</artifactId>
<packaging>jar</packaging>
<properties>
+ <spring-boot.version>2.7.8</spring-boot.version>
+ <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
+ <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
</properties>
<dependencyManagement>
@@ -56,21 +60,27 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+
<!-- mybatis-starter锛歮ybatis + mybatis-spring + hikari锛坉efault锛� -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${spring-boot.mybatis}</version>
+ <version>${mybatis-spring-boot.version}</version>
</dependency>
<!-- mysql -->
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
+ <version>${spring-boot-admin.version}</version>
</dependency>
<!-- xxl-job-core -->
@@ -95,27 +105,6 @@
</goals>
</execution>
</executions>
- </plugin>
- <!-- docker -->
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker.plugin.version}</version>
- <configuration>
- <!-- made of '[a-z0-9-_.]' -->
- <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>
- <directory>${project.build.directory}</directory>
- <include>${project.build.finalName}.jar</include>
- </resource>
- </resources>
- </configuration>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3