修复设置worker时，ID为空的问题

Author: Dot-Liu

config/config.go

@@ -2,14 +2,15 @@ package config
 
 import (
 	"fmt"
-	"github.com/eolinker/eosc/env"
-	"github.com/eolinker/eosc/log"
-	"github.com/ghodss/yaml"
 	"net"
 	"net/url"
 	"os"
 	"strconv"
 	"strings"
+
+	"github.com/eolinker/eosc/env"
+	"github.com/eolinker/eosc/log"
+	"github.com/ghodss/yaml"
 )
 
 const (
@@ -197,13 +198,52 @@ func initial(c *NConfig) {
 		}
 	}
 	c.Peer.AdvertiseUrls = parseHostName(c.Peer.AdvertiseUrls)
+
 	if len(c.Client.AdvertiseUrls) == 0 {
 		c.Client.AdvertiseUrls = createAdvertiseUrls(c.Client.ListenUrls)
+
 	}
 	c.Client.AdvertiseUrls = parseHostName(c.Client.AdvertiseUrls)
+
 	if len(c.Gateway.AdvertiseUrls) == 0 {
 		c.Gateway.AdvertiseUrls = createAdvertiseUrls(c.Gateway.ListenUrls)
-	}
 
+	}
 	c.Gateway.AdvertiseUrls = parseHostName(c.Gateway.AdvertiseUrls)
+
+	hosts := extractHosts(c.Peer.AdvertiseUrls)
+	if len(hosts) > 0 {
+		env.SetEnv("PEER_ADVERTISE_HOSTS", strings.Join(hosts, ","))
+	}
+	hosts = extractHosts(c.Client.AdvertiseUrls)
+	if len(hosts) > 0 {
+		env.SetEnv("CLIENT_ADVERTISE_HOSTS", strings.Join(hosts, ","))
+	}
+	hosts = extractHosts(c.Gateway.AdvertiseUrls)
+	if len(hosts) > 0 {
+		env.SetEnv("GATEWAY_ADVERTISE_HOSTS", strings.Join(hosts, ","))
+	}
+}
+
+func extractHosts(addrs []string) []string {
+	var hosts []string
+	hostMap := map[string]struct{}{}
+	for _, u := range addrs {
+		parsedURL, err := url.Parse(u)
+		if err != nil {
+			log.Errorf("parse advertise url(%s) error: %v", u, err)
+			continue
+		}
+		index := strings.Index(parsedURL.Host, ":")
+		host := parsedURL.Host
+		if index >= 0 {
+			host = parsedURL.Host[:index]
+		}
+		if _, ok := hostMap[host]; ok {
+			continue
+		}
+		hostMap[host] = struct{}{}
+		hosts = append(hosts, host)
+	}
+	return hosts
 }

eoscli/extender.go

@@ -322,7 +322,7 @@ package eoscli
 //		}
 //		log.Debugf("name： %s\n", extends.FormatProject(group, project))
 //		log.Debugf("version： %s %s\n", info.Version, isLatest)
-//		log.Debugf("description：%s\n", info.Description)
+//		log.Debugf("description：%s\n", info.Title)
 //		log.Debugf("download url：%s\n", info.URL)
 //		log.Debugf("install to run：%s extender install %s\n", os.Args[0], info.ID)
 //	}

open-api/proxy.go

@@ -2,9 +2,10 @@ package open_api
 
 import (
 	"encoding/json"
+	"net/http"
+
 	"github.com/eolinker/eosc/log"
 	"github.com/julienschmidt/httprouter"
-	"net/http"
 )
 
 type OpenApiHandler interface {
@@ -40,7 +41,7 @@ func CreateHandler(handler OpenApiHandler) httprouter.Handle {
 
 			case string:
 				data = []byte(d)
-				log.Debug("handler write string:", string(d))
+				log.Debug("handler write string:", d)
 
 			case []byte:
 				data = d

process-admin/api-http/openapi-worker-save.go

@@ -183,6 +183,7 @@ func (oe *WorkerApi) Save(r *http.Request, params httprouter.Params) (status int
 		cb.Version = admin.GenVersion()
 	}
 	cb.Profession = profession
+	cb.Id, _ = eosc.ToWorkerId(name, profession)
 	cb.Name = name
 	cb.Update = eosc.Now()
 	cb.Create = eosc.Now()
@@ -196,7 +197,9 @@ func (oe *WorkerApi) Save(r *http.Request, params httprouter.Params) (status int
 		out = w
 		return nil
 	})
-
+	if err != nil {
+		return http.StatusInternalServerError, nil, err
+	}
 	return http.StatusOK, nil, out.Detail()
 }
 

setting/setting.go

@@ -3,12 +3,13 @@ package setting
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/eolinker/eosc"
-	"github.com/eolinker/eosc/common/bean"
-	"github.com/eolinker/eosc/log"
 	"reflect"
 	"strings"
 	"sync"
+
+	"github.com/eolinker/eosc"
+	"github.com/eolinker/eosc/common/bean"
+	"github.com/eolinker/eosc/log"
 )
 
 var (
@@ -79,7 +80,7 @@ func (s *tSettings) GetConfigBody(name string) ([]byte, bool) {
 //					Create:      eosc.Now(),
 //					Update:      eosc.Now(),
 //					Body:        outputBody,
-//					Description: "",
+//					Title: "",
 //				},
 //			}
 //			delete = nil