Rename docker compose group

- Fix deployment bugs
NUAA-Open-Source · Apr 15, 2019 · bb986a6 · bb986a6
1 parent 19de41c
commit bb986a6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 27 deletions.
diff --git a/conf/db.example.json b/conf/db.example.json
@@ -1,16 +1,16 @@
 {
   "Master": {
-    "User": "root",
-    "Pass": "safeu",
-    "Host": "db",
+    "User": "your_db_username",
+    "Pass": "your_db_password",
+    "Host": "your_db_ip_address",
     "Port": "3306",
     "Database": "safeu",
     "MaxIdleConns": 30,
     "MaxOpenConns": 100,
     "Debug": false
   },
   "Redis": {
-    "Host": "redis",
+    "Host": "safeu-redis",
     "Port": "6379",
     "Pass": ""
   }

diff --git a/deployments/dev/docker-compose.yml → deployments/dev-safeu/docker-compose.yml b/deployments/dev/docker-compose.yml → deployments/dev-safeu/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     environment:
       - TZ=Asia/Shanghai
     ports:
-      - "8080:8080"
+      - "9000:8080"
     networks:
       - safeu-app-net
     depends_on:
@@ -38,12 +38,13 @@ services:
 #      - TZ=Asia/Shanghai
 #      - MYSQL_ROOT_PASSWORD=safeu
 #      - MYSQL_DATABASE=safeu
-#    image: mysql:5.7.23
+##    image: mysql:5.7.23
+#    image: mariadb:10.3
 #    volumes:
 #      - ../../data-dev/mariadb:/var/lib/mysql
 #      - ../../conf/mariadb:/etc/mysql/conf.d
-#    ports:
-#      - "3306:3306"
+##    ports:
+##      - "3306:3306"
 #    networks:
 #      - safeu-app-net
 #    restart: on-failure

diff --git a/deployments/prod/docker-compose.yml → deployments/prod-safeu/docker-compose.yml b/deployments/prod/docker-compose.yml → deployments/prod-safeu/docker-compose.yml
diff --git a/faas/zip-items.py b/faas/zip-items.py
@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 # Code for Python 2.7
 
 import os
@@ -26,7 +27,7 @@ def handler(environ, start_response):
     except(ValueError):
         request_body_size = 0
     request_body = environ['wsgi.input'].read(request_body_size)
-    request_body = urllib.unquote(request_body).decode('utf8') 
+    request_body = urllib.unquote(request_body).decode('utf8')
 
     # get request method
     request_method = environ['REQUEST_METHOD']
@@ -125,5 +126,6 @@ def make_zip(source_dir, output_filename):
         for filename in filenames:
             pathfile = os.path.join(parent, filename)
             arcname = pathfile[pre_len:].strip(os.path.sep)
-            zipf.write(pathfile, arcname)
+            zipf.write(pathfile, arcname.encode("utf-8"))
+            # zipf.write(pathfile, arcname.encode("gbk")) # for Windows(Chinese characters)
     zipf.close()
diff --git a/item/download.go b/item/download.go
@@ -12,7 +12,7 @@ import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/json"
-	"github.com/satori/go.uuid"
+	uuid "github.com/satori/go.uuid"
 )
 
 type PackRequest struct {
@@ -197,7 +197,7 @@ func DownloadItems(c *gin.Context) {
 			})
 			return
 		}
-		log.Println(c.ClientIP(), " Get the zip file signed url: ", url)
+		log.Println(c.ClientIP(), " Get the single file signed url: ", url)
 		c.JSON(http.StatusOK, gin.H{
 			"url": url,
 		})

diff --git a/scripts/dev-docker-compose.sh b/scripts/dev-docker-compose.sh
@@ -12,32 +12,32 @@ then
 
     if [ "$isD" = "y" ]||[ "$isD" = "Y" ]
     then
-        sudo docker-compose -f ../deployments/dev/docker-compose.yml up -d
+        sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml up -d
     else
-        sudo docker-compose -f ../deployments/dev/docker-compose.yml up
+        sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml up
     fi
 elif [ "$1" == "down" ]
 then
-    sudo docker-compose -f ../deployments/dev/docker-compose.yml down
+    sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml down
 elif [ "$1" == "build" ]
 then
-    sudo docker-compose -f ../deployments/dev/docker-compose.yml build --force-rm
+    sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml build --force-rm
 elif [ "$1" == "pull" ]
 then
-    sudo docker-compose -f ../deployments/dev/docker-compose.yml pull
+    sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml pull
 elif [ "$1" == "restart" ]
 then
-    sudo docker-compose -f ../deployments/dev/docker-compose.yml restart -t 10
+    sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml restart -t 10
 elif [ "$1" == "logs" ]
 then
     echo -e " Follow log output? (y/n, default: n): \c"
     read isF
     echo ""
     if [ "$isF" == "y" ] || [ "$isF" == "Y" ]
     then 
-        sudo docker-compose -f ../deployments/dev/docker-compose.yml logs -f
+        sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml logs -f
     else
-        sudo docker-compose -f ../deployments/dev/docker-compose.yml logs
+        sudo docker-compose -f ../deployments/dev-safeu/docker-compose.yml logs
     fi
 elif [ "$1" == "help" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]
 then

diff --git a/scripts/prod-docker-compose.sh b/scripts/prod-docker-compose.sh
@@ -7,23 +7,23 @@ echo -e "\n Build, up, down, restart, pull, check logs for SafeU production dock
 if [ "$1" == "up" ]
 then
     mkdir -p ../data/mariadb
-    sudo docker-compose -f ../deployments/prod/docker-compose.yml up -d
+    sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml up -d
 
 elif [ "$1" == "down" ]
 then
-    sudo docker-compose -f ../deployments/prod/docker-compose.yml down
+    sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml down
 
 elif [ "$1" == "build" ]
 then
-    sudo docker-compose -f ../deployments/prod/docker-compose.yml build --force-rm
+    sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml build --force-rm
 
 elif [ "$1" == "restart" ]
 then
-    sudo docker-compose -f ../deployments/prod/docker-compose.yml restart -t 10
+    sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml restart -t 10
 
 elif [ "$1" == "pull" ]
 then
-    sudo docker-compose -f ../deployments/prod/docker-compose.yml pull
+    sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml pull
 
 elif [ "$1" == "logs" ]
 then
@@ -32,9 +32,9 @@ then
     echo ""
     if [ "$isF" == "y" ] || [ "$isF" == "Y" ]
     then 
-        sudo docker-compose -f ../deployments/prod/docker-compose.yml logs -f
+        sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml logs -f
     else
-        sudo docker-compose -f ../deployments/prod/docker-compose.yml logs
+        sudo docker-compose -f ../deployments/prod-safeu/docker-compose.yml logs
     fi
 
 elif [ "$1" == "help" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]