Merge pull request #8 from gcpug/feature/id/7

dir構成を変更
gcpug · Nov 9, 2019 · 366e24b · 366e24b
2 parents 9c22e7a + 7596217
commit 366e24b
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 473 deletions.
diff --git a/go-app/.gcloudignore → .gcloudignore b/go-app/.gcloudignore → .gcloudignore
diff --git a/go-app/app.yaml → app.yaml b/go-app/app.yaml → app.yaml
diff --git a/go-app/ds_test.go → backend/ds_test.go b/go-app/ds_test.go → backend/ds_test.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import "testing"
 

diff --git a/go-app/http.go → backend/http.go b/go-app/http.go → backend/http.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import "fmt"
 

diff --git a/go-app/model_query.go → backend/model_query.go b/go-app/model_query.go → backend/model_query.go
@@ -1,6 +1,6 @@
 // generated by qbg -usedatastorewrapper -output model_query.go .; DO NOT EDIT
 
-package main
+package backend
 
 import (
 	"go.mercari.io/datastore"

diff --git a/go-app/static.go → backend/static.go b/go-app/static.go → backend/static.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import (
 	"errors"
@@ -64,6 +64,7 @@ func StaticContentsHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	w.Header().Set("Content-Type", ct)
+	w.Header().Set("Cache-Control", "max-age=900")
 	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(f)))
 	w.WriteHeader(http.StatusOK)
 	w.Write(f)
@@ -92,10 +93,12 @@ func writeIndexHTML(w http.ResponseWriter) {
 	fn := "index.html"
 	f, err := readFile(fn)
 	if err != nil {
+		fmt.Printf("failed read index.html file. err=%v\n", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 	w.Header().Set("Content-Type", "text/html;charset=utf-8")
+	w.Header().Set("Cache-Control", "max-age=900")
 	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(f)))
 	w.WriteHeader(http.StatusOK)
 	w.Write(f)

diff --git a/go-app/.gitignore b/go-app/.gitignore
diff --git a/go-app/main.go b/go-app/main.go
diff --git a/go-app/organization_api.go b/go-app/organization_api.go
diff --git a/go-app/organization_api_test.go b/go-app/organization_api_test.go