diff --git a/docs/protocol.md b/docs/protocol.md new file mode 100644 index 0000000000000000000000000000000000000000..dd894bf7f2bc7220cff9caeca25c6c3986f54bdd --- /dev/null +++ b/docs/protocol.md @@ -0,0 +1,73 @@ +# api协议 + +## agent与server通讯协议 + +### 通用字段描述 + +数据格式:json +字段描述: +|名称|类型|说明|是否必须|备注| +|-|-|-|-|-| +|message_id|string|消息id|y|| +|message_type|int|消息类型|y|| +|status|int|消息状态|y|| +|data|object|具体消息数据|y|| + +示例: + + { + "message_id":"xxxxxx", + "message_type":1, + "status":0, + "data":{ + } + } + + +### 心跳 +描述:由agent主动定时发送,server +字段描述: +|名称|类型|说明|是否必须|备注| +|-|-|-|-|-| +|message_type|int|消息类型,1|y|| +|agent_version|string|agent版本字符串|y|| +|up_time|string|xxx格式时间字符串|y|| +示例: + + { + "message_id":"xxxxxx", + "message_type":1, + "status":0, + "data":{ + "agent_version":"v1.1.1", + "agent_uptime":"2021-06-19T09:36:23+08:00" + } + } + +### 系统信息 +描述:获取agent所在机器系统信息 +字段描述: +|名称|类型|说明|是否必须|备注| +|-|-|-|-|-| +|os_name|string|os名称|y|| +|os_pretty_name|string|os名称完整描述|y|| +|os_id|string|os id|y|| +|os_version|string|os版本|y|| +|os_version_id|string|os版本id|y|| +|os_arch|string|os架构|y|| +|kernel_version|string|kernel版本|y|| +|os_uptime|string|os启动时间|y|| +示例: + + { + "message_id":"xxxxxx", + "message_type":1, + "status":0, + "data":{ + "agent_version":"v1.1.1", + "up_time":"2021-06-19T09:36:23+08:00" + } + } + + +## PilotGo server http API 协议 diff --git a/pkg/protocol/message.go b/pkg/protocol/message.go index cb28cf26515ea4b87ee6cef14c7e8d8f4fedacac..20d41949899d828bf442d6b0996c1143e3eff094 100644 --- a/pkg/protocol/message.go +++ b/pkg/protocol/message.go @@ -18,6 +18,7 @@ const ( RunScript = 7 AgentUpdate = 8 AgentUninstall = 9 + Info = 10 ) type Message struct { diff --git a/pkg/service/userservice.go b/pkg/service/userservice.go deleted file mode 100644 index 3070775ded74122c5efcc9e933d1038d1d7a9b0d..0000000000000000000000000000000000000000 --- a/pkg/service/userservice.go +++ /dev/null @@ -1,21 +0,0 @@ -package service - -/** - * @Author: zhang han - * @Date: 2021/11/12 17:22 - * @Description: - */ - -import ( - "openeluer.org/PilotGo/PilotGo/pkg/db" - "openeluer.org/PilotGo/PilotGo/pkg/model" -) - -func GetUserInfoList(info model.PageInfo) (err error, list interface{}, total int) { - limit := info.PageSize - offset := info.PageSize * (info.Page - 1) - var userList []model.User - err = db.DB.Find(&userList).Count(&total).Error - err = db.DB.Limit(limit).Offset(offset).Find(&userList).Error - return err, userList, total -} diff --git a/pkg/utils/command_test.go b/pkg/utils/command_test.go new file mode 100644 index 0000000000000000000000000000000000000000..83eb19715b664041958487a2ea788ff39ff0dd9d --- /dev/null +++ b/pkg/utils/command_test.go @@ -0,0 +1,9 @@ +package utils + +import ( + "testing" +) + +func TestRunCommand(t *testing.T) { + +} diff --git a/pkg/utils/os/cpu.go b/pkg/utils/os/cpu.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/cpu.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/disk.go b/pkg/utils/os/disk.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/disk.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/firewall.go b/pkg/utils/os/firewall.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/firewall.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/memory.go b/pkg/utils/os/memory.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/memory.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/network.go b/pkg/utils/os/network.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/network.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/rpm.go b/pkg/utils/os/rpm.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/rpm.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/service.go b/pkg/utils/os/service.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/service.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/sysctl.go b/pkg/utils/os/sysctl.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/sysctl.go @@ -0,0 +1 @@ +package os diff --git a/pkg/utils/os/system.go b/pkg/utils/os/system.go new file mode 100644 index 0000000000000000000000000000000000000000..c771132aadbd81b3c76e81112782639d7f44b0ec --- /dev/null +++ b/pkg/utils/os/system.go @@ -0,0 +1,11 @@ +package os + +// TODO: 通过 /etc/os-release 文件获取系统信息 +func GetOSInfo() { + +} + +// TODO: 获取系统启动时间,通过 /proc/uptime 获取 +func GetUpTime() { + +} diff --git a/pkg/utils/os/user.go b/pkg/utils/os/user.go new file mode 100644 index 0000000000000000000000000000000000000000..cf1f67e0496206924f10e01798fbbf3562bf1a74 --- /dev/null +++ b/pkg/utils/os/user.go @@ -0,0 +1 @@ +package os