Merge pull request #13 from lixiaojun629/develop

bw-pkg,shared-bw,firewall,udpn and vpc

Author: lixiaojun629

base/client.go

@@ -6,6 +6,7 @@ import (
 	"github.com/ucloud/ucloud-sdk-go/services/pathx"
 	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
 	"github.com/ucloud/ucloud-sdk-go/services/udisk"
+	"github.com/ucloud/ucloud-sdk-go/services/udpn"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 	"github.com/ucloud/ucloud-sdk-go/services/unet"
 	"github.com/ucloud/ucloud-sdk-go/services/vpc"
@@ -25,6 +26,7 @@ type Client struct {
 	uhost.UHostClient
 	unet.UNetClient
 	vpc.VPCClient
+	udpn.UDPNClient
 	pathx.PathXClient
 	udisk.UDiskClient
 	PrivateUHostClient
@@ -37,6 +39,7 @@ func NewClient(config *ucloud.Config, credential *auth.Credential) *Client {
 		*uhost.NewClient(config, credential),
 		*unet.NewClient(config, credential),
 		*vpc.NewClient(config, credential),
+		*udpn.NewClient(config, credential),
 		*pathx.NewClient(config, credential),
 		*udisk.NewClient(config, credential),
 		*puhost.NewClient(config, credential),

base/util.go

@@ -175,36 +175,48 @@ func displaySlice(listVal reflect.Value, fieldList []string) {
 	for i := 0; i < listVal.Len(); i++ {
 		elemVal := listVal.Index(i)
 		elemType := elemVal.Type()
-		row := make(map[string]interface{})
+		rows := []map[string]interface{}{}
 		for j := 0; j < elemVal.NumField(); j++ {
 			field := elemVal.Field(j)
 			fieldName := elemType.Field(j).Name
 			if _, ok := showFieldMap[fieldName]; ok {
-				row[fieldName] = field.Interface()
 				text := fmt.Sprintf("%v", field.Interface())
-				width := calcWidth(text)
-				if showFieldMap[fieldName] < width {
-					showFieldMap[fieldName] = width
+				cells := strings.Split(text, "\n")
+				for i, cell := range cells {
+					width := calcWidth(cell)
+					if showFieldMap[fieldName] < width {
+						showFieldMap[fieldName] = width
+					}
+					if len(rows) == i {
+						rows = append(rows, make(map[string]interface{}))
+					}
+					rows[i][fieldName] = cell
 				}
 			}
 		}
-		rowList = append(rowList, row)
+		rowList = append(rowList, rows...)
 	}
 	printTable(rowList, fieldList, showFieldMap)
 }
 
 func printTable(rowList []map[string]interface{}, fieldList []string, fieldWidthMap map[string]int) {
+	//打印表头
 	for _, field := range fieldList {
 		tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]+GAP) + "s"
 		fmt.Printf(tmpl, field)
 	}
 	fmt.Printf("\n")
 
+	//打印数据
 	for _, row := range rowList {
 		for _, field := range fieldList {
 			cutWidth := calcCutWidth(fmt.Sprintf("%v", row[field]))
 			tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]-cutWidth+GAP) + "v"
-			fmt.Printf(tmpl, row[field])
+			if row[field] != nil {
+				fmt.Printf(tmpl, row[field])
+			} else {
+				fmt.Printf(tmpl, "")
+			}
 		}
 		fmt.Printf("\n")
 	}
@@ -239,6 +251,11 @@ func FormatDate(seconds int) string {
 	return time.Unix(int64(seconds), 0).Format("2006-01-02")
 }
 
+//FormatDateTime 格式化时间,把以秒为单位的时间戳格式化未年月日/时分秒
+func FormatDateTime(seconds int) string {
+	return time.Unix(int64(seconds), 0).Format("2006-01-02/15:04:05")
+}
+
 //RegionLabel regionlable
 var RegionLabel = map[string]string{
 	"cn-bj1":       "Beijing1",