From e47dcb10decfb156048ec20d80442fbaa38d94f2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 25 十月 2021 18:03:44 +0800 Subject: [PATCH] fix 修复原生 任务调度中心 集成之后 字体图标被过滤问题 --- pom.xml | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index be718eb..afa5105 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <jwt.version>0.9.1</jwt.version> <mybatis-plus.version>3.4.3.4</mybatis-plus.version> <p6spy.version>3.9.1</p6spy.version> - <hutool.version>5.7.13</hutool.version> + <hutool.version>5.7.14</hutool.version> <feign.version>3.0.3</feign.version> <feign-okhttp.version>11.6</feign-okhttp.version> <okhttp.version>4.9.1</okhttp.version> @@ -36,8 +36,8 @@ <redisson.version>3.16.3</redisson.version> <lock4j.version>2.2.1</lock4j.version> <dynamic-ds.version>3.4.1</dynamic-ds.version> - <tlog.version>1.3.2</tlog.version> - <xxl-job-core-version>2.3.0</xxl-job-core-version> + <tlog.version>1.3.3</tlog.version> + <xxl-job.version>2.3.0</xxl-job.version> <!-- jdk11 缂哄け渚濊禆 jaxb--> <jaxb.version>3.0.1</jaxb.version> @@ -45,8 +45,8 @@ <!-- OSS 閰嶇疆 --> <qiniu.version>7.8.0</qiniu.version> <aliyun.oss.version>3.13.1</aliyun.oss.version> - <qcloud.cos.version>5.6.55</qcloud.cos.version> - <minio.version>8.3.0</minio.version> + <qcloud.cos.version>5.6.58</qcloud.cos.version> + <minio.version>8.3.1</minio.version> <!-- docker 閰嶇疆 --> <docker.registry.url>localhost</docker.registry.url> @@ -209,6 +209,13 @@ <version>${lock4j.version}</version> </dependency> + <!-- xxl-job-core --> + <dependency> + <groupId>com.xuxueli</groupId> + <artifactId>xxl-job-core</artifactId> + <version>${xxl-job.version}</version> + </dependency> + <dependency> <groupId>com.yomahub</groupId> <artifactId>tlog-spring-boot-configuration</artifactId> @@ -237,10 +244,23 @@ <version>${tlog.version}</version> </dependency> - <!-- 瀹氭椂浠诲姟 @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job --> + <dependency> + <groupId>com.yomahub</groupId> + <artifactId>tlog-xxl-job</artifactId> + <version>${tlog.version}</version> + </dependency> + + <!-- 瀹氭椂浠诲姟 @deprecated 3.4.0鍒犻櫎 杩佺Щ鑷硏xl-job --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-quartz</artifactId> + <version>${ruoyi-vue-plus.version}</version> + </dependency> + + <!-- 瀹氭椂浠诲姟 --> + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-job</artifactId> <version>${ruoyi-vue-plus.version}</version> </dependency> @@ -272,7 +292,7 @@ <version>${ruoyi-vue-plus.version}</version> </dependency> - <!-- demo妯″潡 --> + <!-- OSS瀵硅薄瀛樺偍妯″潡 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-oss</artifactId> @@ -294,6 +314,7 @@ <module>ruoyi-framework</module> <module>ruoyi-system</module> <module>ruoyi-quartz</module> + <module>ruoyi-job</module> <module>ruoyi-generator</module> <module>ruoyi-common</module> <module>ruoyi-demo</module> -- Gitblit v1.9.3