Skip to content

Commit b327a6b

Browse files
authored
Merge pull request #37 from lixiaojun629/develop
fixbug
2 parents b4bf9d6 + b080ac3 commit b327a6b

2 files changed

Lines changed: 13 additions & 12 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ install:
77

88
.PHONY : build_mac
99
build_mac:
10-
GOOS=darwin GOARCH=amd64 go build -o out/ucloud main.go
10+
GOOS=darwin GOARCH=amd64 go build -mod=vendor -o out/ucloud main.go
1111
tar zcvf out/ucloud-cli-macosx-${VERSION}-amd64.tgz -C out ucloud
1212
shasum -a 256 out/ucloud-cli-macosx-${VERSION}-amd64.tgz
1313

1414
.PHONY : build_linux
1515
build_linux:
16-
GOOS=linux GOARCH=amd64 go build -o out/ucloud main.go
16+
GOOS=linux GOARCH=amd64 go build -mod=vendor -o out/ucloud main.go
1717
tar zcvf out/ucloud-cli-linux-${VERSION}-amd64.tgz -C out ucloud
1818
shasum -a 256 out/ucloud-cli-linux-${VERSION}-amd64.tgz
1919

2020
.PHONY : build_windows
2121
build_windows:
22-
GOOS=windows GOARCH=amd64 go build -o out/ucloud.exe main.go
22+
GOOS=windows GOARCH=amd64 go build -mod=vendor -o out/ucloud.exe main.go
2323
zip -r out/ucloud-cli-windows-${VERSION}-amd64.zip out/ucloud.exe
2424
shasum -a 256 out/ucloud-cli-windows-${VERSION}-amd64.zip
2525

cmd/configure.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,16 @@ func NewCmdConfig() *cobra.Command {
170170
//如果配置文件中找不到该profile 则添加配置
171171
if !ok {
172172
cacheConfig = &base.AggConfig{
173-
PrivateKey: cfg.PrivateKey,
174-
PublicKey: cfg.PublicKey,
175-
Profile: cfg.Profile,
176-
BaseURL: cfg.BaseURL,
177-
Timeout: cfg.Timeout,
178-
Active: cfg.Active,
179-
Region: cfg.Region,
180-
Zone: cfg.Zone,
181-
ProjectID: cfg.ProjectID,
173+
PrivateKey: cfg.PrivateKey,
174+
PublicKey: cfg.PublicKey,
175+
Profile: cfg.Profile,
176+
BaseURL: cfg.BaseURL,
177+
Timeout: cfg.Timeout,
178+
Active: cfg.Active,
179+
Region: cfg.Region,
180+
Zone: cfg.Zone,
181+
ProjectID: cfg.ProjectID,
182+
MaxRetryTimes: cfg.MaxRetryTimes,
182183
}
183184
}
184185

0 commit comments

Comments
 (0)