更新蜜源数据采集

app/task/svc/svc_data_collect_cron_haodanku_real_news.go

@@ -7,10 +7,12 @@ import (
 	md2 "applet/app/task/md"
 	"applet/app/utils"
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_es.git/es"
-	md3 "code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git/md"
-	"code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git/zhimeng"
+	"code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git/jd_union"
+	"code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git/md/cps_jd"
+	"encoding/json"
 	"fmt"
 	"github.com/syyongx/php2go"
+	"github.com/tidwall/gjson"
 	"strings"
 	"time"
 )
@@ -29,8 +31,6 @@ func DataCollectCronHaodankuRealNews(types int) {
 	fmt.Println("============", time.Since(now))
 	sysCfgDb := db.SysCfgDb{}
 	sysCfgDb.Set()
-	third_zm_app_key := sysCfgDb.SysCfgGetOneData("third_zm_app_key")
-	third_zm_app_secret := sysCfgDb.SysCfgGetOneData("third_zm_app_secret")
 	for _, v := range ids {
 		for i := 1; i <= num; i++ {
 			time.Sleep(time.Microsecond * 10) // 等待10毫秒
@@ -61,6 +61,8 @@ func DataCollectCronHaodankuRealNews(types int) {
 				doc, _ := es.FirstDoc(key, uniqueId)
 				if doc == nil {
 					goodsList := make([]map[string]string, 0)
+					hasGoods := 0
+
 					for k1, v1 := range item.List {
 						if item.Platform == "1" {
 							item.Platform = "淘宝"
@@ -76,33 +78,33 @@ func DataCollectCronHaodankuRealNews(types int) {
 								"platform_type": platformMap[item.Platform],
 								"url":           "",
 							}
+							hasGoods = 1
 							if item.Platform == "京东" && strings.Contains(v1.ItemId, "http") {
 								itemId := ""
 								if strings.Contains(v1.ItemId, "jd.") {
 									time.Sleep(time.Microsecond * 10) // 等待500毫秒
-									//gid = decode
-									postData := make(map[string]interface{})
-									// 配置智盟 appkey 和 sk
-									postData["appkey"] = third_zm_app_key
-									postData["secret_key"] = third_zm_app_secret
-									postData["size"] = "2"
-									postData["p"] = "1"
-									postData["is_url"] = "1"
-									postData["keyword"] = v1.ItemId
-									jdData, err := zhimeng.NewZhiMengJingDongSDK().
-										SelectFunction("new_getgoods").
-										WithArgs(postData).
-										Result()
+									param := map[string]interface{}{
+										"pageIndex": "1",
+										"pageSize":  "10",
+										"keyword":   v1.ItemId,
+									}
+									keyArr := map[string]string{
+										"app_key":      "444ab671c4d095122916453d09af27fc",
+										"access_token": "",
+										"app_secret":   "aef3c2745cc44194816d0c89c65b3847",
+									}
+									goods, err := jd_union.SearchGoods(keyArr, param)
+									if err != nil {
+										utils.FilePutContents("jd", utils.SerializeStr(err))
+									}
+									utils.FilePutContents("jd", utils.SerializeStr(goods))
 									if err == nil {
-										itemInfo := &md3.MoreDetailResponse{}
-										if err := jdData.ToStruct(itemInfo); err == nil {
-											itemId = itemInfo.GID
-											if itemInfo.GID == "" || itemInfo.GID == "100038437991" {
-												itemId = ""
-											}
+										resp := gjson.Get(goods, "jd_union_open_goods_query_responce.queryResult").String()
+										var data cps_jd.JdSearchGoods
+										err = json.Unmarshal([]byte(resp), &data)
+										for _, v2 := range data.Data {
+											itemId = v2.ItemId
 										}
-									} else {
-										itemId = ""
 									}
 								}
 								if itemId != "" {
@@ -111,6 +113,7 @@ func DataCollectCronHaodankuRealNews(types int) {
 									tmp1["gid"] = ""
 									tmp1["is_click"] = "0"
 									tmp1["content"] = "\n" + v1.ItemId + "\n"
+									hasGoods = 0
 								}
 							}
 							goodsList = append(goodsList, tmp1)
@@ -118,6 +121,9 @@ func DataCollectCronHaodankuRealNews(types int) {
 							if v1.Content == "" {
 								v1.Content = v1.CouponUrl
 							}
+							if strings.Contains(v1.Content, "http") {
+								hasGoods = 1
+							}
 							tmp1 := map[string]string{
 								"content":       v1.Content,
 								"gid":           "",
@@ -131,7 +137,9 @@ func DataCollectCronHaodankuRealNews(types int) {
 							goodsList = append(goodsList, tmp1)
 						}
 					}
-					tmp.Content = utils.SerializeStr(goodsList)
+					if hasGoods == 1 {
+						tmp.Content = utils.SerializeStr(goodsList)
+					}
 					createDocRet, err := es.CreateDoc(key, uniqueId, tmp)
 					if err != nil {
 						return

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20230707081910-52e70aa52998
-	code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240103061829-86ef8b1a29c1
+	code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20250906094415-9ff14fe81d26
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5
 	github.com/boombuler/barcode v1.0.1
@@ -23,13 +23,47 @@ require (
 	github.com/qiniu/api.v7/v7 v7.8.2
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sony/sonyflake v1.1.0
-	github.com/stretchr/testify v1.8.0 // indirect
-	github.com/syyongx/php2go v0.9.7
+	github.com/syyongx/php2go v0.9.8
+	github.com/tidwall/gjson v1.14.1
 	go.uber.org/zap v1.16.0
-	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
-	golang.org/x/net v0.14.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.4.0
 	xorm.io/xorm v1.3.2
+)
 
+require (
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/goccy/go-json v0.9.7 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gookit/color v1.3.6 // indirect
+	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/securecookie v1.1.1 // indirect
+	github.com/gorilla/sessions v1.2.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/olivere/elastic/v7 v7.0.32 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/stretchr/testify v1.8.0 // indirect
+	github.com/syndtr/goleveldb v1.0.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/ugorji/go/codec v1.2.7 // indirect
+	go.uber.org/atomic v1.6.0 // indirect
+	go.uber.org/multierr v1.5.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect
 )