Merge branch 'cygx_12.0' into debug

controllers/research.go

@@ -800,15 +800,16 @@ func (this *ResearchController) ArticleNewList() {
 			ArticleTypeName: nameMap[v.ArticleTypeId],
 			ButtonStyle:     styleMap[v.ArticleTypeId],
 			SpecialTags:     v.SpecialTags,
+			UserId:          v.UserId,
 			List:            v.List,
 		}
 		if v.ArticleTypeId == -1 {
 			item.ArticleTypeName = utils.CYGX_YANXUAN_SPECIAL
 		}
 		if v.SpecialType == 1 {
-			item.Title = "【笔记】"+item.Title
+			item.Title = "【笔记】" + item.Title
 		} else if v.SpecialType == 2 {
-			item.Title = "【观点】"+item.Title
+			item.Title = "【观点】" + item.Title
 		}
 		resp.List = append(resp.List, &item)
 	}

controllers/yanxuan_special.go

@@ -2,9 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/medivhzhan/weapp/v2"
+	"github.com/rdlucklib/rdluck_tools/file"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
+	"os"
 	"time"
 )
 
@@ -261,7 +265,7 @@ func (this *YanxuanSpecialController) Save() {
 		return
 	}
 
-	if req.Content == "" {
+	if req.Content == "" && req.DoType == 2 {
 		br.Msg = "请输入内容"
 		return
 	}
@@ -289,12 +293,6 @@ func (this *YanxuanSpecialController) Save() {
 		item.Status = 2
 	}
 
-	errCode, keyword := models.WxCheckContent(req.Content)
-	if errCode != 0 {
-		br.Msg = "文章内容含有违法违规内容，关键词："+keyword
-		br.ErrMsg = "文章内容含有违法违规内容，关键词："+keyword
-		return
-	}
 	if req.Id == 0 {
 		_, err = models.AddCygxYanxuanSpecial(&item)
 		if err != nil {
@@ -817,6 +815,13 @@ func (this *YanxuanSpecialController) AuthorList() {
 		return
 	}
 
+	for _, v := range list {
+		if !v.LatestPublishTime.IsZero() {
+			v.LatestPublishDate = v.LatestPublishTime.Format(utils.FormatDate) + "更新"
+		} else {
+			v.LatestPublishDate = v.ModifyTime.Format(utils.FormatDate) + "更新"
+		}
+	}
 	resp := new(models.SpecialAuthorListResp)
 
 	if specialUser != nil {
@@ -956,34 +961,47 @@ func (this *YanxuanSpecialController) Check() {
 		br.Msg = "请输入内容"
 		return
 	}
-	//itemToken, err := services.WxGetToken()
-	//if err != nil {
-	//	br.Msg = "GetWxAccessToken Err:" + err.Error()
-	//	return
-	//}
-	//if itemToken.AccessToken == "" {
-	//	br.Msg = "accessToken is empty"
-	//	return
-	//}
-	//cli := weapp.NewClient(utils.WxAppId, utils.WxAppSecret)
-	//commerr, err := cli.MSGSecCheck(req.Content)
-	//if err != nil {
-	//	br.Msg = "内容校验失败！"
-	//	br.ErrMsg = "内容校验失败，Err:" + err.Error()
-	//	return
-	//}
-	//if commerr.ErrCode != 0 {
-	//	br.Msg = "内容违规,请重新提交！"
-	//	br.ErrMsg = "文字内容违规，Err:" + commerr.ErrMSG
-	//	return
-	//}
+	itemToken, err := services.WxGetToken()
+	if err != nil {
+		br.Msg = "GetWxAccessToken Err:" + err.Error()
+		return
+	}
+	if itemToken.AccessToken == "" {
+		br.Msg = "accessToken is empty"
+		return
+	}
 
-	errCode, keyword := models.WxCheckContent(req.Content)
-	if errCode != 0 {
-		br.Msg = "文章内容含有违法违规内容，关键词："+keyword
-		br.ErrMsg = "文章内容含有违法违规内容，关键词："+keyword
+	suggest := models.WxCheckContent(itemToken.AccessToken,sysUser.OpenId, req.Content)
+	if suggest == "risky" {
+		br.Msg = "文章内容含有违法违规内容"
+		br.ErrMsg = "文章内容含有违法违规内容"
 		return
 	}
+	if req.ImgUrl != "" {
+		imgBody, err := http.Get(req.ImgUrl)
+		if err != nil {
+			return
+		}
+		rnStr := utils.GetRandStringNoSpecialChar(5)
+		savePath := time.Now().Format(utils.FormatDateTimeUnSpace) + rnStr + ".jpg"
+		err = file.SaveFile(imgBody, savePath)
+		if err != nil {
+			return
+		}
+		res, err := weapp.IMGSecCheck(itemToken.AccessToken, savePath)
+		if err != nil {
+			// 处理一般错误信息
+			return
+		}
+		if err := res.GetResponseError(); err !=nil {
+			// 处理微信返回错误信息
+			return
+		}
+		err = os.RemoveAll(savePath)
+		if err != nil {
+			return
+		}
+	}
 
 	br.Ret = 200
 	br.Success = true

models/cygx_yanxuan_special.go

@@ -42,12 +42,12 @@ type CygxYanxuanSpecialItem struct {
 	BgImg         string // 背景图
 	Reason        string // 理由
 	Title         string // 标题
-	Type          int // 类型1:笔记，2:观点
+	Type          int    // 类型1:笔记，2:观点
 	CollectNum    int
 	MyCollectNum  int
 	IsCollect     int
 	ContentHasImg int //正文是否包含图片 1包含 0不包含
-	Docs []Doc
+	Docs          []Doc
 }
 
 type CygxYanxuanSpecialResp struct {
@@ -163,7 +163,7 @@ func CancelPublishYanxuanSpecial(id int) (err error) {
 }
 
 type DelCygxYanxuanSpecialReq struct {
-	Id     int    // 文章id
+	Id int // 文章id
 }
 
 func DelYanxuanSpecial(id int) (err error) {
@@ -176,4 +176,5 @@ func DelYanxuanSpecial(id int) (err error) {
 
 type CygxYanxuanSpecialCheckReq struct {
 	Content string // 内容
-}
+	ImgUrl  string // 图片
+}

models/cygx_yanxuan_special_user.go

@@ -22,24 +22,26 @@ type CygxYanxuanSpecialAuthor struct {
 }
 
 type CygxYanxuanSpecialAuthorItem struct {
-	Id                int    `orm:"column(id);pk"`
-	UserId            int    // 用户ID
-	SpecialName       string // 专栏名称
-	Introduction      string // 介绍
-	Label             string // 标签
-	NickName          string // 昵称
-	RealName          string // 姓名
-	CompanyName       string // 公司名
-	Mobile            string // 手机号
-	CreateTime        string // 创建时间
-	ModifyTime        string // 修改时间
-	HeadImg           string // 头像
-	BgImg             string // 背景图
-	Status            int    // 1启用2禁用
-	CollectNum        int    // 被收藏数
-	FollowNum         int    // 被关注数
-	SpecialArticleNum int    // 文章数
-	IsFollow          int    // 是否已关注 1已关注 0 未关注
+	Id                int       `orm:"column(id);pk"`
+	UserId            int       // 用户ID
+	SpecialName       string    // 专栏名称
+	Introduction      string    // 介绍
+	Label             string    // 标签
+	NickName          string    // 昵称
+	RealName          string    // 姓名
+	CompanyName       string    // 公司名
+	Mobile            string    // 手机号
+	CreateTime        string    // 创建时间
+	ModifyTime        time.Time    // 修改时间
+	HeadImg           string    // 头像
+	BgImg             string    // 背景图
+	Status            int       // 1启用2禁用
+	CollectNum        int       // 被收藏数
+	FollowNum         int       // 被关注数
+	SpecialArticleNum int       // 文章数
+	LatestPublishTime time.Time // 最近更新时间
+	LatestPublishDate string    // 最近更新时间
+	IsFollow          int       // 是否已关注 1已关注 0 未关注
 }
 
 func AddCygxYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (lastId int64, err error) {
@@ -101,11 +103,18 @@ func GetYanxuanSpecialAuthorList() (items []*CygxYanxuanSpecialAuthorItem, err e
 	o := orm.NewOrm()
 	sql := ``
 	sql = `SELECT
-	a.*,c.company_name  
+	a.*,
+	c.company_name,
+	( SELECT publish_time FROM cygx_yanxuan_special WHERE user_id = a.user_id AND STATUS = 3 ORDER BY publish_time DESC LIMIT 1 ) AS latest_publish_time 
 FROM
-	cygx_yanxuan_special_author as a
+	cygx_yanxuan_special_author AS a
 	INNER JOIN wx_user AS u ON u.user_id = a.user_id
-	INNER JOIN company AS c ON c.company_id = u.company_id WHERE a.nick_name <> '' ORDER BY create_time DESC `
+	INNER JOIN company AS c ON c.company_id = u.company_id 
+WHERE
+	a.nick_name <> '' 
+	AND a.STATUS = 1 
+ORDER BY
+	latest_publish_time DESC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/report.go

@@ -502,6 +502,7 @@ type ArticleCollectionResp struct {
 	List                   []*IndustrialManagementResp `description:"产业列表"`
 	IsSpecial              int                         `description:"是否为研选专栏"`
 	SpecialTags            string                      `description:"研选专栏标签"`
+	UserId                 int                         `description:"作者id"`
 	SpecialType            int                         `description:"专栏类型 1:笔记，2:观点"`
 }
 
@@ -600,6 +601,7 @@ type ArticleResearchResp struct {
 	ButtonStyle     string                      `description:"按钮展示样式"`
 	IsSpecial       int                         `description:"是否为研选专栏"`
 	SpecialTags     string                      `description:"研选专栏标签"`
+	UserId          int                         `description:"作者id"`
 	List            []*IndustrialManagementResp `description:"产业列表"`
 }
 
@@ -629,6 +631,7 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS my_collect_num,
 			0 AS is_special,
 			0 AS special_type,
+			0 AS user_id,
 			'' AS special_tags 
 		FROM
 			cygx_article AS a
@@ -656,6 +659,7 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac WHERE ac.yanxuan_special_id = a.id  AND user_id = ? ) AS my_collect_num,
 		1 AS is_special,
 		a.type AS special_type,
+		a.user_id AS user_id,
 		a.tags AS special_tags 
 	FROM
 	cygx_yanxuan_special AS a

models/wechat.go

@@ -6,6 +6,9 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/http"
 	"hongze/hongze_cygx/utils"
+	"io/ioutil"
+	netHttp "net/http"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -194,9 +197,10 @@ func WxUsersGet() (openIdStr string) {
 }
 
 type WxCheckContentJson struct {
-	Detail       []WxCheckContentJsonDetail `json:"detail"`
-	Errcode      int                      `json:"errcode"`
-	Errmsg       string                   `json:"errmsg"`
+	Detail  []WxCheckContentJsonDetail `json:"detail"`
+	Errcode int                        `json:"errcode"`
+	Errmsg  string                     `json:"errmsg"`
+	Result  WxCheckContentJsonResult   `json:"result"`
 }
 
 type WxCheckContentJsonDetail struct {
@@ -206,33 +210,51 @@ type WxCheckContentJsonDetail struct {
 	Strategy string
 	Errcode  int
 }
+type WxCheckContentJsonResult struct {
+	Suggest string
+	Label   int
+}
 
-func WxCheckContent(content string) (errCode int, keyWord string) {
-	accessToken, err := GetWxAccessToken()
+func WxCheckContent(token, openId, content string) (suggest string) {
+	url := "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + token
+	fmt.Println(url)
+	//result, err := http.Post(url, content)
+	//if err != nil {
+	//	utils.FileLog.Info("GetUser Err:", err.Error())
+	//	return
+	//}
+	method := "POST"
+	payload := strings.NewReader(`{
+		"openid":"` + openId + `",
+		"scene":` + strconv.Itoa(2) + `,
+		"version":` + strconv.Itoa(2) + `,
+		"content":"` + content + `"
+				}`)
+	client := &netHttp.Client{}
+	req, err := netHttp.NewRequest(method, url, payload)
 	if err != nil {
-		utils.FileLog.Info("GetWxAccessToken Err:%s", err.Error())
 		return
 	}
-	url := "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + accessToken
-	fmt.Println(url)
-	result, err := http.Post(url, content)
+	req.Header.Add("Content-Type", "application/json")
+	postBody, err := client.Do(req)
 	if err != nil {
-		utils.FileLog.Info("GetUser Err:", err.Error())
 		return
 	}
-
+	defer postBody.Body.Close()
+	body, err := ioutil.ReadAll(postBody.Body)
+	if err != nil {
+		fmt.Println(err)
+		utils.FileLog.Info(err.Error())
+		return
+	}
 	item := new(WxCheckContentJson)
-	err = json.Unmarshal(result, &item)
+	err = json.Unmarshal(body, &item)
 	if err != nil {
 		fmt.Println("Unmarshal Err:", err.Error())
 		return
 	}
-	if len(item.Detail) > 0{
-		for _, v := range item.Detail {
-			keyWord += v.KeyWord+","
-		}
-	}
-	keyWord = strings.TrimRight(keyWord, ",")
-	fmt.Println(result)
+	fmt.Println(item.Result.Label)
+	fmt.Println(item.Result.Suggest)
+	suggest = item.Result.Suggest
 	return
 }