From bcbc9d7adc88e9d8a2771e17515ee2c3060aa7be Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 28 Oct 2022 21:01:57 +0800
Subject: [PATCH] 修复table中更多按钮切换主题色未生效修复问题
---
pom.xml | 83 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3341db9..1be9464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,40 +6,38 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.3.0</version>
+ <version>3.6.1</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.3.0</ruoyi.version>
+ <ruoyi.version>3.6.1</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <spring-boot.version>2.5.8</spring-boot.version>
- <spring-cloud.version>2020.0.4</spring-cloud.version>
- <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
- <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
- <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
- <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
+ <spring-boot.version>2.7.3</spring-boot.version>
+ <spring-cloud.version>2021.0.4</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
+ <spring-boot-admin.version>2.7.5</spring-boot-admin.version>
+ <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
<swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version>
<kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.4.0</pagehelper.boot.version>
- <druid.version>1.2.8</druid.version>
- <dynamic-ds.version>3.5.0</dynamic-ds.version>
+ <pagehelper.boot.version>1.4.5</pagehelper.boot.version>
+ <druid.version>1.2.12</druid.version>
+ <dynamic-ds.version>3.5.2</dynamic-ds.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<velocity.version>2.3</velocity.version>
- <fastjson.version>1.2.79</fastjson.version>
+ <fastjson.version>2.0.15</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
- <common-pool.version>2.10.0</common-pool.version>
<commons-collections.version>3.2.2</commons-collections.version>
- <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+ <transmittable-thread-local.version>2.13.2</transmittable-thread-local.version>
</properties>
<!-- 依赖声明 -->
@@ -64,13 +62,6 @@
<scope>import</scope>
</dependency>
- <!-- Alibaba Nacos 配置 -->
- <dependency>
- <groupId>com.alibaba.nacos</groupId>
- <artifactId>nacos-client</artifactId>
- <version>${alibaba.nacos.version}</version>
- </dependency>
-
<!-- SpringBoot 依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -78,13 +69,6 @@
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
- </dependency>
-
- <!-- SpringBoot 监控客户端 -->
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-client</artifactId>
- <version>${spring-boot-admin.version}</version>
</dependency>
<!-- FastDFS 分布式文件系统 -->
@@ -164,8 +148,8 @@
<!-- JSON 解析器和生成器 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
<version>${fastjson.version}</version>
</dependency>
@@ -181,13 +165,6 @@
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>${transmittable-thread-local.version}</version>
- </dependency>
-
- <!-- 公共资源池 -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${common-pool.version}</version>
</dependency>
<!-- 核心模块 -->
@@ -222,6 +199,13 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datasource</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!-- 分布式事务 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-seata</artifactId>
<version>${ruoyi.version}</version>
</dependency>
@@ -281,4 +265,29 @@
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
\ No newline at end of file
--
Gitblit v1.9.3