diff --git a/backend/constants/register.go b/backend/constants/register.go new file mode 100644 index 00000000..ad38e7a3 --- /dev/null +++ b/backend/constants/register.go @@ -0,0 +1,7 @@ +package constants + +const ( + RegisterTypeMac = "mac" + RegisterTypeIp = "ip" + RegisterTypeHostname = "hostname" +) diff --git a/backend/model/node.go b/backend/model/node.go index 88c4ed66..51cd5d7e 100644 --- a/backend/model/node.go +++ b/backend/model/node.go @@ -20,6 +20,7 @@ type Node struct { Ip string `json:"ip" bson:"ip"` Port string `json:"port" bson:"port"` Mac string `json:"mac" bson:"mac"` + Hostname string `json:"hostname" bson:"hostname"` Description string `json:"description" bson:"description"` // 用于唯一标识节点,可能是mac地址,可能是ip地址 Key string `json:"key" bson:"key"` diff --git a/backend/scripts/install-java.sh b/backend/scripts/install-java.sh old mode 100644 new mode 100755 index d01d0247..c42a2901 --- a/backend/scripts/install-java.sh +++ b/backend/scripts/install-java.sh @@ -4,8 +4,7 @@ touch /tmp/install-java.lock # install java -apt-get update -apt-get install -y default-jdk +apt-get update && apt-get install -y default-jdk ln -s /usr/bin/java /usr/local/bin/java # unlock diff --git a/backend/services/node.go b/backend/services/node.go index d6124205..f189ddb3 100644 --- a/backend/services/node.go +++ b/backend/services/node.go @@ -161,6 +161,14 @@ func UpdateNodeData() { log.Errorf(err.Error()) return } + + // 获取Hostname + hostname, err := register.GetRegister().GetHostname() + if err != nil { + log.Errorf(err.Error()) + return + } + // 获取redis的key key, err := register.GetRegister().GetKey() if err != nil { diff --git a/backend/services/register/register.go b/backend/services/register/register.go index ed4e1891..bbdec2f3 100644 --- a/backend/services/register/register.go +++ b/backend/services/register/register.go @@ -1,6 +1,7 @@ package register import ( + "crawlab/constants" "github.com/apex/log" "github.com/spf13/viper" "net" @@ -108,9 +109,9 @@ func GetRegister() Register { } registerType := viper.GetString("server.register.type") - if registerType == "mac" { + if registerType == constants.RegisterTypeMac { register = &MacRegister{} - } else { + } else if registerType == constants.RegisterTypeIp { ip := viper.GetString("server.register.ip") if ip == "" { log.Error("server.register.ip is empty") @@ -120,6 +121,7 @@ func GetRegister() Register { register = &IpRegister{ Ip: ip, } + } else if registerType == constants.RegisterTypeHostname { } log.Info("register type is :" + reflect.TypeOf(register).String())