feat:update

cmd/download.go

@@ -85,22 +85,25 @@ func RunCmd(cmd *cobra.Command, args []string) {
 
 	if len(data.Scenes) > 0 {
 		for _, v := range data.Scenes {
+
+			// 场景封面图
+			if len(v.Icon) > 0 {
+				log.Info("Downloading Scenes-cover", "url", fmt.Sprintf("%s", v.Icon))
+				url := utils.DetectSource(v.Icon, dest, ossUrl)
+				err = utils.DownloadFile(url, v.Icon)
+				log.Info("Save Scenes-cover", "url", fmt.Sprintf("%s", url))
+
+			}
+
 			if v.Type == "pano" {
 				// 主Tiles图
-				//log.Info("current", "bucket", fmt.Sprintf("%s", bucket))
+
 				if utils.IsCommandAvailable("ossutil") {
+					log.Info("current", "bucket", fmt.Sprintf("%s", bucket))
 					runMainTileDownload(v.SceneCode, dest, exclString, bucket)
 				}
 
 				// 场景封面图
-				if len(v.Icon) > 0 {
-					log.Info("Downloading Scenes-cover", "url", fmt.Sprintf("%s", v.Icon))
-					url := utils.DetectSource(v.Icon, dest, ossUrl)
-					err = utils.DownloadFile(url, v.Icon)
-					log.Info("Save Scenes-cover", "url", fmt.Sprintf("%s", url))
-
-				}
-				// 场景封面图
 				Hotspots := v.SomeData.Hotspots
 				if Hotspots != nil {
 					for _, Hotspot := range Hotspots {

utils/getScenes.go

@@ -100,6 +100,10 @@ func DetectSource(path string, dest string, ossUrl string) (url string) {
 		p := strings.ReplaceAll(saveP, ossUrl, "")
 		url = dest + "/" + p
 	}
+	if strings.Contains(saveP, ossUrl) {
+		p := strings.ReplaceAll(saveP, ossUrl, "/")
+		url = dest + "/" + p
+	}
 
 	return url
 }

utils/localizeMainJson.go

@@ -36,11 +36,11 @@ func CovertJsonAndDownload(path string, dest string, ossUrl string) (err error)
 	hasManage := ossUrl + "720yun_fd_manage/"
 	hasEditData := ossUrl + "scene_edit_data/"
 	if strings.Contains(content, hasManage) {
-		content = strings.ReplaceAll(content, "https://4dkk.4dage.com/720yun_fd_manage/", "data/")
+		content = strings.ReplaceAll(content, hasManage, "data/")
 
 	}
 	if strings.Contains(content, hasEditData) {
-		content = strings.ReplaceAll(content, "https://4dkk.4dage.com/", "data/")
+		content = strings.ReplaceAll(content, ossUrl, "data/")
 	}
 
 	target := &ScenesDataType{}