Merge remote-tracking branch 'origin/feature/v1.0.1' into v1.0.1_ws

# Conflicts:
#	rpc/partnerlib/partner.exe

rpc/partnerlib/init/init.go

@@ -4,7 +4,6 @@ import (
 	"app.yhyue.com/moapp/jy_docs/rpc/partnerlib/internal/config"
 	"app.yhyue.com/moapp/jy_docs/services/partner"
 	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"flag"
 	"github.com/zeromicro/go-zero/core/conf"
 )
@@ -32,7 +31,6 @@ func init() {
 		jyDocsRpcUtil.InitMongo(C.Mongo)
 		jyDocsRpcUtil.InitOss(C.FileSystemConf)
 	}
-	jy.OrderCodePoolInit()
 	//初始化 分类对应关系
 	go partner.InitDocClass()
 }

services/model/stdlib.go

@@ -62,6 +62,29 @@ type UserDoc struct {
 	PreviewImgId    string    `json:"preview_img_id" gorm:"column:previewImgId"`
 	PreviewImgUrl   string    `json:"preview_img_url" gorm:"column:previewImgUrl"`
 	Cost            string    `json:"cost" gorm:"column:cost"`
+}
+type UserDocRes struct {
+	ID              int       `json:"id" form:"id" gorm:"primaryKey"`
+	CreateAt        time.Time `json:"create_at" gorm:"create_at"` //标签autoCreateTime设置如果字段名字不为CreatAt时候自动插入当前时间
+	UpdateAt        time.Time `json:"update_at" gorm:"update_at"`
+	DeletedAt       time.Time `json:"delete_at" gorm:"column:delete_at"`
+	AppId           string    `json:"app_id"  gorm:"column:appId"`
+	UserId          string    `json:"user_id"  gorm:"column:userId"`
+	DocId           string    `json:"doc_id" gorm:"column:docId"`
+	DocCategory     int       `json:"doc_category" gorm:"column:docCategory"`
+	IsDelete        int       `json:"is_delete" gorm:"column:isDelete"`
+	DocName         string    `json:"doc_name" gorm:"column:docName"`
+	DocFileType     int       `json:"doc_file_type" gorm:"column:docFileType"`
+	DocFileSuffix   string    `json:"doc_file_suffix" gorm:"column:docFileSuffix"`
+	DocFileSize     int       `json:"doc_file_size" gorm:"column:docFileSize"`
+	DocPageSize     int       `json:"doc_page_size" gorm:"column:docPageSize"`
+	DocSummary      string    `json:"doc_summary" gorm:"column:docSummary"`
+	DocSourceUserId string    `json:"doc_source_user_id" gorm:"column:docSourceUserId"`
+	IsDownload      int       `json:"is_download" gorm:"column:isDownload"`
+	IsCollection    int       `json:"is_collection" gorm:"column:isCollection"`
+	PreviewImgId    string    `json:"preview_img_id" gorm:"column:previewImgId"`
+	PreviewImgUrl   string    `json:"preview_img_url" gorm:"column:previewImgUrl"`
+	Cost            string    `json:"cost" gorm:"column:cost"`
 	Source          int64     `json:"source" gorm:"column:source"`
 	ProductType     int64     `json:"product_type" gorm:"column:productType" `
 	DocTags         string    `json:"docTags" gorm:"column:docTags"`

services/stdlib/docIndexTag.go

@@ -10,7 +10,7 @@ import (
 func DocIndexTag() *stdlib.DocIndexTagRes {
 	tagRes := []map[string]interface{}{}
 	tagNameList := []string{}
-	jyDocsRpcUtil.GetJyDocsDB().Raw("SELECT dc.name as name FROM doc_class_statistics dcs left join doc_class dc on (dcs.code = dc.code and dcs.state = dc.state )  where  dc.`level`=1 AND order by total").Scan(&tagRes)
+	jyDocsRpcUtil.GetJyDocsDB().Raw("SELECT dc.name as name FROM doc_class_statistics dcs left join doc_class dc on (dcs.code = dc.code and dcs.state = dc.state )  where  dc.`level`=1  order by total").Scan(&tagRes)
 	if tagRes != nil && len(tagRes) > 0 {
 		for i := 0; i < len(tagRes); i++ {
 			tagNameList = append(tagNameList, common.ObjToString(tagRes[i]["name"]))

services/stdlib/docService.go

@@ -107,17 +107,17 @@ func DocQuery(in *stdlib.DocQueryRequest) *stdlib.DocQueryResponse {
 			}
 		}
 		for _, v := range *list {
-			tags := strings.Split(common.ObjToString(v["docTags"]), "")
+			tags := strings.Split(common.ObjToString(v["docTags"]), ",")
 			tmptags := []string{}
 			subTag := ""
 			for i := 0; i < len(tags); i++ {
-				dtpKey := fmt.Sprintf("p_%s_0_tag", tags[i]) //一级tag
+				dtpKey := fmt.Sprintf("p_%s_1_tag", tags[i]) //一级tag
 				if _, ok := partner.DocClassMap[dtpKey]; ok && len(tmptags) == 0 {
 					tmptags = append(tmptags, tags[i])
 				} else {
 					subTag = tags[i]
 				}
-				if subTag != "" && len(tags) > 0 {
+				if subTag != "" && len(tmptags) > 0 {
 					tmptags = append(tmptags, subTag)
 					break
 				}
@@ -132,10 +132,10 @@ func DocQuery(in *stdlib.DocQueryRequest) *stdlib.DocQueryResponse {
 				UploadDate:   common.ObjToString(v["uploadDate"]),
 				DocSummary:   common.ObjToString(v["docSummary"]),
 				DocFileType:  model.DocFileType[common.IntAll(v["docFileType"])],
-				PreviewImgId: common.ObjToString(v["previewImgId"]),
+				PreviewImgId: common.InterfaceToStr(v["previewImgId"]),
 				ProductType:  common.Int64All(v["productType"]),
 				Source:       common.Int64All(v["source"]),
-				DocTags:      strings.Join(tmptags, ","),
+				DocTags:      strings.Join(tmptags, "  "),
 			}
 			highlight, _ := v["highlight"].(map[string][]string)
 			if len(highlight["docName"]) > 0 {

services/userlib/userDocService.go

@@ -336,9 +336,9 @@ func UserDocPermanentDelete(userDocId int32, appId, userId string) (bool, string
 }
 
 // 我的文库列表(包括回收站列表)0兑换的 1收藏的 2回收站的
-func UserDocsList(in *userlib.UserDocsRequest) ([]*model.UserDoc, int64, bool, string) {
+func UserDocsList(in *userlib.UserDocsRequest) ([]*model.UserDocRes, int64, bool, string) {
 	msg := "查询成功"
-	data := []*model.UserDoc{}
+	data := []*model.UserDocRes{}
 	count := int64(0)
 	startIndex := (in.Page - 1) * in.PageSize
 	err := docRpcUtil.GetJyDocsDB().Transaction(func(tx *gorm.DB) error {