Merge branch 'feature/v1.0.1' into feature/v1.0.1_fu

rpc/partnerlib/crontab/service/docinInfo.go

@@ -5,6 +5,7 @@ import (
 	"app.yhyue.com/moapp/jy_docs/rpc/partnerlib/model"
 	sm "app.yhyue.com/moapp/jy_docs/services/model"
 	"app.yhyue.com/moapp/jy_docs/services/partner"
+	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
 	"crypto/md5"
 	"encoding/hex"
@@ -68,10 +69,10 @@ func InsertDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTot
 					Price:           price,
 					DownOrUp:        0,
 					DocSummary:      v.Desc,
-					PreviewImgId:    "",
+					PreviewImgId:    common.InterfaceToStr(v.ProductId),
 					EncryptionLevel: 0,
-					Source:          2,              //豆丁
-					ProductType:     v.Ifcharge + 1, //Ifcharge:是否付费，0:免费,1:收费;ProductType:商品类型：默认：0：全部；1：会员免费；2：精品（付费）
+					Source:          2,                          //豆丁
+					ProductType:     v.Ifcharge + entity.Charge, //Ifcharge:是否付费，0:免费,1:收费;ProductType:商品类型：默认：0：全部；1：会员免费；2：精品（付费）
 					UpdateDate:      date.NowFormat(date.Date_Full_Layout),
 				})
 				//elastic
@@ -90,7 +91,7 @@ func InsertDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTot
 					"uploadDate":   date.NowFormat(date.Date_Full_Layout),
 					"viewTimes":    v.VisitCount,
 					"source":       2, //豆丁
-					"productType":  v.Ifcharge + 1,
+					"productType":  v.Ifcharge + entity.Charge,
 				})
 			}
 			if len(docs) > 0 {

rpc/partnerlib/crontab/service/docinUpdate.go

@@ -27,7 +27,7 @@ func UpdateDocinInfos(b []byte) (err error, lastId int64, expectTotal, actualTot
 				doc.UpdateDate, _ = time.ParseInLocation(date.Date_Full_Layout, v.ModifyDate, time.Local)
 				doc.Price = int(v.Price * entity.Multiple)
 				doc.PriceVip = v.PriceVip
-				doc.ProductType = v.Ifcharge + 1
+				doc.ProductType = int64(v.Ifcharge + entity.Charge)
 				doc.DownOrUp = v.State
 				if err := partner.DocsUpdate(doc); err == nil {
 					actualTotal++

rpc/partnerlib/entity/entity.go

@@ -19,4 +19,5 @@ const (
 var (
 	SyncExpectTotal, SyncActualTotal, UpdateExpectTotal, UpdateActualTotal int //批次预计处理数据和实际处理数据
 	DocsLock                                                               = &sync.Mutex{}
+	Charge                                                                 = 1
 )

rpc/partnerlib/etc/crontab.yaml

@@ -1,7 +1,7 @@
-IsRun: true
+IsRun: false
 NewDocsList:
   Name: syncDocs
-  First: true
+  First: false
   Time: "0 0 0/4 * * ?"
   StartId: 0
   StartIdKey: docin_sync_start_id

rpc/partnerlib/etc/partnerlib.yaml

@@ -34,7 +34,7 @@ Mongo:
     Password: "123456"
 FileSystemConf:
   Hosts:
-    - 127.0.0.1:2379
+    - 192.168.3.206:2379
   Key: moapp.filesystem.rpc
 OssInfo:
   BucketName: jydocs-std #上线前需要配置新bucket

services/model/stdlib.go

@@ -31,8 +31,8 @@ type Doc struct {
 	PreviewImgId string `json:"previewImgId" gorm:"column:previewImgId"`
 	//PreviewImgUrl   string    `json:"preview_img_url" gorm:"column:previewImgUrl"`
 	EncryptionLevel int       `json:"encryptionLevel" gorm:"column:encryptionLevel"` //
-	Source          int64     `json:"source" gorm:"column:source"`
-	ProductType     int64     `json:"productType" gorm:"column:productType"`
+	Source          int64     `json:"source" gorm:"column:source"`                   //
+	ProductType     int64     `json:"productType" gorm:"column:productType"`         //分类
 	UpdateDate      time.Time `json:"updateDate" gorm:"column:updateDate"`
 }