From 05a4c87022d6161bb33fd73608aa1ce01fc7bf9f Mon Sep 17 00:00:00 2001 From: dengqichen Date: Mon, 26 Aug 2024 13:46:13 +0800 Subject: [PATCH] =?UTF-8?q?nacos=E5=8A=A0=E5=85=A5=E5=88=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=93=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/http/RedisConfiguration.java | 29 ------------------- .../JenkinsDataCacheSynchronizer.java | 13 +++++---- .../adapter/controller/JenkinsController.java | 8 ++--- .../service/impl/JenkinsServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 deploy-ease-basic/src/main/java/com/qc/soft/framework/basic/http/RedisConfiguration.java diff --git a/deploy-ease-basic/src/main/java/com/qc/soft/framework/basic/http/RedisConfiguration.java b/deploy-ease-basic/src/main/java/com/qc/soft/framework/basic/http/RedisConfiguration.java deleted file mode 100644 index 9e46af2..0000000 --- a/deploy-ease-basic/src/main/java/com/qc/soft/framework/basic/http/RedisConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.qc.soft.framework.basic.http; - - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -@Configuration -public class RedisConfiguration { - - - @Bean(name = "stringRedisTemplate") - public RedisTemplate redisTemplate(RedisConnectionFactory factory) { - RedisTemplate redisTemplate = new RedisTemplate<>(); - redisTemplate.setConnectionFactory(factory); - RedisSerializer stringSerializer = new StringRedisSerializer(); - GenericJackson2JsonRedisSerializer serializer = new GenericJackson2JsonRedisSerializer(); - redisTemplate.setKeySerializer(stringSerializer); - redisTemplate.setValueSerializer(serializer); - redisTemplate.setHashKeySerializer(stringSerializer); - redisTemplate.setHashValueSerializer(serializer); - return redisTemplate; - } - -} diff --git a/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/api/thirdparty/JenkinsDataCacheSynchronizer.java b/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/api/thirdparty/JenkinsDataCacheSynchronizer.java index 4d1ee44..bb8ca99 100644 --- a/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/api/thirdparty/JenkinsDataCacheSynchronizer.java +++ b/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/api/thirdparty/JenkinsDataCacheSynchronizer.java @@ -49,11 +49,11 @@ public class JenkinsDataCacheSynchronizer { @EventListener(ApplicationReadyEvent.class) public void firstSyncCheck() { log.info("The adapter checks if the item is initialized"); - ThirdPartyJenkinsResponse redisValue = (ThirdPartyJenkinsResponse) redisTemplate.opsForValue().get(REDIS_JENKINS_ORIGINAL_VIEW); - if (redisValue != null) { - log.info("Instead of initializing the project, the jenkins information will be incrementally synchronized"); - return; - } +// ThirdPartyJenkinsResponse redisValue = (ThirdPartyJenkinsResponse) redisTemplate.opsForValue().get(REDIS_JENKINS_ORIGINAL_VIEW); +// if (redisValue != null) { +// log.info("Instead of initializing the project, the jenkins information will be incrementally synchronized"); +//// return; +// } CompletableFuture future = CompletableFuture.runAsync(this::views, executorService) .thenRun(this::viewDetail) .thenRun(this::job) @@ -103,6 +103,9 @@ public class JenkinsDataCacheSynchronizer { @Scheduled(cron = "15 * * * * ?") public void job() { List cacheViewsDetail = getCacheViewsDetail(); + if (CollectionUtils.isEmpty(cacheViewsDetail)) { + return; + } ExecutorService viewPool = Executors.newFixedThreadPool(cacheViewsDetail.size(), r -> { Thread thread = new Thread(r); thread.setName("jenkins-sync-view-thread-" + System.currentTimeMillis()); diff --git a/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/controller/JenkinsController.java b/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/controller/JenkinsController.java index 4b3ef01..48176bd 100644 --- a/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/controller/JenkinsController.java +++ b/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/controller/JenkinsController.java @@ -65,10 +65,10 @@ public class JenkinsController { // return Flux.interval(Duration.ofSeconds(2)).map(index -> jenkinsService.aggregate()); // } -// @GetMapping(value = "jenkins/aggregate") -// public JenkinsAggregateResponse aggregate() { -// return jenkinsService.aggregate(); -// } + @GetMapping(value = "jenkins/aggregate") + public JenkinsAggregateResponse aggregate() { + return jenkinsService.aggregate(); + } // // // @GetMapping(value = "/events", produces = MediaType.TEXT_EVENT_STREAM_VALUE) diff --git a/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/service/impl/JenkinsServiceImpl.java b/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/service/impl/JenkinsServiceImpl.java index ca21b39..0412d7d 100644 --- a/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/service/impl/JenkinsServiceImpl.java +++ b/deploy-ease-tenant-adapter/src/main/java/com/qc/soft/deploy/ease/adapter/service/impl/JenkinsServiceImpl.java @@ -100,7 +100,7 @@ public class JenkinsServiceImpl implements IJenkinsService { } aggregate.setViews(viewsAggregate); stopWatch.stop(); - log.info("Elapsed time in seconds:{}", stopWatch.getTotalTimeSeconds()); + log.info("Jenkins aggregate elapsed time in seconds:{}", stopWatch.getTotalTimeSeconds()); return aggregate; }