From 99758e1ef4524c49252c3547561435040169cd6d Mon Sep 17 00:00:00 2001
From: tengge <930372551@qq.com>
Date: Tue, 12 May 2020 21:13:08 +0800
Subject: [PATCH] fix examples bug

---
 server/server/export/examples/export_character.go | 15 ++++++++-------
 server/server/export/examples/export_particle.go  | 15 ++++++++-------
 server/server/export/examples/export_prefab.go    | 13 +++++++------
 server/server/export/examples/export_scene.go     | 13 +++++++------
 server/server/export/examples/handler.go          | 10 ++++++----
 5 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/server/server/export/examples/export_character.go b/server/server/export/examples/export_character.go
index f5a30e3a..64fd8482 100644
--- a/server/server/export/examples/export_character.go
+++ b/server/server/export/examples/export_character.go
@@ -31,16 +31,17 @@ func exportCharacter(path string) {
 	fileName := filepath.Join(path, "api", "Character", "List")
 	ioutil.WriteFile(fileName, []byte(result), 0755)
 
-	// export scenes
+	// export characters
 	var obj map[string]interface{}
 	helper.FromJSON([]byte(result), &obj)
-	array := obj["Data"].([]map[string]interface{})
 
-	for _, i := range array {
-		id := i["ID"].(string)
-		result, _ = helper.Get(fmt.Sprintf("http://%v/api/Character/Get?ID=%v", port, id))
-		fileName = fmt.Sprintf("%v/api/Character/Character_%v", path, id)
-		ioutil.WriteFile(fileName, []byte(result), 0755)
+	if array, ok := obj["Data"].([]interface{}); ok {
+		for _, i := range array {
+			id := i.(map[string]interface{})["ID"].(string)
+			result, _ = helper.Get(fmt.Sprintf("http://%v/api/Character/Get?ID=%v", port, id))
+			fileName = fmt.Sprintf("%v/api/Character/Character_%v", path, id)
+			ioutil.WriteFile(fileName, []byte(result), 0755)
+		}
 	}
 
 	// other apis
diff --git a/server/server/export/examples/export_particle.go b/server/server/export/examples/export_particle.go
index 343a21d4..f467bb3b 100644
--- a/server/server/export/examples/export_particle.go
+++ b/server/server/export/examples/export_particle.go
@@ -31,16 +31,17 @@ func exportParticle(path string) {
 	fileName := filepath.Join(path, "api", "Particle", "List")
 	ioutil.WriteFile(fileName, []byte(result), 0755)
 
-	// export scenes
+	// export particles
 	var obj map[string]interface{}
 	helper.FromJSON([]byte(result), &obj)
-	array := obj["Data"].([]map[string]interface{})
 
-	for _, i := range array {
-		id := i["ID"].(string)
-		result, _ = helper.Get(fmt.Sprintf("http://%v/api/Particle/Get?ID=%v", port, id))
-		fileName = fmt.Sprintf("%v/api/Particle/Particle_%v", path, id)
-		ioutil.WriteFile(fileName, []byte(result), 0755)
+	if array, ok := obj["Data"].([]interface{}); ok {
+		for _, i := range array {
+			id := i.(map[string]interface{})["ID"].(string)
+			result, _ = helper.Get(fmt.Sprintf("http://%v/api/Particle/Get?ID=%v", port, id))
+			fileName = fmt.Sprintf("%v/api/Particle/Particle_%v", path, id)
+			ioutil.WriteFile(fileName, []byte(result), 0755)
+		}
 	}
 
 	// other apis
diff --git a/server/server/export/examples/export_prefab.go b/server/server/export/examples/export_prefab.go
index c4b8cada..a262703a 100644
--- a/server/server/export/examples/export_prefab.go
+++ b/server/server/export/examples/export_prefab.go
@@ -34,13 +34,14 @@ func exportPrefab(path string) {
 	// export scenes
 	var obj map[string]interface{}
 	helper.FromJSON([]byte(result), &obj)
-	array := obj["Data"].([]map[string]interface{})
 
-	for _, i := range array {
-		id := i["ID"].(string)
-		result, _ = helper.Get(fmt.Sprintf("http://%v/api/Prefab/Get?ID=%v", port, id))
-		fileName = fmt.Sprintf("%v/api/Prefab/Prefab_%v", path, id)
-		ioutil.WriteFile(fileName, []byte(result), 0755)
+	if array, ok := obj["Data"].([]interface{}); ok {
+		for _, i := range array {
+			id := i.(map[string]interface{})["ID"].(string)
+			result, _ = helper.Get(fmt.Sprintf("http://%v/api/Prefab/Get?ID=%v", port, id))
+			fileName = fmt.Sprintf("%v/api/Prefab/Prefab_%v", path, id)
+			ioutil.WriteFile(fileName, []byte(result), 0755)
+		}
 	}
 
 	// other apis
diff --git a/server/server/export/examples/export_scene.go b/server/server/export/examples/export_scene.go
index 215cd0af..b12285e5 100644
--- a/server/server/export/examples/export_scene.go
+++ b/server/server/export/examples/export_scene.go
@@ -34,13 +34,14 @@ func exportScene(path string) {
 	// export scenes
 	var obj map[string]interface{}
 	helper.FromJSON([]byte(result), &obj)
-	array := obj["Data"].([]map[string]interface{})
 
-	for _, i := range array {
-		id := i["ID"].(string)
-		result, _ = helper.Get(fmt.Sprintf("http://%v/api/Scene/Load?ID=%v", port, id))
-		fileName = fmt.Sprintf("%v/api/Scene/Scene_%v", path, id)
-		ioutil.WriteFile(fileName, []byte(result), 0755)
+	if array, ok := obj["Data"].([]interface{}); ok {
+		for _, i := range array {
+			id := i.(map[string]interface{})["ID"].(string)
+			result, _ = helper.Get(fmt.Sprintf("http://%v/api/Scene/Load?ID=%v", port, id))
+			fileName = fmt.Sprintf("%v/api/Scene/Scene_%v", path, id)
+			ioutil.WriteFile(fileName, []byte(result), 0755)
+		}
 	}
 
 	// other apis
diff --git a/server/server/export/examples/handler.go b/server/server/export/examples/handler.go
index d36eebd1..23271776 100644
--- a/server/server/export/examples/handler.go
+++ b/server/server/export/examples/handler.go
@@ -47,18 +47,20 @@ func Run(w http.ResponseWriter, r *http.Request) {
 
 func copyStaticAssets(path string) error {
 	list := []string{
-		"favicon.ico",
-		"index.html",
-		"view.html",
 		"assets",
 		"build",
 		"locales",
+		"favicon.ico",
+		"index.html",
+		"manifest.json",
+		"sw.js",
+		"view.html",
 	}
 
 	for _, i := range list {
 		source := server.MapPath("/" + i)
 		dest := filepath.Join(path, i)
-		if stat, err := os.Stat(source); err != nil && stat.IsDir() {
+		if stat, err := os.Stat(source); err == nil && stat.IsDir() {
 			helper.CopyDirectory(source, dest)
 		} else if err == nil {
 			helper.CopyFile(source, dest)