diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2594a4d7ffe964a41ffbb95dce5e7465fcd7fb04..2650732668cf80faa82ff6ae3e6219de4346762d 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 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 646469f395a7d0081e01ae58b661f2bafd7ace2b..1149cf57648be3bb972bdd61b037f959f7710dbc 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 +}