[Update] Merge

pkg/common/client.go

@@ -152,7 +152,7 @@ func (c *Client) Do(method, url string, data, res interface{}, params ...map[str
 	return
 }
 
-func (c *Client) Get(url string, query map[string]string, res interface{}) (err error) {
+func (c *Client) Get(url string, res interface{}) (err error) {
 	return c.Do("GET", url, nil, res)
 }
 

pkg/service/accesskey.go

 package service
 
 import (
-	"cocogo/pkg/logger"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -9,6 +8,7 @@ import (
 	"strings"
 
 	"cocogo/pkg/common"
+	"cocogo/pkg/logger"
 )
 
 var (

pkg/service/assets.go

@@ -3,6 +3,7 @@ package service
 import (
 	"cocogo/pkg/logger"
 	"cocogo/pkg/model"
+	"fmt"
 )
 
 //
@@ -20,7 +21,8 @@ import (
 //
 func GetSystemUserAssetAuthInfo(systemUserID, assetID string) (info model.SystemUserAuthInfo, err error) {
 	var authInfo model.SystemUserAuthInfo
-	err = Client.Get("systemUserAuthInfo", nil, &authInfo)
+	systemUrl := fmt.Sprintf(urls["SystemUserAuthInfo"], systemUserID)
+	err = Client.Get(systemUrl, &authInfo, true)
 	if err != nil {
 		logger.Info("get User Assets Groups err:", err)
 		return

pkg/service/client.go

 package service
 
 import (
-	"net/http"
 	"path"
 	"path/filepath"
-	"strings"
 
 	"cocogo/pkg/common"
 	"cocogo/pkg/config"
+	"cocogo/pkg/model"
 )
 
 type ClientAuth interface {
@@ -15,36 +14,11 @@ type ClientAuth interface {
 }
 
 type WrapperClient struct {
-	*common.Client
+	Http     *common.Client
 	Auth     ClientAuth
 	BaseHost string
 }
 
-func (c *WrapperClient) SetAuthHeader(r *http.Request) {
-	if c.Auth != nil {
-		signature := c.Auth.Sign()
-		r.Header.Add("Authorization", signature)
-	}
-}
-
-func (c *WrapperClient) ExpandUrl(url string, query map[string]string) string {
-	return ""
-}
-
-func (c *WrapperClient) ParseUrl(url string, params ...map[string]string) string {
-	var newUrl = ""
-	if url, ok := urls[url]; ok {
-		newUrl = url
-	}
-	if c.BaseHost != "" {
-		newUrl = strings.TrimRight(c.BaseHost, "/") + newUrl
-	}
-	if len(params) == 1 {
-		url = c.ParseUrlQuery(url, params[0])
-	}
-	return newUrl
-}
-
 func (c *WrapperClient) LoadAuth() error {
 	keyPath := config.Conf.AccessKeyFile
 	if !path.IsAbs(config.Conf.AccessKeyFile) {
@@ -60,10 +34,18 @@ func (c *WrapperClient) LoadAuth() error {
 }
 
 func (c *WrapperClient) CheckAuth() error {
-	//var user model.User
-	//err := c.Get("UserProfileUrl", &user)
-	//if err != nil {
-	//	return err
-	//}
+	var user model.User
+	err := c.Http.Get("UserProfileUrl", &user)
+	if err != nil {
+		return err
+	}
 	return nil
 }
+
+func (c *WrapperClient) Get(url string, res interface{}, needAuth bool) error {
+	if needAuth {
+		c.Http.SetAuth(c.Auth.Sign())
+	}
+
+	return c.Http.Get(c.BaseHost+url, res)
+}

pkg/service/urls.go

@@ -5,7 +5,7 @@ var urls = map[string]string{
 	"UserProfileUrl": "/api/users/v1/profile/", // 获取当前用户的基本信息
 
 	"SystemUserAssetAuthUrl": "/api/assets/v1/system-user/%s/asset/%s/auth-info/", // 该系统用户对某资产的授权
-	"SystemUserAuthUrl":      "/api/assets/v1/system-user/%s/auth-info/",          // 该系统用户的授权
+	"SystemUserAuthInfo":     "/api/assets/v1/system-user/%s/auth-info/",          // 该系统用户的授权
 
 	"TerminalRegisterUrl": "/api/terminal/v2/terminal-registrations/", // 注册当前coco
 	"TerminalConfigUrl":   "/api/terminal/v1/terminal/config/",        // 从jumpserver获取coco的配置