[ Cmii ] [ Octopus ] - Image Function fix bugs

server/src/main/java/io/wdd/func/auto/service/ImageFuncScheduler.java

@@ -49,7 +49,7 @@ public class ImageFuncScheduler {
         arrayList.add(""); //imageFullName
         arrayList.add("/var/lib/docker/octopus_image/"); //gzipFolderPrefix
         arrayList.add(""); //gzipFileName
-        arrayList.add("https://oss.demo.uavcmlc.com:18000/cmlc-installation/tmp/");//ossUrlPrefix
+        arrayList.add("https://oss.demo.uavcmlc.com/cmlc-installation/tmp/");//ossUrlPrefix
         arrayList.add("");//proxyUrl
         arrayList.add(imageSyncContext.getProjectMasterNode().getServerIpInV4());//targetHarborHost
         arrayList.add(imageSyncContext.getProjectInfoPO().getProjectNamespace());//namespace
@@ -96,6 +96,8 @@ public class ImageFuncScheduler {
             return;
         }
 
+        log.info("prepare to update {} {} \n{}", imageSyncContext.getProjectInfoPO().getProjectNamespace(), imageSyncContext.getProjectMasterNode().getServerIpInV4(), realFullNameList);
+
         String innerWorkerAgentName = imageSyncContext.getInnerWorkerAgentName();
         Assert.notNull(innerWorkerAgentName, "inner worker agent name cant not be null !");
 

server/src/main/java/io/wdd/rpc/config/RedisConfig.java

@@ -0,0 +1,16 @@
+package io.wdd.rpc.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.redis")
+    JedisConnectionFactory jedisConnectionFactory() {
+        return new JedisConnectionFactory();
+    }
+}

server/src/main/java/io/wdd/rpc/config/RedisConfiguration.java

@@ -15,6 +15,8 @@ public class RedisConfiguration {
 
         RedisTemplate<String, String> redisTemplate = new RedisTemplate<>();
 
+        // 2024年4月7日
+
         redisTemplate.setConnectionFactory(redisConnectionFactory);
 
         GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer();

server/src/main/java/io/wdd/rpc/message/handler/OMessageHandler.java

@@ -118,9 +118,10 @@ public class OMessageHandler {
             );
 
             log.info(
-                    "接收到的 matchKey为 {}, 内容为 {}",
+                    "接收到的 matchKey为 {}\n, 结果为 [{}] \n内容为: {}\n ",
                     matchKey,
-                    replayOMessage
+                    replayOMessage.getResultCode(),
+                    replayOMessage.getResult()
             );
 
             if (!FROM_AGENT_MATCH_TO_AGENT_MAP.containsKey(matchKey)) {
@@ -141,6 +142,7 @@ public class OMessageHandler {
             originOMessage.setResultCode(replayOMessage.getResultCode());
             originOMessage.setResult(replayOMessage.getResult());
 
+
             // 通知等待线程
             oMessageReplayContent
                     .getCountDownLatch()

server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java

@@ -60,10 +60,12 @@ public class OMessageToAgentSender {
 
     public void send(OctopusMessage octopusMessage) {
 
-        log.debug(
-                "OctopusMessage {} send to agent {}",
-                octopusMessage,
-                octopusMessage.getUuid()
+        log.info(
+                "OM Sender to {} Time {} \n OctopusMessageType为 {}\nFunctionContent为 {}",
+                octopusMessage.getUuid(),
+                octopusMessage.getInit_time(),
+                octopusMessage.getOctopusMessageType(),
+                octopusMessage.getContent()
         );
 
         // 统一处理Content

server/src/main/resources/application.yml

@@ -44,7 +44,6 @@ spring:
         time-between-eviction-runs: 50000
 
 
-
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8

server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java

@@ -38,16 +38,17 @@ public class TestImageSyncScheduler {
     public void runImageSync() {
 
         ArrayList<String> CmiiAppNameList = new ArrayList<>(List.of(
-//                "harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.3.0-cqly-032802"
+                "cmii-uav-process:5.4.0-040701"
         ));
 
         ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
-                "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032802"
+//                "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032802"
         ));
 
-        Boolean downloadAndCompressOnly = true;
+        Boolean downloadAndCompressOnly = false;
 
-        String projectNamespace = "wdd";
+//        String projectNamespace = "wdd"; // wdd
+        String projectNamespace = "cqlyj"; // cqlyj
 
 //        String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd
         String innerWorkerAgentName = "Chengdu-amd64-71-3571gd"; //prod