Merge pull request #34 from lixiaojun629/develop

pathx uga

Makefile

@@ -1,4 +1,4 @@
-export VERSION=0.1.19
+export VERSION=0.1.20
 
 .PHONY : build
 build: 

base/client.go

@@ -1,6 +1,7 @@
 package base
 
 import (
+	ppathx "github.com/ucloud/ucloud-sdk-go/private/services/pathx"
 	pudb "github.com/ucloud/ucloud-sdk-go/private/services/udb"
 	puhost "github.com/ucloud/ucloud-sdk-go/private/services/uhost"
 	pumem "github.com/ucloud/ucloud-sdk-go/private/services/umem"
@@ -25,9 +26,12 @@ type PrivateUHostClient = puhost.UHostClient
 //PrivateUDBClient 私有模块的udb client 即未在官网开放的接口
 type PrivateUDBClient = pudb.UDBClient
 
-//PrivateUMemClient 私有模块的udb client 即未在官网开放的接口
+//PrivateUMemClient 私有模块的umem client 即未在官网开放的接口
 type PrivateUMemClient = pumem.UMemClient
 
+//PrivatePathxClient 私有模块的pathx client 即未在官网开放的接口
+type PrivatePathxClient = ppathx.PathXClient
+
 //Client aggregate client for business
 type Client struct {
 	uaccount.UAccountClient
@@ -44,6 +48,7 @@ type Client struct {
 	PrivateUHostClient
 	PrivateUDBClient
 	PrivateUMemClient
+	PrivatePathxClient
 }
 
 // NewClient will return a aggregate client
@@ -63,5 +68,6 @@ func NewClient(config *ucloud.Config, credential *auth.Credential) *Client {
 		*puhost.NewClient(config, credential),
 		*pudb.NewClient(config, credential),
 		*pumem.NewClient(config, credential),
+		*ppathx.NewClient(config, credential),
 	}
 }

base/config.go

@@ -31,7 +31,7 @@ const DefaultBaseURL = "https://api.ucloud.cn/"
 const DefaultProfile = "default"
 
 //Version 版本号
-const Version = "0.1.19"
+const Version = "0.1.20"
 
 //ConfigIns 配置实例, 程序加载时生成
 var ConfigIns = &AggConfig{Profile: "default"}

cmd/configure.go

@@ -406,6 +406,10 @@ func NewCmdConfigUpdate() *cobra.Command {
 			cacheConfig.Region = region
 			cacheConfig.Zone = zone
 
+			if cfg.ProjectID != "" {
+				cacheConfig.ProjectID = base.PickResourceID(cfg.ProjectID)
+			}
+
 			project, err := getReasonableProject(cacheConfig)
 			if err != nil {
 				base.HandleError(err)

cmd/mysql.go

@@ -872,7 +872,7 @@ func getUDBList(states []string, dbType, project, region, zone string) ([]udb.UD
 					}
 				}
 			} else {
-				list = append(list, resp.DataSet...)
+				list = append(list, ins)
 			}
 		}
 		if offset+limit >= resp.TotalCount {