diff --git a/core/cloud/api.go b/core/cloud/api.go deleted file mode 100644 index ce5e5e0..0000000 --- a/core/cloud/api.go +++ /dev/null @@ -1,60 +0,0 @@ -package cloud - -import ( - "fmt" - hbtp "github.com/mgr9525/HyperByte-Transfer-Protocol" - gocloud "github.com/mgr9525/go-cloud" - "time" -) - -func NewReq(code int, method string, ipr ...string) (*hbtp.Request, error) { - host := fmt.Sprintf("%v", gocloud.CloudConf.Custom["sysHbtpHost"]) - req, err := hbtp.NewRPCReq(host, code, method) - if err != nil { - return nil, err - } - hd := req.ReqHeader() - if len(ipr) > 0 { - hd.RelIp = ipr[1] - } - hd.Times = time.Now().Format(time.RFC3339Nano) - //hd.Token = ruisUtil.Md5String(hd.Path + hd.RelIp + hd.Times + HbtpMD5Token) - return req, err -} -func DoJson(code int, method string, in, out interface{}, hd ...map[string]interface{}) error { - req, err := NewReq(code, method) - if err != nil { - return err - } - defer req.Close() - if len(hd) > 0 && hd[0] != nil { - for k, v := range hd[0] { - req.ReqHeader().Set(k, v) - } - } - err = req.Do(in) - if err != nil { - return err - } - if req.ResCode() != hbtp.ResStatusOk { - return fmt.Errorf("res err(%d):%s", req.ResCode(), string(req.ResBodyBytes())) - } - return req.ResBodyJson(out) -} -func DoString(code int, method string, in interface{}, hd ...hbtp.Mp) (int, []byte, error) { - req, err := NewReq(code, method) - if err != nil { - return 0, nil, err - } - defer req.Close() - if len(hd) > 0 && hd[0] != nil { - for k, v := range hd[0] { - req.ReqHeader().Set(k, v) - } - } - err = req.Do(in) - if err != nil { - return 0, nil, err - } - return req.ResCode(), req.ResBodyBytes(), nil -} diff --git a/core/cloud/commCloud/api.go b/core/cloud/commCloud/api.go index f69b37a..5758230 100644 --- a/core/cloud/commCloud/api.go +++ b/core/cloud/commCloud/api.go @@ -1,8 +1,9 @@ package commCloud import ( - "GoClouds/core/cloud" + "fmt" hbtp "github.com/mgr9525/HyperByte-Transfer-Protocol" + gocloud "github.com/mgr9525/go-cloud" ) const ( @@ -10,11 +11,14 @@ const ( ) func NewReq(method string, ipr ...string) (*hbtp.Request, error) { - return cloud.NewReq(RPCHostCode, method, ipr...) + host := fmt.Sprintf("%v", gocloud.CloudConf.Custom["sysHbtpHost"]) + return hbtp.NewDoReq(host, RPCHostCode, method, ipr...) } func DoJson(method string, in, out interface{}, hd ...map[string]interface{}) error { - return cloud.DoJson(RPCHostCode, method, in, out, hd...) + host := fmt.Sprintf("%v", gocloud.CloudConf.Custom["sysHbtpHost"]) + return hbtp.DoRPCJson(host, RPCHostCode, method, in, out, hd...) } func DoString(method string, in interface{}, hd ...hbtp.Mp) (int, []byte, error) { - return cloud.DoString(RPCHostCode, method, in, hd...) + host := fmt.Sprintf("%v", gocloud.CloudConf.Custom["sysHbtpHost"]) + return hbtp.DoRPCString(host, RPCHostCode, method, in, hd...) } diff --git a/core/cloud/userCloud/api.go b/core/cloud/userCloud/api.go index 434f0b7..1ee73cc 100644 --- a/core/cloud/userCloud/api.go +++ b/core/cloud/userCloud/api.go @@ -1,8 +1,9 @@ package userCloud import ( - "GoClouds/core/cloud" + "fmt" hbtp "github.com/mgr9525/HyperByte-Transfer-Protocol" + gocloud "github.com/mgr9525/go-cloud" ) const ( @@ -10,11 +11,14 @@ const ( ) func NewReq(method string, ipr ...string) (*hbtp.Request, error) { - return cloud.NewReq(RPCHostCode, method, ipr...) + host := fmt.Sprintf("%v", gocloud.CloudConf.Custom["sysHbtpHost"]) + return hbtp.NewDoReq(host, RPCHostCode, method, ipr...) } func DoJson(method string, in, out interface{}, hd ...map[string]interface{}) error { - return cloud.DoJson(RPCHostCode, method, in, out, hd...) + host := fmt.Sprintf("%v", gocloud.CloudConf.Custom["sysHbtpHost"]) + return hbtp.DoRPCJson(host, RPCHostCode, method, in, out, hd...) } func DoString(method string, in interface{}, hd ...hbtp.Mp) (int, []byte, error) { - return cloud.DoString(RPCHostCode, method, in, hd...) + host := fmt.Sprintf("%v", gocloud.CloudConf.Custom["sysHbtpHost"]) + return hbtp.DoRPCString(host, RPCHostCode, method, in, hd...) } diff --git a/go.mod b/go.mod index d0d67f1..67a662d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.7.1 github.com/go-sql-driver/mysql v1.5.0 - github.com/mgr9525/HyperByte-Transfer-Protocol v0.0.0-20210426153421-56963f4775c8 + github.com/mgr9525/HyperByte-Transfer-Protocol v0.0.0-20210428064104-cf9d03801c90 github.com/mgr9525/go-cloud v1.0.6-0.20210425153348-0292a9ccd8f8 github.com/mgr9525/go-ruisutil v1.0.8-0.20210317093428-f69295935056 github.com/qiniu/qmgo v0.9.2 diff --git a/go.sum b/go.sum index abb1de4..9fca191 100644 --- a/go.sum +++ b/go.sum @@ -99,6 +99,8 @@ github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/ github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mgr9525/HyperByte-Transfer-Protocol v0.0.0-20210426153421-56963f4775c8 h1:0H1rZNOJEAuidzG5KNIwylLS8cukGRrg7VfGI474lbQ= github.com/mgr9525/HyperByte-Transfer-Protocol v0.0.0-20210426153421-56963f4775c8/go.mod h1:U2OZ06VD1PHu3ZLZ8tuEHooaOZnoke/4ZKAZfL44bUQ= +github.com/mgr9525/HyperByte-Transfer-Protocol v0.0.0-20210428064104-cf9d03801c90 h1:L9XcJd4EtXJlAOL4mTbFCOtA/I8wCUiGFvT4EV/ftkQ= +github.com/mgr9525/HyperByte-Transfer-Protocol v0.0.0-20210428064104-cf9d03801c90/go.mod h1:U2OZ06VD1PHu3ZLZ8tuEHooaOZnoke/4ZKAZfL44bUQ= github.com/mgr9525/go-cloud v1.0.6-0.20210425153348-0292a9ccd8f8 h1:0OloknN3axz+XuBpc6OpTtVIlCE2GoUhvS3NP4tc354= github.com/mgr9525/go-cloud v1.0.6-0.20210425153348-0292a9ccd8f8/go.mod h1:VkCKgivVD2OX75Zwh+AO3zuJyxGCsuo0zdy+UXCYy9I= github.com/mgr9525/go-ruisutil v1.0.8-0.20210317093428-f69295935056 h1:JhXsFUB3mFWwiDc8c//E/6cUazJUX1lIiLgiM0asNjA= diff --git a/webs/sys/main.go b/webs/sys/main.go index 0f78f69..787ad7f 100644 --- a/webs/sys/main.go +++ b/webs/sys/main.go @@ -26,7 +26,7 @@ func main() { println("initFuns err:" + err.Error()) os.Exit(1) } - go StartConnEngine(gocloud.CloudConf.Custom.GetString("hbtpHost")) + go runHbtp(gocloud.CloudConf.Custom.GetString("hbtpHost")) if err := gocloud.Run(); err != nil { logrus.Errorf("gocloud run err:%v", err) } @@ -59,7 +59,7 @@ func SyncTable() error { return nil } -func StartConnEngine(host string) { +func runHbtp(host string) { if host == "" { logrus.Error("StartConnEngine run err:host is empty") os.Exit(1)