1

business/jxstore/cms/sku.go

@@ -3061,9 +3061,6 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
 		return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
 	}
 
-	KK := jxutils.MixWatermarkImg2(imgWaterMark, "http://p0.meituan.net/sgopen/f4db3d7e68be94c4a92f654de0d03d05118085.jpg", &fromTimeP, &toTimeP)
-	globals.SugarLogger.Debugf("---KK := %s", KK)
-
 	task := tasksch.NewParallelTask("刷新商品前缀水印图", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			switch vendorID {
@@ -3092,9 +3089,8 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
 
 							param := map[string]interface{}{}
 							if imgWaterMark != "" {
-								globals.SugarLogger.Debugf("---foodList := %s", utils.Format4Output(v, false))
-
-								if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" {
+								qiNiuImg := jxutils.UploadQiNiuImg(v.PictureList[0])
+								if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, qiNiuImg, &fromTimeP, &toTimeP); ImgMix != "" {
 									globals.SugarLogger.Debugf("---ImgMix := %s", ImgMix)
 									picture := make([]string, 0, len(v.PictureList))
 									picture = append(picture, ImgMix)

business/jxutils/jxutils.go

@@ -816,6 +816,23 @@ func UploadExportContent(content []byte, key string) (downloadURL string, err er
 	return downloadURL, err
 }
 
+func DeleteExportContent(key string) (err error) {
+	//putPolicy := storage.PutPolicy{
+	//	Scope:           globals.QiniuBucket,
+	//	Expires:         10 * 60,
+	//	DeleteAfterDays: 1,
+	//}
+	//upToken := putPolicy.UploadToken(api.QiniuAPI)
+	cfg := &storage.Config{}
+	formUploader := storage.NewBucketManager(api.QiniuAPI, cfg)
+	//ret := storage.PutRet{}
+	if err = formUploader.Delete("jingxistandardlib", key); err == nil {
+		return nil
+	}
+
+	return err
+}
+
 func UploadExeclAndPushMsg(sheetList []*excel.Obj2ExcelSheetConfig, name string) (downloadURL, fileName string, err error) {
 	excelBin := excel.Obj2Excel(sheetList)
 	timeStr := utils.Int64ToStr(time.Now().Unix())
@@ -1130,8 +1147,6 @@ func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.
 
 //合成水印图1111
 func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) {
-	globals.SugarLogger.Debugf("---imgWatermark := %s", imgWatermark)
-	globals.SugarLogger.Debugf("---img := %s", img)
 	if exPrefixBegin != nil && exPrefixEnd != nil {
 		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {
 			baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
@@ -1143,7 +1158,6 @@ func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time
 			}
 			if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
 				downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)])
-				globals.SugarLogger.Debugf("---downloadURL := %s", downloadURL)
 				if err == nil {
 					return downloadURL
 				}
@@ -1156,6 +1170,17 @@ func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time
 	return imgMix
 }
 
+// UploadQiNiuImg 将其他图片转化为京西图片
+func UploadQiNiuImg(img string) string {
+	if resBinary, _, err := DownloadFileByURL(img); err == nil {
+		downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)])
+		if err == nil {
+			return downloadURL
+		}
+	}
+	return img
+}
+
 func GetDefendPriceIssue() (issue int) {
 	if time.Now().Hour() >= 22 {
 		issue = utils.Str2Int(time.Now().AddDate(0, 0, 1).Format("20060102"))

controllers/cms_sku.go

@@ -635,6 +635,21 @@ func (c *SkuController) UpdateVendorSkuImg() {
 	})
 }
 
+// @Title 删除已经存在文件
+// @Description 删除已经存在文件
+// @Param	token				header			string	true	"认证token"
+// @Param	name				formData		string	true	"文件名称"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /DeleteVendorSkuImg [post]
+func (c *SkuController) DeleteVendorSkuImg() {
+	c.callDeleteVendorSkuImg(func(params *tSkuDeleteVendorSkuImgParams) (retVal interface{}, errCode string, err error) {
+		err = jxutils.DeleteExportContent(params.Name)
+		return retVal, "", err
+	})
+
+}
+
 // @Title 得到平台类别
 // @Description 得到平台类别
 // @Param	token			header		string	true	"认证token"

routers/commentsRouter_controllers.go

@@ -2499,6 +2499,15 @@ func init() {
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
+	// 删除七牛云文件
+	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
+		web.ControllerComments{
+			Method:           "DeleteVendorSkuImg",
+			Router:           `/DeleteVendorSkuImg`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
 		web.ControllerComments{

swagger/swagger.json

@@ -15317,6 +15317,35 @@
                 }
             }
         },
+        "/sku/DeleteVendorSkuImg": {
+            "put": {
+                "tags": [
+                    "sku"
+                ],
+                "description": "删除已经存在文件",
+                "operationId": "SkuController.删除已经存在文件",
+                "parameters": [
+                    {
+                        "in": "header",
+                        "name": "token",
+                        "description": "认证token",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "formData",
+                        "name": "name",
+                        "description": "文件名称",
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{object} controllers.CallResult"
+                    }
+                }
+            }
+        },
         "/sku/GetCategories": {
             "get": {
                 "tags": [

swagger/swagger.yml

@@ -10386,6 +10386,25 @@ paths:
       responses:
         "200":
           description: '{object} controllers.CallResult'
+  /sku/DeleteVendorSkuImg:
+    put:
+      tags:
+      - sku
+      description: 删除已经存在文件
+      operationId: SkuController.删除已经存在文件
+      parameters:
+      - in: header
+        name: token
+        description: 认证token
+        required: true
+        type: string
+      - in: formData
+        name: name
+        description: 文件名称
+        type: string
+      responses:
+        "200":
+          description: '{object} controllers.CallResult'
   /sku/GetCategories:
     get:
       tags: