animeic-cd 1 year ago
parent
commit
ceba6e1a6b
5 changed files with 229 additions and 10 deletions
  1. 1 0
      go.mod
  2. 42 0
      go.sum
  3. 101 10
      main.go
  4. 69 0
      utils/http.go
  5. 16 0
      utils/utils.go

+ 1 - 0
go.mod

@@ -5,6 +5,7 @@ go 1.21.3
 require (
 	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.9+incompatible
 	github.com/jessevdk/go-flags v1.5.0
+	go.mongodb.org/mongo-driver v1.13.1
 )
 
 require (

+ 42 - 0
go.sum

@@ -1,11 +1,53 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.9+incompatible h1:zUhCrGMMpJxZGAB30GbQzluDhQuPENxRQfxss7KlpKU=
 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.9+incompatible/go.mod h1:l7VUhRbTKCzdOacdT4oWCwATKyvZqUOlOqr0Ous3k4s=
 github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk=
+go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

+ 101 - 10
main.go

@@ -3,7 +3,10 @@ package main
 import (
 	"app-uploader/huawei"
 	"app-uploader/utils"
+	"bufio"
+	"encoding/json"
 	"fmt"
+	"os"
 	"path/filepath"
 	"runtime"
 	"strconv"
@@ -101,7 +104,34 @@ func main() {
 		return
 	}
 
-	fmt.Println("上传中...")
+	// 检测zip文件是否存在
+	ok, err := utils.CheckZipExist("http://spu3dv1.obs.cn-east-3.myhuaweicloud.com/pkg/" + zipFile)
+	if err != nil {
+		fmt.Println(err)
+		fmt.Println("检测打包文件失败")
+	}
+	if ok {
+		inputReader := bufio.NewReader(os.Stdin)
+		fmt.Printf("obs已存在该zip文件,是否覆盖【%s】?\n发布:【yes】,不发布【no】:", zipFile)
+		input, err := inputReader.ReadString('\n')
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		switch input {
+		case "yes\n":
+			fmt.Println("上传中...")
+		case "no\n":
+			fmt.Println("取消上传")
+			time.Sleep(3 * time.Second)
+			return
+		default:
+			fmt.Println("上传中...")
+			return
+		}
+
+	}
+
 	// 上传文件
 	huawei.InitConfig()
 	// http://spu3dv1.obs.cn-east-3.myhuaweicloud.com/pkg/lancher1.0.2.windows-amd64.zip
@@ -126,18 +156,79 @@ func main() {
 		fmt.Println("转换size string->int 错误:", err)
 
 	}
+	obsUrl := fmt.Sprintf("https:%s", obs.Url)
+
+	fmt.Println("上传成功")
 
-	err = utils.WriteVersionDb(&utils.Version{
-		Name:    appConf.Key,
-		Version: version,
-		SizeM:   sizeM,
-		Url:     fmt.Sprintf("https:%s", obs.Url),
-	}, outputDb)
+	// 是否发布
+	inputReader := bufio.NewReader(os.Stdin)
+	fmt.Printf("是否发布【%s】,version【%s】?\n发布:【yes】,不发布【no】:", appConf.Key, version)
+	input, err := inputReader.ReadString('\n')
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
-	fmt.Println("上传成功")
-	fmt.Println("输出文件目录=>: output")
-	time.Sleep(3 * time.Second)
+	switch input {
+	case "yes\n":
+		fmt.Println("发布中...")
+	case "no\n":
+		fmt.Println("取消发布")
+		time.Sleep(3 * time.Second)
+		return
+	default:
+		fmt.Println("发布中...")
+		return
+	}
+
+	// 获取对应应用配置
+	// "platform": "windows-amd64",
+	// platform := fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH)
+	platform := fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH)
+	query := fmt.Sprintf("?name=%s&platform=%s", appConf.Key, platform)
+	appVersion, err := utils.GetAppVersion(query)
+	if err != nil {
+		fmt.Println(err)
+		fmt.Println("获取版本信息错误")
+	}
+	fmt.Println(appVersion)
+	// 调用接口修改配置
+	appVersion.Version = version
+	appVersion.SizeM = float32(sizeM)
+	appVersion.Url = obsUrl
+	data, err := json.Marshal(appVersion)
+	if err != nil {
+		fmt.Println("数据转换错误:", err)
+		return
+	}
+	res, err := utils.PostJson(data)
+	if err != nil {
+		fmt.Println("更新version错误:", err)
+		return
+	}
+	if res == "fail" {
+		fmt.Println("更新version失败")
+		return
+	}
+
+	if res == "succ" {
+		fmt.Println("更新version成功")
+		err = utils.WriteVersionDb(&utils.Version{
+			Label:     appVersion.Label,
+			Name:      appConf.Key,
+			Icon:      appVersion.Icon,
+			Type:      appVersion.Type,
+			Version:   version,
+			SizeM:     sizeM,
+			Url:       obsUrl,
+			Platform:  appVersion.Platform,
+			Thumbnail: appVersion.Thumbnail,
+		}, outputDb)
+		if err != nil {
+			fmt.Println("写入output/db.json错误:", err)
+			return
+		}
+		fmt.Println("输出文件目录=>: output")
+		time.Sleep(3 * time.Second)
+	}
+
 }

+ 69 - 0
utils/http.go

@@ -0,0 +1,69 @@
+package utils
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+)
+
+func CheckZipExist(url string) (bool, error) {
+	res, err := http.Get(url)
+	if err != nil {
+		return false, err
+	}
+	defer res.Body.Close()
+	buf := make([]byte, 1024)
+	n, err := res.Body.Read(buf)
+	if err != nil {
+		return false, err
+	}
+	if n != 1024 {
+		return true, nil
+	}
+
+	return false, nil
+}
+
+// 返回succ,fail
+func PostJson(data []byte) (string, error) {
+	req, err := http.NewRequest("POST", VersionApi, bytes.NewBuffer(data))
+	if err != nil {
+		return "fail", err
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return "fail", err
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "fail", err
+	}
+	return string(body), nil
+}
+
+func GetAppVersion(query string) (*AppVersion, error) {
+	url := fmt.Sprintf("%s%s", VersionApi, query)
+	client := &http.Client{}
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	appVersion := &AppVersion{}
+	err = json.Unmarshal(body, appVersion)
+	if err != nil {
+		return nil, err
+	}
+	return appVersion, nil
+}

+ 16 - 0
utils/utils.go

@@ -1,9 +1,12 @@
 package utils
 
+import "go.mongodb.org/mongo-driver/bson/primitive"
+
 var PackConfPath = "package.json"
 var ConfigPath = "uploader.json"
 var OutputDb = "db.json"
 var AppConfPath = "app.json"
+var VersionApi = "https://www.3dqueen.cloud/cloud/v1/lancher/up/version"
 
 type UpConfItem struct {
 	Files    []string
@@ -12,6 +15,19 @@ type UpConfItem struct {
 	Dest     string
 }
 
+type AppVersion struct {
+	Id        primitive.ObjectID `json:"id"`
+	Label     string             `json:"label"`
+	Name      string             `json:"name"`
+	Icon      string             `json:"icon"`
+	Type      string             `json:"type"`
+	Version   string             `json:"version"`
+	SizeM     float32            `json:"sizeM"`
+	Url       string             `json:"url"`
+	Platform  string             `json:"platform"`
+	Thumbnail string             `json:"thumbnail"`
+}
+
 type Version struct {
 	Label     string `json:"label"`
 	Name      string `json:"name"`