Merge pull request #58 from Triple-Z/DeleteRecodeFromRedis

DeleteRecodeFromRedis

Author: Triple-Z

common/const.go

@@ -33,6 +33,9 @@ const FILE_MAX_EXIST_TIME = 24       //文件最大存在时长
 // 文件默认可下载次数
 const FILE_DEFAULT_DOWNCOUNT = 10
 
+// 文件签名下载签名过期时长 单位:秒
+const FILE_DOWNLOAD_SIGNURL_TIME = 60
+
 // 压缩包/归档类型
 const (
 	ARCHIVE_NULL   = iota // 0，非压缩包

common/tool.go

@@ -1,8 +1,12 @@
 package common
 
 import (
+	"fmt"
+	"log"
 	"math/rand"
 	"time"
+
+	"github.com/go-redis/redis"
 )
 
 // 生成随机字符串
@@ -31,3 +35,24 @@ func RandStringBytesMaskImprSrc(n int) string {
 
 	return string(b)
 }
+
+func DeleteRedisRecodeFromRecode(recode string) {
+	tokenRedisClient := GetUserTokenRedisClient()
+	reCodeRedisClient := GetReCodeRedisClient()
+	if !KeyISExistInRedis(recode, reCodeRedisClient) {
+		log.Println(fmt.Errorf("key %s is not in reCodeRedis", recode))
+	}
+	userToken := reCodeRedisClient.Get(recode).Val()
+	if !KeyISExistInRedis(userToken, tokenRedisClient) {
+		log.Println(fmt.Errorf("recode %s is in reCodeRedis,But key %s is not in userTokenRedis", recode, userToken))
+	}
+	reCodeRedisClient.Del(recode)
+	tokenRedisClient.Del(userToken)
+}
+
+func KeyISExistInRedis(str string, client *redis.Client) bool {
+	if client.Exists(str).Val() == 0 {
+		return false
+	}
+	return true
+}

item/delete.go

@@ -42,6 +42,8 @@ func DeleteManual(c *gin.Context) {
 		db.Delete(item)
 	}
 	DeleteItems(itemList)
+	//清理Redis
+	common.DeleteRedisRecodeFromRecode(itemList[0].ReCode)
 	c.JSON(http.StatusOK, gin.H{
 		"message": "ok",
 	})

item/download.go

@@ -9,6 +9,7 @@ import (
 
 	"a2os/safeu-backend/common"
 
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/json"
 	"github.com/satori/go.uuid"
@@ -119,7 +120,7 @@ func DownloadItems(c *gin.Context) {
 
 			// 删除数据库记录
 			db.Delete(&singleItem)
-
+			common.DeleteRedisRecodeFromRecode(singleItem.ReCode)
 			// 返回 410 Gone
 			c.JSON(http.StatusGone, gin.H{
 				"error": "Over the expired time.",
@@ -139,7 +140,7 @@ func DownloadItems(c *gin.Context) {
 
 			// 删除数据库记录
 			db.Delete(&singleItem)
-
+			common.DeleteRedisRecodeFromRecode(singleItem.ReCode)
 			c.JSON(http.StatusGone, gin.H{
 				"error": "Out of downloadable count.",
 			})
@@ -306,3 +307,19 @@ func GetZipEndpoint() (string, error) {
 
 	return zipEndpoint, nil
 }
+
+// 获取签名URL
+func GetSignURL(itemBucket string, itemPath string, client *oss.Client) (string, error) {
+
+	bucket, err := client.Bucket(itemBucket)
+	if err != nil {
+		log.Println(fmt.Sprintf("Func: GetSignURL Get Client %v Bucket %s Failed %s", client, itemBucket, err.Error()))
+		return "", err
+	}
+	signedURL, err := bucket.SignURL(itemPath, oss.HTTPGet, common.FILE_DOWNLOAD_SIGNURL_TIME)
+	if err != nil {
+		log.Println(fmt.Sprintf("Func: GetSignURL Get Bucket %s Object %s Failed %s", itemBucket, itemPath, err.Error()))
+		return "", err
+	}
+	return signedURL, nil
+}

item/downloadCount.go

@@ -44,6 +44,7 @@ func DownloadCount(c *gin.Context) {
 			} else {
 				// 删除数据库记录
 				db.Delete(&singleItem)
+				common.DeleteRedisRecodeFromRecode(singleItem.ReCode)
 				c.String(http.StatusOK, "DELETED")
 				return
 			}
@@ -68,6 +69,7 @@ func DownloadCount(c *gin.Context) {
 			} else {
 				// 删除数据库记录
 				db.Delete(&singleItem)
+				common.DeleteRedisRecodeFromRecode(singleItem.ReCode)
 				c.String(http.StatusOK, "DELETED")
 				return
 			}
@@ -128,6 +130,7 @@ func DownloadCount(c *gin.Context) {
 			} else {
 				// 删除数据库记录
 				db.Delete(&item)
+				common.DeleteRedisRecodeFromRecode(item.ReCode)
 				log.Println(c.ClientIP(), " Deleted item id ", item.ID, " by retrieve code \"", retrieveCode, "\"")
 				isDelete = true
 			}

item/update.go

@@ -153,13 +153,13 @@ func ChangeRecode(c *gin.Context) {
 	//2 合法性检测
 	// 2.1 在Redis中判断提取码重复
 	reCodeRedisClient := common.GetReCodeRedisClient()
-	if KeyISExistInRedis(changeRecodeBody.NewReCode, reCodeRedisClient) {
-		log.Println("Find reCode Repeat In Redis", changeRecodeBody.NewReCode)
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": "reCode Repeat",
-		})
-		return
-	}
+	//if KeyISExistInRedis(changeRecodeBody.NewReCode, reCodeRedisClient) {
+	//	//	log.Println("Find reCode Repeat In Redis", changeRecodeBody.NewReCode)
+	//	//	c.JSON(http.StatusBadRequest, gin.H{
+	//	//		"message": "reCode Repeat",
+	//	//	})
+	//	//	return
+	//	//}
 	// 2.2 在DB中判断判断提取码重复
 	db := common.GetDB()
 	if CheckReCodeRepeatInDB(changeRecodeBody.NewReCode, db) {

item/upload.go

@@ -481,7 +481,8 @@ func FinishUpload(c *gin.Context) {
 	owner := common.RandStringBytesMaskImprSrc(common.UserTokenLength)
 	// 将提取码推入Redis
 	reCodeRedisClient := common.GetReCodeRedisClient()
-	reCodeRedisClient.Set(reCode, owner, 0)
+	redisExpireTime, _ := time.ParseDuration(common.FILE_DEFAULT_EXIST_TIME)
+	reCodeRedisClient.Set(reCode, owner, redisExpireTime)
 	// 将用户识别码推入Redis
 	tokenRedisClient := common.GetUserTokenRedisClient()
 	tokenRedisClient.SAdd(owner, files)

item/validation.go

@@ -179,7 +179,7 @@ func CheckDownCountAndExpiredTime(db *gorm.DB, retrieveCode string) ([]Item, err
 
 			// 删除数据库记录
 			db.Delete(&item)
-
+			common.DeleteRedisRecodeFromRecode(item.ReCode)
 			itemList = append(itemList[:j], itemList[j+1:]...)
 			deleted++
 			continue
@@ -197,7 +197,7 @@ func CheckDownCountAndExpiredTime(db *gorm.DB, retrieveCode string) ([]Item, err
 
 			// 删除数据库记录
 			db.Delete(&item)
-
+			common.DeleteRedisRecodeFromRecode(item.ReCode)
 			itemList = append(itemList[:j], itemList[j+1:]...)
 			deleted++
 			continue