Merge pull request #51 from lixiaojun629/develop

lixiaojun629 · web-flow · commit a59159fed26b · 2020-05-21T20:36:08.000+08:00
ucloud 0.1.32
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-export VERSION=0.1.31
+export VERSION=0.1.32
 
 .PHONY : install
 install:
diff --git a/base/config.go b/base/config.go
@@ -36,7 +36,7 @@ const DefaultBaseURL = "https://api.ucloud.cn/"
 const DefaultProfile = "default"
 
 //Version 版本号
-const Version = "0.1.31"
+const Version = "0.1.32"
 
 //ConfigIns 配置实例, 程序加载时生成
 var ConfigIns = &AggConfig{
diff --git a/cmd/uhost.go b/cmd/uhost.go
@@ -513,7 +513,7 @@ func createUhost(req *uhost.CreateUHostInstanceRequest, eipReq *unet.AllocateEIP
 			return false, logs
 		}
 		block.Append(fmt.Sprintf("bind eip[%s] with uhost[%s] successfully", eip, resp.UHostIds[0]))
-	} else if *eipReq.Bandwidth != 0 {
+	} else if *eipReq.Bandwidth != 0 || *eipReq.PayMode=="ShareBandwidth"{
 		eipReq.ChargeType = req.ChargeType
 		eipReq.Tag = req.Tag
 		eipReq.Quantity = req.Quantity

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ func createUhost(req uhost.CreateUHostInstanceRequest, eipReq unet.AllocateEIP`
`513`	`513`	`return false, logs`
`514`	`514`	`}`
`515`	`515`	`block.Append(fmt.Sprintf("bind eip[%s] with uhost[%s] successfully", eip, resp.UHostIds[0]))`
`516`		`- } else if *eipReq.Bandwidth != 0 {`
	`516`	`+ } else if eipReq.Bandwidth != 0 \|\| eipReq.PayMode=="ShareBandwidth"{`
`517`	`517`	`eipReq.ChargeType = req.ChargeType`
`518`	`518`	`eipReq.Tag = req.Tag`
`519`	`519`	`eipReq.Quantity = req.Quantity`