detail 支持 \n 换行

src/service/repair_service.go

@@ -17,6 +17,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"ossutil"
 	qu "qfw/util"
 	"qfw/util/redis"
 	"regexp"
@@ -35,6 +36,8 @@ var (
 	rpre2         = regexp.MustCompile("https://www.jianyu360.cn/article/mailprivate/")
 	rsuf          = regexp.MustCompile("(.html).*")
 	AddSpiderCode = "sdxzbiddingsjzypc" // 新增bidding数据spider_code
+	//domain        = "http://172.31.31.203:1111" //测试环境oss
+	domain = "http://172.17.162.27:18011" //正式环境 oss
 )
 
 type RepairRule struct {
@@ -65,7 +68,7 @@ type RepairRule struct {
 	repairProRecord xweb.Mapper `xweb:"/service/jy/repair/pro/record"`
 
 	repairNewAdd     xweb.Mapper `xweb:"/service/jy/repair/newAdd"`
-	repairPub        xweb.Mapper `xweb:"/service/jy/repair/pubSave"`
+	repairPub        xweb.Mapper `xweb:"/service/jy/repair/pubSave"` //新增数据(紧急)
 	repairBulkAddImp xweb.Mapper `xweb:"/service/jy/repair/bulkAdd/imp"`
 	repairBulkAdd    xweb.Mapper `xweb:"/service/jy/repair/bulkAdd"`
 
@@ -109,7 +112,7 @@ func (jy *RepairRule) RepairCreate() {
 	jy.Render("repair/jy_create.html", &jy.T)
 }
 
-// 新增数据
+// RepairNewSave 剑鱼维护-公告修改- 新增数据
 func (jy *RepairRule) RepairNewSave() {
 	defer qu.Catch()
 	//mongo新增
@@ -159,6 +162,50 @@ func (jy *RepairRule) RepairNewSave() {
 		(*updata)["infoformat"] = 1
 	}
 	b := JYMgo.SaveByOriID(JyCollNameOne, *updata)
+	//OSS 上传
+	if detail != "" {
+		args := ossutil.UploadArgs{
+			BucketID:   "detail",
+			ObjectName: fmt.Sprintf("%s.txt", id),
+			Gzip:       false,
+			Stream:     []byte(detail),
+		}
+		//OssPutObject(OssBucketNameDetail, id, []byte(detail))
+		res := ossutil.UpLoadByRestful(domain, &args)
+		if res.Error_code != 0 {
+			log.Println("RepairPub", id, "上传 OSS detail  失败", res)
+		}
+		//通过id 获取detail 详情
+		//dd_args := ossutil.Args{
+		//	BucketID:   "detail",
+		//	ObjectName: id,
+		//}
+		//dd_detail := ossutil.GetBidDetailByRestful(domain, &dd_args)
+		//
+		//log.Println("detail", dd_detail.Data)
+	}
+
+	if contenthtml != "" {
+		args := ossutil.UploadArgs{
+			BucketID:   "contenthtml",
+			ObjectName: fmt.Sprintf("%s.txt", id),
+			Gzip:       false,
+			Stream:     []byte(contenthtml),
+		}
+		//OssPutObject(OssBucketNameDetail, id, []byte(detail))
+		res := ossutil.UpLoadByRestful(domain, &args)
+		if res.Error_code != 0 {
+			log.Println("RepairPub", id, "上传 OSS contenthtml 失败", res)
+		}
+
+		//cc_args := ossutil.Args{
+		//	BucketID:   "contenthtml",
+		//	ObjectName: id,
+		//}
+		//dd_cc := ossutil.GetBidDetailByRestful(domain, &cc_args)
+		//
+		//log.Println("contenthtml", dd_cc.Data)
+	}
 	// 保存服务
 	href := qu.ObjToString((*updata)["href"])
 	//db := HexToBigIntMod(href)
@@ -242,6 +289,7 @@ func (jy *RepairRule) RepairBulkAdd() {
 
 }
 
+// RepairPub 新增数据(紧急
 func (jy *RepairRule) RepairPub() {
 	defer qu.Catch()
 	request_data := GetPostForm(jy.Request)
@@ -266,6 +314,7 @@ func (jy *RepairRule) RepairPub() {
 		} else if k == "detail" {
 			v = strings.Replace(qu.ObjToString(v), "&#60;", "<", -1)
 			v = strings.Replace(qu.ObjToString(v), "&#62;", ">", -1)
+			v = strings.Replace(qu.ObjToString(v), "\n", "</br>", -1)
 			save[k] = v
 		} else if k == "budget" || k == "bidamount" {
 			save[k] = qu.Float64All(v)
@@ -277,6 +326,9 @@ func (jy *RepairRule) RepairPub() {
 			if len(cid) > 0 {
 				save["entidlist"] = cid
 			}
+		} else if k == "contenthtml" {
+			v = strings.Replace(qu.ObjToString(v), "\n", "</br>", -1)
+			save[k] = v
 		} else {
 			if k == "buyer" {
 				modifyinfo[k] = "剑鱼维护"
@@ -304,10 +356,51 @@ func (jy *RepairRule) RepairPub() {
 	b := JYMgo.SaveByOriID(JyCollNameOne, save)
 	if b {
 		if detail := qu.ObjToString(save["detail"]); detail != "" {
-			OssPutObject(OssBucketNameDetail, id, []byte(detail))
+			args := ossutil.UploadArgs{
+				BucketID:   "detail",
+				ObjectName: fmt.Sprintf("%s.txt", id),
+				Gzip:       false,
+				Stream:     []byte(detail),
+			}
+			//OssPutObject(OssBucketNameDetail, id, []byte(detail))
+			res := ossutil.UpLoadByRestful(domain, &args)
+			if res.Error_code != 0 {
+				log.Println("RepairPub", id, "上传 OSS detail  失败", res)
+			}
+
+			////通过id 获取detail 详情
+			//dd_args := ossutil.Args{
+			//	BucketID:   "detail",
+			//	ObjectName: id,
+			//}
+			//dd_detail := ossutil.GetBidDetailByRestful(domain, &dd_args)
+			//
+			//log.Println("detail", dd_detail)
 		}
+
+		//contenthtml  bucket id contenthtml not found
 		if contenthtml := qu.ObjToString(save["contenthtml"]); contenthtml != "" {
-			OssPutObject(OssBucketNameContenthtml, id, []byte(contenthtml))
+			args := ossutil.UploadArgs{
+				BucketID:   "contenthtml",
+				ObjectName: fmt.Sprintf("%s.txt", id),
+				Gzip:       false,
+				Stream:     []byte(contenthtml),
+			}
+			//OssPutObject(OssBucketNameDetail, id, []byte(detail))
+			res := ossutil.UpLoadByRestful(domain, &args)
+			if res.Error_code != 0 {
+				log.Println("RepairPub", id, "上传 OSS contenthtml 失败", res)
+			}
+
+			//cc_args := ossutil.Args{
+			//	BucketID:   "contenthtml",
+			//	ObjectName: id,
+			//}
+			//dd_cc := ossutil.GetBidDetailByRestful(domain, &cc_args)
+			//
+			//log.Println("contenthtml", dd_cc)
+
+			//OssPutObject(OssBucketNameContenthtml, id, []byte(contenthtml))
 		}
 		// 保存服务
 		href := qu.ObjToString(save["href"])
@@ -588,11 +681,13 @@ func (jy *RepairRule) RepairSave() {
 		if detail := qu.ObjToString(updata["detail"]); detail != "" {
 			detail = strings.Replace(detail, "&#60;", "<", -1)
 			detail = strings.Replace(detail, "&#62;", ">", -1)
+			detail = strings.Replace(detail, "\n", "</br>", -1)
 			updata["detail"] = detail
 		}
 		if contenthtml := qu.ObjToString(updata["contenthtml"]); contenthtml != "" {
 			contenthtml = strings.Replace(contenthtml, "&#60;", "<", -1)
 			contenthtml = strings.Replace(contenthtml, "&#62;", ">", -1)
+			contenthtml = strings.Replace(contenthtml, "\n", "</br>", -1)
 			updata["contenthtml"] = contenthtml
 		}
 

src/util/ossclient.go

@@ -5,11 +5,10 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"fmt"
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"io/ioutil"
 	"os"
 	"qfw/util"
-
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 )
 
 var (