From cff1aed9e9833fdf5457e9bef4ad57bec14e4689 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Fri, 18 Jun 2021 16:52:34 +0800 Subject: [PATCH] aa --- business/jxstore/knowledge/knowledge.go | 26 +++++++++++++++++ business/partner/purchase/ebai/order.go | 2 +- controllers/knowledge_controller.go | 39 +++++++++++++++++++++++++ routers/commentsRouter_controllers.go | 27 +++++++++++++++++ 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/business/jxstore/knowledge/knowledge.go b/business/jxstore/knowledge/knowledge.go index a760291c4..76575bda7 100644 --- a/business/jxstore/knowledge/knowledge.go +++ b/business/jxstore/knowledge/knowledge.go @@ -4,6 +4,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "mime/multipart" ) func GetKnowledgeDepot(ctx *jxcontext.Context, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) { @@ -27,3 +28,28 @@ func UpdateKnowledgeDepot(ctx *jxcontext.Context, id int, content string, isDel } return err } + +type SNSUploadImgResult struct { + URL string `json:"url"` + MediaID string `json:"mediaID"` +} + +func SNSUploadImg(ctx *jxcontext.Context, files []*multipart.FileHeader, isThumb bool) (snsUploadImgResult *SNSUploadImgResult, err error) { + //var ( + // data = []byte{} + // fileHeader = files[0] + // fileName = fileHeader.Filename + //) + //snsUploadImgResult = &SNSUploadImgResult{} + //file, err := fileHeader.Open() + //file.Read(data) + //file.Close() + ////如果不是缩略图，只会返url + ////如果是封面缩略图，则还会返mediaID + //if !isThumb { + // + //} else { + // + //} + return snsUploadImgResult, err +} diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index c34bd21ae..23d958dda 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -631,7 +631,7 @@ func getTimeFromInterface(timeValue interface{}) time.Time { } func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *model.GoodsOrder) (mobile string, err error) { - mobile, err = api.EbaiAPI.GetRealMobile4Order(order.VendorOrderID) + //mobile, err = api.EbaiAPI.GetRealMobile4Order(order.VendorOrderID) return mobile, err } diff --git a/controllers/knowledge_controller.go b/controllers/knowledge_controller.go index 3b4cc2b76..e774ac4b9 100644 --- a/controllers/knowledge_controller.go +++ b/controllers/knowledge_controller.go @@ -1,7 +1,9 @@ package controllers import ( + "git.rosy.net.cn/baseapi/platformapi/weixinapi" "git.rosy.net.cn/jx-callback/business/jxstore/knowledge" + "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -51,6 +53,43 @@ func (c *KnowController) UpdateKnowledgeDepot() { // @router /GetMaterialList [get] func (c *KnowController) GetMaterialList() { c.callGetMaterialList(func(params *tKnowGetMaterialListParams) (retVal interface{}, errCode string, err error) { + retVal, err = api.WeixinAPI.CBBatchgetMaterial(weixinapi.MaterialTypeNews, params.Offset, params.PageSize) + return retVal, "", err + }) +} + +// @Title 添加素材 +// @Description 添加素材 +// @Param token header string true "认证token" +// @Param knowIDs formData string false "知识条目IDs" +// @Param title formData string true "素材标题" +// @Param digest formData string false "素材摘要" +// @Param author formData string false "作者" +// @Param thumbMediaID formData string true "封面缩略图ID" +// @Param showCoverPic formData int false "内容中是否显示封面，0不显示，1显示" +// @Param needOpenComment formData int false "是否打开评论，0不打开，1打开" +// @Param onlyFansCanComment formData int false "是否只允许粉丝才能评论" +// @Param content formData string true "内容" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /AddMaterial [post] +func (c *KnowController) AddMaterial() { + c.callAddMaterial(func(params *tKnowAddMaterialParams) (retVal interface{}, errCode string, err error) { + return retVal, "", err + }) +} + +// @Title 公众号上传图片 +// @Description 公众号上传图片 +// @Param token header string true "认证token" +// @Param isThumb query bool false "是否是缩略图" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /SNSUploadImg [get] +func (c *KnowController) SNSUploadImg() { + c.callSNSUploadImg(func(params *tKnowSNSUploadImgParams) (retVal interface{}, errCode string, err error) { + files := c.Ctx.Request.MultipartForm.File["userfiles"] + retVal, err = knowledge.SNSUploadImg(params.Ctx, files, params.IsThumb) return retVal, "", err }) } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index c1dfa7060..13710e207 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -3707,4 +3707,31 @@ func init() { MethodParams: param.Make(), Filters: nil, Params: nil}) + + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:KnowController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:KnowController"], + web.ControllerComments{ + Method: "GetMaterialList", + Router: `/GetMaterialList`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:KnowController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:KnowController"], + web.ControllerComments{ + Method: "AddMaterial", + Router: `/AddMaterial`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:KnowController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:KnowController"], + web.ControllerComments{ + Method: "SNSUploadImg", + Router: `/SNSUploadImg`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) }