zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/local-dev' into local-dev

Browse Source 
# Conflicts:
#	agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
#	agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java
This commit is contained in:
zeaslity
2023-02-28 17:13:40 +08:00
parent 00858e9184 fbcff7ee42
commit e4595a537a
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java
View File

@@ -14,7 +14,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.concurrent.ArrayBlockingQueue;
@Configuration @Configuration
@Slf4j(topic = "Octopus Message Handler") @Slf4j(topic = "Octopus Message Handler")
@@ -60,7 +59,6 @@ public class OMessageHandlerServer {
octopusMessage octopusMessage
); );
// 获取Agent的版本信息 // 获取Agent的版本信息
if (octopusMessage if (octopusMessage
.getUuid() .getUuid()