From ffe29d09c72a0c56802d55395edbcfbfb3ba7c5d Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 2 Aug 2022 08:37:46 +0000 Subject: [PATCH 1/2] update .gitlab-ci.yml. --- .gitlab-ci.yml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2594a4d7..26507326 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,19 +14,34 @@ variables: .services-for-maven-tests: services: - - name: redis:latest + - name: hub.docker.iec.io/library/redis:5 alias: redis - - name: postgres:10 + - name: hub.docker.iec.io/library/postgres:10 alias: postgres - .refs-to-review: only: refs: + - main - master + - 1.0.x -.refs-to-publish: +.refs-to-publish-snapshot: only: refs: + - main - master + - 1.0.x + +.refs-to-publish-release: + only: + refs: - tags + +.refs-to-publish: + only: + refs: + - main + - master + - 1.0.x + - tags \ No newline at end of file -- Gitee From d9dd419fd6bde1257f8e083875a00e5aa8b612ff Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Thu, 4 Aug 2022 09:57:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fixed=20378e9e1=20from=20https://gitee.com/?= =?UTF-8?q?ubml/caf-boot/pulls/3=20=E7=A6=81=E7=94=A8Redis=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E4=B8=8BRedis=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=B1=8F?= =?UTF-8?q?=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/iec/edp/caf/context/spi/RedisExclusion.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/caf-boot-starters/caf-boot-starter-context/src/main/java/io/iec/edp/caf/context/spi/RedisExclusion.java b/caf-boot-starters/caf-boot-starter-context/src/main/java/io/iec/edp/caf/context/spi/RedisExclusion.java index 646469f3..1149cf57 100644 --- a/caf-boot-starters/caf-boot-starter-context/src/main/java/io/iec/edp/caf/context/spi/RedisExclusion.java +++ b/caf-boot-starters/caf-boot-starter-context/src/main/java/io/iec/edp/caf/context/spi/RedisExclusion.java @@ -23,7 +23,8 @@ public class RedisExclusion implements AutoConfigurationExclusion { //如果是不启用Redis，则移除掉RedissonAutoConfigure类 if ("false".equals(CafEnvironment.getEnvironment().getProperty("redis.enabled"))) { list.add("org.redisson.spring.starter.RedissonAutoConfiguration"); + list.add("org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration"); } return list; } -} \ No newline at end of file +} -- Gitee