diff --git a/.run/Agent-Dev-LapPro-Ubuntu.run.xml b/.run/Agent-Dev-LapPro-Ubuntu.run.xml
deleted file mode 100644
index cc4b0c2..0000000
--- a/.run/Agent-Dev-LapPro-Ubuntu.run.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.run/Agent-dev-1.run.xml b/.run/Agent-dev-1.run.xml
deleted file mode 100644
index cb65223..0000000
--- a/.run/Agent-dev-1.run.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.run/Agent-dev-oracle-s5.run.xml b/.run/Agent-dev-oracle-s5.run.xml
deleted file mode 100644
index 98bef8c..0000000
--- a/.run/Agent-dev-oracle-s5.run.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.run/Server-k3s.run.xml b/.run/Server-k3s.run.xml
deleted file mode 100644
index e47d4e0..0000000
--- a/.run/Server-k3s.run.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/agent-go/executor/RealTimeExecutor_test.go b/agent-go/executor/RealTimeExecutor_test.go
index ae0ea65..715fbf6 100644
--- a/agent-go/executor/RealTimeExecutor_test.go
+++ b/agent-go/executor/RealTimeExecutor_test.go
@@ -8,6 +8,6 @@ func TestReadTimeOutput(t *testing.T) {
"/root/simple.sh",
}
- ReadTimeOutput(strings)
+ ReadTimeCommandExecutor(strings)
}
diff --git a/agent-go/main.go b/agent-go/main.go
index 30ecb80..8ed778d 100644
--- a/agent-go/main.go
+++ b/agent-go/main.go
@@ -4,7 +4,6 @@ import (
"agent-go/g"
logger2 "agent-go/logger"
"agent-go/register"
- "agent-go/status"
"flag"
"fmt"
)
@@ -13,14 +12,6 @@ var log = logger2.Log
func main() {
- // 测试调用CPU状态
- getCpuMap, err := status.GetCpuMap()
- if err != nil {
- log.ErrorF("error is %v", err)
- }
-
- log.InfoF("cpu status is %v", getCpuMap)
-
// 解析命令行参数
var version string
flag.StringVar(&version, "version", "", "config file version")
diff --git a/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml b/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
new file mode 100644
index 0000000..8934227
--- /dev/null
+++ b/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
@@ -0,0 +1,58 @@
+version: '2.1'
+
+services:
+ mysql:
+ # https://hub.docker.com/r/bitnami/mysql
+ image: bitnami/mysql:8.0.32-debian-11-r12
+ ports:
+ - '21306:3306'
+ volumes:
+ #- '/octopus-server/mysql/data:/bitnami/mysql/data'
+ - 'mysql_data:/bitnami/mysql/data'
+ #- '/octopus-server/mysql/nacos-2.2.0-initdb.sql:/docker-entrypoint-initdb.d/nacos-2.2.0-initdb.sql'
+ # - '/octopus-server/mysql/wdd-server.sql:/docker-entrypoint-initdb.d/wdd-server.sql'
+ networks:
+ - app-tier
+ environment:
+ - MYSQL_ROOT_USER=boge
+ - MYSQL_ROOT_PASSWORD=boge8tingH
+ - MYSQL_CHARACTER_SET=utf8mb4
+ - MYSQL_COLLATE:utf8_general_ci
+ - MYSQL_AUTHENTICATION_PLUGIN=mysql_native_password
+ healthcheck:
+ test: [ 'CMD', '/opt/bitnami/scripts/mysql/healthcheck.sh' ]
+ interval: 15s
+ timeout: 5s
+ retries: 6
+ rabbitmq:
+ # https://hub.docker.com/r/bitnami/rabbitmq
+ image: docker.io/bitnami/rabbitmq:3.11.10-debian-11-r0
+ ports:
+ - '4369'
+ - '5551'
+ - '5552'
+ - '20672:5672'
+ - '25672'
+ - '20678:15672'
+ environment:
+ - RABBITMQ_VHOST=/
+ - RABBITMQ_VHOSTS=/dev
+ - RABBITMQ_USERNAME=boge
+ - RABBITMQ_PASSWORD=boge8tingH
+ - RABBITMQ_SECURE_PASSWORD=no
+ - RABBITMQ_LOAD_DEFINITIONS=no
+ - RABBITMQ_NODE_PORT_NUMBER=5672
+ - RABBITMQ_NODE_SSL_PORT_NUMBER=5671
+ - RABBITMQ_MANAGEMENT_PORT_NUMBER=15672
+ volumes:
+ - 'rabbitmq_data:/bitnami/rabbitmq/mnesia'
+
+volumes:
+ mysql_data:
+ driver: local
+ rabbitmq_data:
+ driver: local
+
+networks:
+ app-tier:
+ driver: bridge
\ No newline at end of file