clearUp Useless

conf/config.go

@@ -1,24 +0,0 @@
-package conf
-
-import "sync"
-
-type Config struct {
-	Name            string
-	Hostname        string
-	PSKPath         string
-	PublicKeyPath   string
-	PrivateKeyPath  string
-	DHTEndpointPort int64
-
-	BootstrapAddress string
-}
-
-var instance *Config
-var once sync.Once
-
-func GetConfig() *Config {
-	once.Do(func() {
-		instance = &Config{}
-	})
-	return instance
-}

controllers/peer.go

@@ -183,7 +183,7 @@ func (o *PeerController) changeRelation(dest *peer.Peer, relation peer.PeerRelat
 				relation = peer.NONE
 			}
 			if _, err := tools.NewHTTPCaller(map[tools.DataType]map[tools.METHOD]string{}).CallGet(
-				dest.Url, "/"+request.PeerID+"/link/"+relation.Path()); err != nil {
+				dest.APIUrl, "/"+request.PeerID+"/link/"+relation.Path()); err != nil {
 				o.Data["json"] = map[string]interface{}{
 					"data":  nil,
 					"code":  400,

go.mod

@@ -5,7 +5,7 @@ go 1.24.6
 toolchain go1.24.11
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20260128162702-97cf629e27ec
+	cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7
 	github.com/beego/beego/v2 v2.3.8
 	github.com/smartystreets/goconvey v1.7.2
 )

go.sum

@@ -32,6 +32,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20260128145248-d2c5d2031857 h1:SrvueDUww61xt
 cloud.o-forge.io/core/oc-lib v0.0.0-20260128145248-d2c5d2031857/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
 cloud.o-forge.io/core/oc-lib v0.0.0-20260128162702-97cf629e27ec h1:/uvrtEt7A5rwqFPHH8yjujlC33HMjQHhWDIK6I08DrA=
 cloud.o-forge.io/core/oc-lib v0.0.0-20260128162702-97cf629e27ec/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7 h1:NRFGRqN+j5g3DrtXMYN5T5XSYICG+OU2DisjBdID3j8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/beego/beego/v2 v2.3.8 h1:wplhB1pF4TxR+2SS4PUej8eDoH4xGfxuHfS7wAk9VBc=
 github.com/beego/beego/v2 v2.3.8/go.mod h1:8vl9+RrXqvodrl9C8yivX1e6le6deCK6RWeq8R7gTTg=

infrastructure/nats.go

@@ -25,10 +25,10 @@ func ListenNATS() {
 					pp.Name = p.Name
 					pp.PeerID = p.PeerID
 					pp.State = p.State
-					pp.Url = p.Url
+					pp.APIUrl = p.APIUrl
 					pp.PublicKey = p.PublicKey
 					pp.WalletAddress = p.WalletAddress
-					pp.NATSUrl = p.NATSUrl
+					pp.NATSAddress = p.NATSAddress
 					access.UpdateOne(pp.Serialize(pp), pp.GetID())
 				} else {
 					access.StoreOne(p.Serialize(p))

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"oc-peer/conf"
 	"oc-peer/infrastructure"
 	_ "oc-peer/routers"
 
@@ -28,14 +27,6 @@ func main() {
 		o.GetStringDefault("LOKI_URL", ""),
 		o.GetStringDefault("LOG_LEVEL", "info"),
 	)
-	conf.GetConfig().Name = o.GetStringDefault("NAME", "local")
-	conf.GetConfig().Hostname = o.GetStringDefault("HOSTNAME", "http://localhost")
-	conf.GetConfig().PSKPath = o.GetStringDefault("PSK_PATH", "./psk/psk")
-	conf.GetConfig().PublicKeyPath = o.GetStringDefault("PEER_PUBLIC_KEY_PATH", "./pem/public.pem")
-	conf.GetConfig().PrivateKeyPath = o.GetStringDefault("PEER_PRIVATE_KEY_PATH", "./pem/private.pem")
-	conf.GetConfig().DHTEndpointPort = o.GetInt64Default("DHT_ENDPOINT_PORT", 4001)
-
-	conf.GetConfig().BootstrapAddress = o.GetStringDefault("BOOTSTRAP_ADDRESS", "")
 	// Beego init
 	beego.BConfig.AppName = appname
 	beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080)