Merge pull request #95 from Triple-Z/dev

Deployment patches
NUAA-Open-Source · Apr 17, 2019 · 0adb8bb · 0adb8bb
2 parents a4316ec + 5dfc3fa
commit 0adb8bb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/build/package/safeu-backend-dev/Dockerfile-compose b/build/package/safeu-backend-dev/Dockerfile-compose
@@ -2,9 +2,6 @@ FROM golang:1.9.7
 
 MAINTAINER TripleZ "[email protected]"
 
-WORKDIR $GOPATH/src/a2os/safeu-backend
-ADD . $GOPATH/src/a2os/safeu-backend/
-
 # COPY conf/db.example.json $GOPATH/src/a2os/safeu-backend/conf/db.json
 
 # Solution for Chinese special network enviornment 
@@ -16,6 +13,9 @@ RUN mkdir -p $GOPATH/src/golang.org/x/ && \
 # Add dependencies
 RUN go get github.com/pilu/fresh
 
+WORKDIR $GOPATH/src/a2os/safeu-backend
+ADD . $GOPATH/src/a2os/safeu-backend/
+
 # Build package
 RUN go build -o safeu-backend-dev .
 

diff --git a/common/const.go b/common/const.go
@@ -3,7 +3,7 @@ package common
 var CloudConfig *CloudConfiguration
 
 const (
-	DEBUG       = true
+	DEBUG       = false
 	MAINTENANCE = false
 	PORT        = "8080"
 )

diff --git a/deployments/prod-safeu/docker-compose.yml b/deployments/prod-safeu/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       context: ../..
       dockerfile: ././build/package/safeu-backend/Dockerfile-compose
     volumes:
-      - ../../log/web1:/go/src/a2os/safeu-backend/log/
+      - ../../log/safeu1:/go/src/a2os/safeu-backend/log
       # - ../..:/go/src/a2os/safeu-backend/
     environment:
       - TZ=Asia/Shanghai
@@ -39,7 +39,7 @@ services:
       context: ../..
       dockerfile: ././build/package/safeu-backend/Dockerfile-compose
     volumes:
-      - ../../log/web2:/go/src/a2os/safeu-backend/log/
+      - ../../log/safeu2:/go/src/a2os/safeu-backend/log
       # - ../..:/go/src/a2os/safeu-backend/
     environment:
       - TZ=Asia/Shanghai
@@ -56,7 +56,7 @@ services:
       context: ../..
       dockerfile: ././build/package/safeu-backend/Dockerfile-compose
     volumes:
-      - ../../log/web2:/go/src/a2os/safeu-backend/log/
+      - ../../log/safeu3:/go/src/a2os/safeu-backend/log
       # - ../..:/go/src/a2os/safeu-backend/
     environment:
       - TZ=Asia/Shanghai

diff --git a/item/download.go b/item/download.go
@@ -384,6 +384,9 @@ func GetSignURL(itemBucket string, itemPath string, client *oss.Client) (string,
 		log.Println(fmt.Sprintf("Func: GetSignURL Get Bucket %s Object %s Failed %s", itemBucket, itemPath, err.Error()))
 		return "", err
 	}
-	log.Println("signed url: ", signedURL)
-	return signedURL, nil
+
+	// TODO: 优雅一点……这个太暴力了
+	signedHttpsURL := "https" + signedURL[4:]
+	log.Println("signed url: ", signedHttpsURL)
+	return signedHttpsURL, nil
 }
diff --git a/item/downloadCount.go b/item/downloadCount.go
@@ -77,7 +77,7 @@ func MinusDownloadCount(c *gin.Context) {
 
 		// 下载次数--
 		singleItem.DownCount -= 1
-		if singleItem.DownCount <= 0 {
+		if singleItem.DownCount < 0 {
 			// 删除文件
 			err := DeleteItem(singleItem.Bucket, singleItem.Path)
 			if err != nil {

diff --git a/item/info.go b/item/info.go
@@ -29,9 +29,9 @@ func GetItemInfo(c *gin.Context) {
 		return
 	}
 	c.JSON(http.StatusOK, gin.H{
-		"down_count ": item.DownCount,
-		"expired_at":  item.ExpiredAt,
-		"is_public":   item.IsPublic,
+		"down_count": item.DownCount,
+		"expired_at": item.ExpiredAt,
+		"is_public":  item.IsPublic,
 	})
 	return
 }