Skip to content

Commit b008073

Browse files
author
rn-h
committed
fix: After packaging, there will be an extra build folder
1 parent cb641f2 commit b008073

File tree

3 files changed

+93
-1
lines changed

3 files changed

+93
-1
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11

22
code-push-go
3+
build
4+
.code-push-go.json

opt/app.go

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ func (a App) App(arge []string) {
221221
"Commands:\n" +
222222
" create_app\n" +
223223
" create_deployment\n" +
224+
" delete_app\n" +
225+
" delete_deployment\n" +
224226
" ls_app\n" +
225227
" ls_deployment"
226228
if len(arge) < 2 {
@@ -233,6 +235,10 @@ func (a App) App(arge []string) {
233235
App{}.createApp()
234236
case "create_deployment":
235237
App{}.createDeployment()
238+
case "delete_app":
239+
App{}.deleteApp()
240+
case "delete_deployment":
241+
App{}.deleteDeployment()
236242
case "ls_app":
237243
App{}.lsApp()
238244
case "ls_deployment":
@@ -432,3 +438,86 @@ func (App) lsDeployment() {
432438

433439
fmt.Println(table)
434440
}
441+
442+
type deleteAppReq struct {
443+
AppName *string `json:"appName" binding:"required"`
444+
}
445+
446+
func (App) deleteApp() {
447+
448+
saveLoginInfo, err := utils.GetLoginfo()
449+
if err != nil {
450+
fmt.Println(err.Error())
451+
return
452+
}
453+
454+
var appName string
455+
456+
flag.StringVar(&appName, "n", "", "AppName")
457+
flag.Parse()
458+
if appName == "" {
459+
fmt.Println("Usage: code-push-go app delete_app -n <AppName>")
460+
return
461+
}
462+
463+
deleteAppReq := deleteAppReq{
464+
AppName: &appName,
465+
}
466+
jsonByte, _ := json.Marshal(deleteAppReq)
467+
Url, err := url.Parse(saveLoginInfo.ServerUrl + "/delApp")
468+
if err != nil {
469+
log.Panic("server url error :", err.Error())
470+
}
471+
reqStatus, err := utils.HttpPostToken[constants.RespStatus](Url.String(), jsonByte, &saveLoginInfo.Token)
472+
if err != nil {
473+
fmt.Println(err.Error())
474+
return
475+
}
476+
if reqStatus.Success {
477+
fmt.Println("Delete app " + appName + " success")
478+
}
479+
480+
}
481+
482+
type deleteDeploymentReq struct {
483+
AppName *string `json:"appName" binding:"required"`
484+
Deployment *string `json:"deployment" binding:"required"`
485+
}
486+
487+
func (App) deleteDeployment() {
488+
saveLoginInfo, err := utils.GetLoginfo()
489+
if err != nil {
490+
fmt.Println(err.Error())
491+
return
492+
}
493+
494+
var deploymentName string
495+
var appName string
496+
flag.StringVar(&appName, "n", "", "AppName")
497+
498+
flag.StringVar(&deploymentName, "dn", "", "DeploymentName")
499+
500+
flag.Parse()
501+
if deploymentName == "" || appName == "" {
502+
fmt.Println("Usage: code-push-go app delete_deployment -n <AppName> -dn <DeploymentName>")
503+
return
504+
}
505+
deleteDeploymentReq := deleteDeploymentReq{
506+
AppName: &appName,
507+
Deployment: &deploymentName,
508+
}
509+
510+
jsonByte, _ := json.Marshal(deleteDeploymentReq)
511+
Url, err := url.Parse(saveLoginInfo.ServerUrl + "/delDeployment")
512+
if err != nil {
513+
log.Panic("server url error :", err.Error())
514+
}
515+
reqStatus, err := utils.HttpPostToken[constants.RespStatus](Url.String(), jsonByte, &saveLoginInfo.Token)
516+
if err != nil {
517+
fmt.Println(err.Error())
518+
return
519+
}
520+
if reqStatus.Success {
521+
fmt.Println("Delete deployment " + deploymentName + " success")
522+
}
523+
}

utils/utils.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ func Zip(src_dir string, zip_file_name string) {
123123
archive := zip.NewWriter(zipfile)
124124
defer archive.Close()
125125

126+
nowSrc := strings.Replace(src_dir, "./", "", 1)
126127
// 遍历路径信息
127128
filepath.Walk(src_dir, func(path string, info os.FileInfo, _ error) error {
128129

@@ -133,7 +134,7 @@ func Zip(src_dir string, zip_file_name string) {
133134

134135
// 获取:文件头信息
135136
header, _ := zip.FileInfoHeader(info)
136-
header.Name = strings.TrimPrefix(path, src_dir+`/`)
137+
header.Name = strings.TrimPrefix(path, nowSrc+`/`)
137138

138139
// 判断:文件是不是文件夹
139140
if info.IsDir() {

0 commit comments

Comments
 (0)