图片处理 bugfix

polaris1119 · polaris1119 · commit c635c1ea137a · 2019-08-15T18:54:37.000+08:00
diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.1 // indirect
 	github.com/polaris1119/config v0.0.0-20160609095218-06a751e884f3
 	github.com/polaris1119/email v0.0.0-20171030115359-9c57dd3e3e7d
-	github.com/polaris1119/goutils v0.0.0-20160602032428-582c98b3184b
+	github.com/polaris1119/goutils v0.0.0-20190815094239-73c47df9b896
 	github.com/polaris1119/keyword v0.0.0-20170608075927-96ae6735f2f2
 	github.com/polaris1119/logger v0.0.0-20170422061149-0233d014769e
 	github.com/polaris1119/nosql v0.0.0-20181019111233-3852ef28d084
diff --git a/go.sum b/go.sum
@@ -158,6 +158,8 @@ github.com/polaris1119/email v0.0.0-20171030115359-9c57dd3e3e7d h1:5Tx8BuKqRGhit
 github.com/polaris1119/email v0.0.0-20171030115359-9c57dd3e3e7d/go.mod h1:3S7Km+d2GftzOJJgrvIGHDtRxm5eUZamHaoUzLZNJX0=
 github.com/polaris1119/goutils v0.0.0-20160602032428-582c98b3184b h1:THcO90yP3NaMbkQmcnKyu8wJBS1iSO3Z7eAo5axqVbA=
 github.com/polaris1119/goutils v0.0.0-20160602032428-582c98b3184b/go.mod h1:yHb+G3YG7G0Hf0EIXCjbOe/Aus8TXZtYa/ZPEqyMxXU=
+github.com/polaris1119/goutils v0.0.0-20190815094239-73c47df9b896 h1:BYTbNGq/6Y28744ZVeOcD9s0qkeuTrDka8PCbaXPs4g=
+github.com/polaris1119/goutils v0.0.0-20190815094239-73c47df9b896/go.mod h1:yHb+G3YG7G0Hf0EIXCjbOe/Aus8TXZtYa/ZPEqyMxXU=
 github.com/polaris1119/keyword v0.0.0-20170608075927-96ae6735f2f2 h1:63TyJE7nj3eUsJ/1jbzrnH8gxw1z3oV/su2RIyVHlRQ=
 github.com/polaris1119/keyword v0.0.0-20170608075927-96ae6735f2f2/go.mod h1:YYx1sYXgS43cG1iH0cXYFcibESl8azhUrA6W10gYb9E=
 github.com/polaris1119/logger v0.0.0-20170422061149-0233d014769e h1:HSeLmpKe7eny4fT5tdnYfQffWvx6aKCdzIcW/MZWt3I=
diff --git a/logic/article.go b/logic/article.go
@@ -867,7 +867,9 @@ func (self ArticleLogic) transferImage(ctx context.Context, s *goquery.Selection
 
 func (self ArticleLogic) setImgSrc(ctx context.Context, v string, imgDeny bool, s *goquery.Selection, domain string) {
 	if imgDeny {
-		if !strings.HasPrefix(v, "http") {
+		if strings.HasPrefix(v, "//") {
+			v = "https:" + v
+		} else if !strings.HasPrefix(v, "http") {
 			v = "http://" + domain + "/" + v
 		}
 		path, err := DefaultUploader.TransferUrl(ctx, v)
diff --git a/logic/resource.go b/logic/resource.go
@@ -44,23 +44,18 @@ func (ResourceLogic) Publish(ctx context.Context, me *model.Me, form url.Values)
 			return
 		}
 
-		fields := []string{"title", "catid", "form", "url", "content"}
 		if form.Get("form") == model.LinkForm {
 			form.Set("content", "")
 		} else {
 			form.Set("url", "")
 		}
 
-		for _, field := range fields {
-			form.Del(field)
-		}
-
 		err = schemaDecoder.Decode(resource, form)
 		if err != nil {
 			objLog.Errorln("ResourceLogic Publish decode error:", err)
 			return
 		}
-		_, err = MasterDB.Id(id).Update(resource)
+		_, err = MasterDB.ID(id).Update(resource)
 		if err != nil {
 			objLog.Errorf("更新资源 【%s】 信息失败：%s\n", id, err)
 			return
diff --git a/logic/uploader.go b/logic/uploader.go
@@ -219,12 +219,12 @@ func (this *UploaderLogic) TransferUrl(ctx context.Context, origUrl string, pref
 		exts, err := mime.ExtensionsByType(contentType)
 		if err != nil {
 			logger.Errorln("detect extension error:", err, "orig url:", origUrl)
-		} else  if len(exts) > 0 {
+		} else if len(exts) > 0 {
 			ext = exts[0]
 		}
 	}
 
-	if ext == "" || !strings.Contains("png,jpg,jpeg,gif,bmp", strings.ToLower(ext)) {
+	if ext == "" && !strings.Contains("png,jpg,jpeg,gif,bmp", strings.ToLower(ext)) {
 		logger.Errorln("can't fetch extension, url:", origUrl)
 		return origUrl, errors.New("can't fetch extension")
 	}

Original file line number	Diff line number	Diff line change
`@@ -219,12 +219,12 @@ func (this *UploaderLogic) TransferUrl(ctx context.Context, origUrl string, pref`
`219`	`219`	`exts, err := mime.ExtensionsByType(contentType)`
`220`	`220`	`if err != nil {`
`221`	`221`	`logger.Errorln("detect extension error:", err, "orig url:", origUrl)`
`222`		`- } else if len(exts) > 0 {`
	`222`	`+ } else if len(exts) > 0 {`
`223`	`223`	`ext = exts[0]`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`227`		`- if ext == "" \|\| !strings.Contains("png,jpg,jpeg,gif,bmp", strings.ToLower(ext)) {`
	`227`	`+ if ext == "" && !strings.Contains("png,jpg,jpeg,gif,bmp", strings.ToLower(ext)) {`
`228`	`228`	`logger.Errorln("can't fetch extension, url:", origUrl)`
`229`	`229`	`return origUrl, errors.New("can't fetch extension")`
`230`	`230`	`}`