Merge branch 'master' into deploy

pull/875/head
Jie Zheng 2025-01-25 14:43:42 +08:00
commit caaf155905
2 changed files with 6 additions and 4 deletions

View File

@ -21,11 +21,14 @@ import org.redisson.Redisson;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.config.Config; import org.redisson.config.Config;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Data @Data
@Configuration @Configuration
@AutoConfigureBefore(RedisAutoConfiguration.class)
public class RedissonConfiguration { public class RedissonConfiguration {
@Value("${spring.redis.host}") @Value("${spring.redis.host}")

View File

@ -133,12 +133,11 @@
<version>1.5.22</version> <version>1.5.22</version>
</dependency> </dependency>
<!--Mysql依赖包--> <!--Mysql依赖包-->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>com.mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>8.0.31</version> <version>9.2.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>