Merge branch 'release/v0.3.0'

v0.3.0版本重构. 以主播为目标单位.
TODO: extractor 的重构.
2020-07-21 15:07:18 +08:00 · 2020-07-21 15:05:56 +08:00 · 2020-07-20 18:54:34 +08:00 · 2020-07-20 18:13:54 +08:00 · 2020-07-17 19:21:33 +08:00 · 2020-07-17 19:21:04 +08:00
18 changed files with 534 additions and 718 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.log
+log
 screenlog.*
 *.tar
 *.7z
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,19 @@
+
+source_tasks=./tasks/*/*
+extractor_tasks=./extractor/*
+
+src=`pwd`
+
+for path in `ls -d $source_tasks`
+do
+    echo $path
+    cd $path && go build
+    cd $src
+done
+
+for path in `ls -d $extractor_tasks`
+do
+    echo $path
+    cd $path && go build
+    cd $src
+done
--- a/config.yaml
+++ b/config.yaml
@@ -1,3 +1,3 @@
 database:
-  source_uri: "root:@tcp(127.0.0.1:4000)/intimate_source?parseTime=true"
-  extractor_uri: "root:@tcp(127.0.0.1:4000)/intimate_extractor?parseTime=true"
+  source_uri: "root:@tcp(127.0.0.1:4000)/intimate_source?parseTime=true&loc=Local"
+  extractor_uri: "root:@tcp(127.0.0.1:4000)/intimate_extractor?parseTime=true&loc=Local"
--- a/extractor/openrec_extractor/main.go
+++ b/extractor/openrec_extractor/main.go
@@ -1,5 +1,10 @@
 package main

+import (
+	"net/http"
+	_ "net/http/pprof"
+)
+
 /*
  `uid`           varchar(36)  NOT NULL,
  `platform`      varchar(255) NOT NULL,
@@ -11,6 +16,11 @@ package main
 */

 func main() {
+
+	go func() {
+		http.ListenAndServe("0.0.0.0:8899", nil)
+	}()
+
 	oe := &OpenrecExtractor{}
 	oe.Execute()
 }
--- a/extractor/openrec_extractor/openrec_extractor.go
+++ b/extractor/openrec_extractor/openrec_extractor.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/signal"
 	"regexp"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync/atomic"
@@ -35,13 +36,16 @@ func (oe *OpenrecExtractor) Execute() {
 		atomic.StoreInt32(&loop, 0)
 	}()

-	collect := intimate.NewExtractorStore()
-	store := intimate.NewSourceStore("source_openrec")
+	estore := intimate.NewStoreExtractor()
+	sstore := intimate.NewStoreSource(string(intimate.STOpenrec))
 	var lasterr error = nil

 	for atomic.LoadInt32(&loop) > 0 {

-		source, err := store.Pop(string(intimate.TTOpenrecRanking), 100)
+		runtime.GC()
+		time.Sleep(time.Nanosecond)
+
+		source, err := sstore.Pop(string(intimate.TTOpenrecUser), 0)
 		if err != nil {
 			if err != lasterr {
 				log.Println(err, lasterr)
@@ -51,66 +55,52 @@ func (oe *OpenrecExtractor) Execute() {
 			continue
 		}

-		source.SetOperator(int32(intimate.OperatorError))
-		anchorId := source.GetSource().String
+		sdata := source.Ext.([]byte)
+		datamap := gjson.ParseBytes(sdata).Map()

-		ai := &intimate.AnchorInfo{}
-		ai.SetAnchorId(anchorId)
-		ai.SetPlatform(string(intimate.Popenrec))
+		source.Operator = int32(intimate.OperatorError)
+		userId := datamap["var_user_id"].String()

-		sdata := source.GetExt().([]byte)
-		if gjson.ValidBytes(sdata) {
-			result := gjson.ParseBytes(sdata)
-			datamap := result.Map()
+		streamer := &intimate.Streamer{}
+		streamer.UserId = userId
+		streamer.Platform = string(intimate.Popenrec)

-			oe.user = intimate.NewExtractorSource(datamap["user"])
-			oe.user.CreateExtractor()
+		oe.user = intimate.NewExtractorSource(datamap["html_user"])
+		oe.user.CreateExtractor()

-			oe.userLive = intimate.NewExtractorSource(datamap["user_live"])
-			oe.userLive.CreateExtractor()
+		oe.userLive = intimate.NewExtractorSource(datamap["html_live"])
+		oe.userLive.CreateExtractor()

-			oe.supporters = intimate.NewExtractorSource(datamap["supporters"])
+		oe.supporters = intimate.NewExtractorSource(datamap["json_supporters"])
+		clog := &intimate.CollectLog{}

-			clog := &intimate.CollectLog{}
+		// log.Println(anchorId)

-			log.Println(anchorId)
+		oe.extractFollowers(clog)
+		oe.extractUserName(streamer)
+		oe.extractViewsAndLiveStreaming(clog)
+		oe.extractGiversAndGratuity(clog)
+		oe.extractLive(clog)
+		oe.extractTags(clog)

-			oe.extractFollowers(clog)
-			oe.extractAnchorName(ai)
-			oe.extractViewsAndLiveStreaming(clog)
-			oe.extractGiversAndGratuity(clog)
-			oe.extractLive(clog)
-			oe.extractTags(clog)
+		streamer.Uid = source.StreamerId.Int64
+		streamer.UpdateTime = source.UpdateTime

-			ai.Set("UpdateTime", source.GetUpdateTime())
+		clog.Platform = string(intimate.Popenrec)
+		clog.UserId = userId
+		clog.UpdateTime = source.UpdateTime

-			LiveUrl := "https://www.openrec.tv/live/" + anchorId
-			ai.Set("LiveUrl", sql.NullString{String: LiveUrl, Valid: true})
+		logUid := estore.InsertCollectLog(clog)

-			Uid, err := collect.InsertAnchorInfo(ai)
-			if err != nil {
-				log.Println(err)
-				source.SetErrorMsg(sql.NullString{String: err.Error(), Valid: true})
-				store.UpdateOperator(source)
-				return
-			}
+		LiveUrl := "https://www.openrec.tv/live/" + userId
+		streamer.LiveUrl = sql.NullString{String: LiveUrl, Valid: true}
+		streamer.LatestLogUid = logUid
+		streamer.Operator = 0
+		estore.UpdateStreamer(streamer)

-			clog.Set("Uid", Uid)
-			clog.Set("Platform", string(intimate.Popenrec))
-			clog.Set("AnchorId", anchorId)
-			clog.Set("UpdateTime", source.GetUpdateTime())
+		source.Operator = int32(intimate.OperatorExtractorOK)
+		sstore.UpdateOperator(source)

-			if err = collect.InsertCollectLog(clog); err != nil {
-				source.SetErrorMsg(sql.NullString{String: err.Error(), Valid: true})
-				store.UpdateOperator(source)
-				return
-			}
-
-			source.SetOperator(int32(intimate.OperatorExtractorOK))
-			store.UpdateOperator(source)
-		} else {
-			log.Println("data is not json:\n", string(sdata))
-		}
 	}
 }

@@ -133,14 +123,16 @@ func (oe *OpenrecExtractor) extractFollowers(clog intimate.ISet) {
 	clog.Set("Followers", sql.NullInt64{Int64: followersInt, Valid: true})
 }

-func (oe *OpenrecExtractor) extractAnchorName(ai intimate.ISet) {
+func (oe *OpenrecExtractor) extractUserName(streamer intimate.ISet) {
 	extractor := oe.user.GetExtractor()
-	xp, err := extractor.XPathResult("//p[@class='c-global__user__profile__list__name__text official-icon--after']/text()")
-	if xp.NodeIter().Next() {
-		anchorName := xp.String()
-		ai.Set("AnchorName", anchorName)
-	} else {
+	xp, err := extractor.XPathResult("//p[ contains(@class, 'c-global__user__profile__list__name__text')]/text()")
+	if err != nil {
 		log.Println(err)
+	} else {
+		if xp.NodeIter().Next() {
+			userName := xp.String()
+			streamer.Set("UserName", sql.NullString{String: userName, Valid: true})
+		}
 	}
 }

@@ -160,7 +152,7 @@ func (oe *OpenrecExtractor) extractViewsAndLiveStreaming(clog intimate.ISet) {
 		}

 		clog.Set("Views", sql.NullInt64{Int64: int64(viewsint), Valid: true})
-		clog.Set("IsLiveStreaming", int32(1))
+		clog.Set("IsLiveStreaming", true)
 	}
 }

@@ -207,6 +199,7 @@ func (oe *OpenrecExtractor) extractLive(clog intimate.ISet) {
 			if err != nil {
 				log.Println(err)
 			}
+			// log.Println(iter.Node().NodeValue(), tm.Local())
 			clog.Set("LiveStartTime", sql.NullTime{Time: tm.Local(), Valid: true})

 			duration, err := extractor.XPathResult("//meta[@itemprop='duration']/@content")
@@ -234,7 +227,6 @@ func (oe *OpenrecExtractor) extractTags(clog intimate.ISet) {
 	for _, m := range matheslist {
 		tags = append(tags, m[1])
 	}
-	log.Println(tags)
 	tagsBytes, err := json.Marshal(tags)
 	if err != nil {
 		log.Println(err)
--- a/extractor/openrec_extractor/openrec_test.go
+++ b/extractor/openrec_extractor/openrec_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"

+	"github.com/474420502/hunter"
 	"github.com/lestrrat-go/libxml2"
 )

@@ -90,6 +91,28 @@ func TestCase(t *testing.T) {
 	t.Error(xr)
 }

+func TestUserName(t *testing.T) {
+	f, err := os.Open("test.html")
+	if err != nil {
+		panic(err)
+	}
+	data, err := ioutil.ReadAll(f)
+	if err != nil {
+		panic(err)
+	}
+
+	extractor := hunter.NewExtractor(data)
+	xp, err := extractor.XPathResult("//p[ contains(@class, 'c-global__user__profile__list__name__text')]/text()")
+	if err != nil {
+		t.Error(err)
+	} else {
+		if xp.NodeIter().Next() {
+			userName := xp.String()
+			t.Error(userName)
+		}
+	}
+}
+
 func TestExtractor(t *testing.T) {
 	oe := &OpenrecExtractor{}
 	oe.Execute()
--- a/extractor_field.go
+++ b/extractor_field.go
@@ -8,181 +8,50 @@ import (
 	"github.com/tidwall/gjson"
 )

-type ISetAnchorInfo interface {
-	SetUid(int64)               //
-	SetPlatform(string)         //
-	SetAnchorId(string)         //
-	SetAnchorName(string)       //
-	SetLiveUrl(sql.NullString)  //
-	SetChannel(sql.NullString)  //
-	SetTags(interface{})        //
-	SetExt(interface{})         //
-	SetUpdateTime(sql.NullTime) //
+type GetSet struct {
 }

-type IGetAnchorInfo interface {
-	GetUid() int64              //
-	GetPlatform() string        //
-	GetAnchorId() string        //
-	GetAnchorName() string      //
-	GetLiveUrl() sql.NullString //
-	GetChannel() sql.NullString //
-	GetTags() interface{}
-	GetExt() interface{}         //
-	GetUpdateTime() sql.NullTime //
+type Streamer struct {
+	Uid      int64  //
+	Platform string //
+	UserId   string //
+
+	UserName sql.NullString //
+	LiveUrl  sql.NullString //
+	Channel  sql.NullString //
+	Ext      interface{}    //
+
+	IsUpdateStreamer bool // 更新上面的内容
+	IsUpdateUrl      bool
+	updateInterval   int32
+	UpdateUrl        interface{}
+	LatestLogUid     int64
+	UpdateTime       sql.NullTime //
+
+	ErrorMsg sql.NullString
+	Operator int32
+
+	LastOperator int32
 }

-type AnchorInfo struct {
-	Uid        int64          //
-	Platform   string         //
-	AnchorId   string         //
-	AnchorName string         //
-	LiveUrl    sql.NullString //
-	Channel    sql.NullString //
-	Tags       interface{}
-	Ext        interface{}  //
-	UpdateTime sql.NullTime //
+// Get Simple Value
+func (ai *Streamer) Get(field string) interface{} {
+	return reflect.ValueOf(ai).Elem().FieldByName(field).Interface()
 }

 // Set Simple Value
-func (ai *AnchorInfo) Set(field string, value interface{}) {
+func (ai *Streamer) Set(field string, value interface{}) {
 	reflect.ValueOf(ai).Elem().FieldByName(field).Set(reflect.ValueOf(value))
 }

-// GetTags Get return Tags interface{}
-func (ai *AnchorInfo) GetTags() interface{} {
-	return ai.Tags
-}
-
-// SetTags Set Tags interface{}
-func (ai *AnchorInfo) SetTags(Tags interface{}) {
-	ai.Tags = Tags
-}
-
-// GetUpdateTime Get return UpdateTime time.Time
-func (ai *AnchorInfo) GetUpdateTime() sql.NullTime {
-	return ai.UpdateTime
-}
-
-// SetUpdateTime Set UpdateTime time.Time
-func (ai *AnchorInfo) SetUpdateTime(UpdateTime sql.NullTime) {
-	ai.UpdateTime = UpdateTime
-}
-
-// GetExt Get return Ext interface{}
-func (ai *AnchorInfo) GetExt() interface{} {
-	return ai.Ext
-}
-
-// SetExt Set Ext interface{}
-func (ai *AnchorInfo) SetExt(Ext interface{}) {
-	ai.Ext = Ext
-}
-
-// GetChannel Get return Channel sql.NullString
-func (ai *AnchorInfo) GetChannel() sql.NullString {
-	return ai.Channel
-}
-
-// SetChannel Set Channel sql.NullString
-func (ai *AnchorInfo) SetChannel(Channel sql.NullString) {
-	ai.Channel = Channel
-}
-
-// GetLiveUrl Get return LiveUrl sql.NullString
-func (ai *AnchorInfo) GetLiveUrl() sql.NullString {
-	return ai.LiveUrl
-}
-
-// SetLiveUrl Set LiveUrl sql.NullString
-func (ai *AnchorInfo) SetLiveUrl(LiveUrl sql.NullString) {
-	ai.LiveUrl = LiveUrl
-}
-
-// GetAnchorName Get return AnchorName string
-func (ai *AnchorInfo) GetAnchorName() string {
-	return ai.AnchorName
-}
-
-// SetAnchorName Set AnchorName string
-func (ai *AnchorInfo) SetAnchorName(AnchorName string) {
-	ai.AnchorName = AnchorName
-}
-
-// GetAnchorId Get return AnchorId string
-func (ai *AnchorInfo) GetAnchorId() string {
-	return ai.AnchorId
-}
-
-// SetAnchorId Set AnchorId string
-func (ai *AnchorInfo) SetAnchorId(AnchorId string) {
-	ai.AnchorId = AnchorId
-}
-
-// GetPlatform Get return Platform string
-func (ai *AnchorInfo) GetPlatform() string {
-	return ai.Platform
-}
-
-// SetPlatform Set Platform string
-func (ai *AnchorInfo) SetPlatform(Platform string) {
-	ai.Platform = Platform
-}
-
-// GetUid Get return Uid int64
-func (ai *AnchorInfo) GetUid() int64 {
-	return ai.Uid
-}
-
-// SetUid Set Uid int64
-func (ai *AnchorInfo) SetUid(Uid int64) {
-	ai.Uid = Uid
-}
-
-type IGetCollectLog interface {
-	GetUid() int64                  //
-	GetPlatform() string            //
-	GetAnchorId() string            //
-	GetIsLiveStreaming() int32      //
-	GetIsError() int32              //
-	GetFollowers() sql.NullInt64    //
-	GetViews() sql.NullInt64        //
-	GetGiver() interface{}          //
-	GetGratuity() sql.NullInt64     //
-	GetLiveTitle() sql.NullString   //
-	GetLiveStartTime() sql.NullTime //
-	GetLiveEndTime() sql.NullTime   //
-	GetUpdateTime() sql.NullTime    //
-	GetTags() interface{}           //
-	GetExt() interface{}            //
-	GetErrorMsg() sql.NullString    //
-}
-
-type ISetCollectLog interface {
-	SetUid(int64)                  //
-	SetPlatform(string)            //
-	SetAnchorId(string)            //
-	SetIsLiveStreaming(int32)      //
-	SetIsError(int32)              //
-	SetFollowers(sql.NullInt64)    //
-	SetViews(sql.NullInt64)        //
-	SetGiver(interface{})          //
-	SetGratuity(sql.NullInt64)     //
-	SetLiveTitle(sql.NullString)   //
-	SetLiveStartTime(sql.NullTime) //
-	SetLiveEndTime(sql.NullTime)   //
-	SetUpdateTime(sql.NullTime)    //
-	SetTags(interface{})           //
-	SetExt(interface{})            //
-	SetErrorMsg(sql.NullString)    //
-}
-
 type CollectLog struct {
-	Uid             int64          //
+	LogUid      int64 // 日志id
+	StreamerUid int64 // StreamerId 表id与
+
 	Platform        string         //
-	AnchorId        string         //
-	IsLiveStreaming int32          //
-	IsError         int32          //
+	UserId          string         // 平台的UserId
+	IsLiveStreaming bool           //
+	IsError         bool           //
 	Followers       sql.NullInt64  //
 	Views           sql.NullInt64  //
 	Giver           interface{}    //
@@ -196,171 +65,16 @@ type CollectLog struct {
 	ErrorMsg        sql.NullString //
 }

+// Get Simple Value
+func (cl *CollectLog) Get(field string) interface{} {
+	return reflect.ValueOf(cl).Elem().FieldByName(field).Interface()
+}
+
 // Set Simple Value
 func (cl *CollectLog) Set(field string, value interface{}) {
 	reflect.ValueOf(cl).Elem().FieldByName(field).Set(reflect.ValueOf(value))
 }

-// GetTags Get return Tags interface{}
-func (cl *CollectLog) GetTags() interface{} {
-	return cl.Tags
-}
-
-// SetTags Set Tags interface{}
-func (cl *CollectLog) SetTags(Tags interface{}) {
-	cl.Tags = Tags
-}
-
-// GetErrorMsg Get return Error sql.NullString
-func (cl *CollectLog) GetErrorMsg() sql.NullString {
-	return cl.ErrorMsg
-}
-
-// SetErrorMsg Set Error sql.NullString
-func (cl *CollectLog) SetErrorMsg(ErrorMsg sql.NullString) {
-	cl.ErrorMsg = ErrorMsg
-}
-
-// GetExt Get return Ext interface{}
-func (cl *CollectLog) GetExt() interface{} {
-	return cl.Ext
-}
-
-// SetExt Set Ext interface{}
-func (cl *CollectLog) SetExt(Ext interface{}) {
-	cl.Ext = Ext
-}
-
-// GetUpdateTime Get return UpdateTime time.Time
-func (cl *CollectLog) GetUpdateTime() sql.NullTime {
-	return cl.UpdateTime
-}
-
-// SetUpdateTime Set UpdateTime time.Time
-func (cl *CollectLog) SetUpdateTime(UpdateTime sql.NullTime) {
-	cl.UpdateTime = UpdateTime
-}
-
-// GetLiveEndTime Get return ShowEndTime sql.NullTime
-func (cl *CollectLog) GetLiveEndTime() sql.NullTime {
-	return cl.LiveEndTime
-}
-
-// SetLiveEndTime Set ShowEndTime sql.NullTime
-func (cl *CollectLog) SetLiveEndTime(ShowEndTime sql.NullTime) {
-	cl.LiveEndTime = ShowEndTime
-}
-
-// GetLiveStartTime Get return ShowStartTime sql.NullTime
-func (cl *CollectLog) GetLiveStartTime() sql.NullTime {
-	return cl.LiveStartTime
-}
-
-// SetLiveStartTime Set ShowStartTime sql.NullTime
-func (cl *CollectLog) SetLiveStartTime(ShowStartTime sql.NullTime) {
-	cl.LiveStartTime = ShowStartTime
-}
-
-// GetLiveTitle Get return ShowTitle sql.NullString
-func (cl *CollectLog) GetLiveTitle() sql.NullString {
-	return cl.LiveTitle
-}
-
-// SetLiveTitle Set ShowTitle sql.NullString
-func (cl *CollectLog) SetLiveTitle(ShowTitle sql.NullString) {
-	cl.LiveTitle = ShowTitle
-}
-
-// GetGratuity Get return Gratuity sql.NullInt32
-func (cl *CollectLog) GetGratuity() sql.NullInt64 {
-	return cl.Gratuity
-}
-
-// SetGratuity Set Gratuity sql.NullInt32
-func (cl *CollectLog) SetGratuity(Gratuity sql.NullInt64) {
-	cl.Gratuity = Gratuity
-}
-
-// GetGiver Get return Giver interface{}
-func (cl *CollectLog) GetGiver() interface{} {
-	return cl.Giver
-}
-
-// SetGiver Set Giver interface{}
-func (cl *CollectLog) SetGiver(Giver interface{}) {
-	cl.Giver = Giver
-}
-
-// GetViews Get return Views sql.NullInt64
-func (cl *CollectLog) GetViews() sql.NullInt64 {
-	return cl.Views
-}
-
-// SetViews Set Views sql.NullInt64
-func (cl *CollectLog) SetViews(Views sql.NullInt64) {
-	cl.Views = Views
-}
-
-// GetFollowers Get return Followers sql.NullInt64
-func (cl *CollectLog) GetFollowers() sql.NullInt64 {
-	return cl.Followers
-}
-
-// SetFollowers Set Followers sql.NullInt32
-func (cl *CollectLog) SetFollowers(Followers sql.NullInt64) {
-	cl.Followers = Followers
-}
-
-// GetIsError Get return IsError int32
-func (cl *CollectLog) GetIsError() int32 {
-	return cl.IsError
-}
-
-// SetIsError Set IsError int32
-func (cl *CollectLog) SetIsError(IsError int32) {
-	cl.IsError = IsError
-}
-
-// GetIsLiveStreaming Get return IsShowing int32
-func (cl *CollectLog) GetIsLiveStreaming() int32 {
-	return cl.IsLiveStreaming
-}
-
-// SetIsLiveStreaming Set IsShowing int32
-func (cl *CollectLog) SetIsLiveStreaming(IsLive int32) {
-	cl.IsLiveStreaming = IsLive
-}
-
-// GetAnchorId Get return AnchorId string
-func (cl *CollectLog) GetAnchorId() string {
-	return cl.AnchorId
-}
-
-// SetAnchorId Set AnchorId string
-func (cl *CollectLog) SetAnchorId(AnchorId string) {
-	cl.AnchorId = AnchorId
-}
-
-// GetPlatform Get return Platform string
-func (cl *CollectLog) GetPlatform() string {
-	return cl.Platform
-}
-
-// SetPlatform Set Platform string
-func (cl *CollectLog) SetPlatform(Platform string) {
-	cl.Platform = Platform
-}
-
-// GetUid Get return Uid int64
-func (cl *CollectLog) GetUid() int64 {
-	return cl.Uid
-}
-
-// SetUid Set Uid int64
-func (cl *CollectLog) SetUid(Uid int64) {
-	cl.Uid = Uid
-}
-
 type ExtractorSource struct {
 	source    gjson.Result
 	extractor *hunter.Extractor
--- a/source_field.go
+++ b/source_field.go
@@ -2,144 +2,35 @@ package intimate

 import (
 	"database/sql"
+	"reflect"
 )

-// IGetSource 源接口结构
-type IGetSource interface {
-	GetUid() int64               //
-	GetUrl() string              //
-	GetTargetType() string       //
-	GetSource() sql.NullString   //
-	GetPassGob() sql.NullString  //
-	GetExt() interface{}         //
-	GetUpdateTime() sql.NullTime //
-	GetOperator() int32          //
-	GetErrorMsg() sql.NullString //
-}
-
-type IUpdateSource interface {
-	IGetSource
-
-	GetLastOperator() int32
-
-	SetPassGob(sql.NullString)
-	SetExt(ext interface{})          //
-	SetUpdateTime(ut sql.NullTime)   //
-	SetOperator(operator int32)      //
-	SetErrorMsg(emsg sql.NullString) //
-}
-
 // Source 的结构体
 type Source struct {
-	Uid        int64          //
-	Url        string         //
-	TargetType string         //
+	Uid int64 //
+
+	Url string //
+
+	StreamerId sql.NullInt64 //
+
 	Source     sql.NullString //
 	PassGob    sql.NullString //
 	Ext        interface{}    //
 	UpdateTime sql.NullTime   //
-	Operator   int32          //
 	ErrorMsg   sql.NullString //

-	lastOperator int32
+	TargetType string //
+	Operator   int32  //
+
+	LastOperator int32
 }

-// GetPassGob Get return PassGob sql.NullString
-func (so *Source) GetPassGob() sql.NullString {
-	return so.PassGob
+// Get Simple Value
+func (so *Source) Get(field string) interface{} {
+	return reflect.ValueOf(so).Elem().FieldByName(field).Interface()
 }

-// SetPassGob Set PassGob sql.NullString
-func (so *Source) SetPassGob(PassGob sql.NullString) {
-	so.PassGob = PassGob
-}
-
-// GetLastOperator Get return lastOperator int32
-func (so *Source) GetLastOperator() int32 {
-	return so.lastOperator
-}
-
-// SetLastOperator Set lastOperator int32
-func (so *Source) SetLastOperator(lastOperator int32) {
-	so.lastOperator = lastOperator
-}
-
-// GetErrorMsg Get return ErrorMsg sql.NullString
-func (so *Source) GetErrorMsg() sql.NullString {
-	return so.ErrorMsg
-}
-
-// SetErrorMsg Set ErrorMsg sql.NullString
-func (so *Source) SetErrorMsg(ErrorMsg sql.NullString) {
-	so.ErrorMsg = ErrorMsg
-}
-
-// GetOperator Get return Operator sql.NullInt32
-func (so *Source) GetOperator() int32 {
-	return so.Operator
-}
-
-// SetOperator Set Operator sql.NullInt32
-func (so *Source) SetOperator(Operator int32) {
-	so.Operator = Operator
-}
-
-// GetUpdateTime Get return UpdateTime time.Time
-func (so *Source) GetUpdateTime() sql.NullTime {
-	return so.UpdateTime
-}
-
-// SetUpdateTime Set UpdateTime time.Time
-func (so *Source) SetUpdateTime(UpdateTime sql.NullTime) {
-	so.UpdateTime = UpdateTime
-}
-
-// GetExt Get return Ext interface{}
-func (so *Source) GetExt() interface{} {
-	return so.Ext
-}
-
-// SetExt Set Ext interface{}
-func (so *Source) SetExt(Ext interface{}) {
-	so.Ext = Ext
-}
-
-// GetSource Get return Source sql.NullString
-func (so *Source) GetSource() sql.NullString {
-	return so.Source
-}
-
-// SetSource Set Source sql.NullString
-func (so *Source) SetSource(Source sql.NullString) {
-	so.Source = Source
-}
-
-// GetTargetType Get return TargetType string
-func (so *Source) GetTargetType() string {
-	return so.TargetType
-}
-
-// SetTargetType Set TargetType string
-func (so *Source) SetTargetType(TargetType string) {
-	so.TargetType = TargetType
-}
-
-// GetUrl Get return Url string
-func (so *Source) GetUrl() string {
-	return so.Url
-}
-
-// SetUrl Set Url string
-func (so *Source) SetUrl(Url string) {
-	so.Url = Url
-}
-
-// GetUid Get return Uid int64
-func (so *Source) GetUid() int64 {
-	return so.Uid
-}
-
-// SetUid Set Uid int64
-func (so *Source) SetUid(Uid int64) {
-	so.Uid = Uid
+// Set Simple Value
+func (so *Source) Set(field string, value interface{}) {
+	reflect.ValueOf(so).Elem().FieldByName(field).Set(reflect.ValueOf(value))
 }
--- a/sql/intimate_extractor.sql
+++ b/sql/intimate_extractor.sql
@@ -1,50 +1,62 @@
 create database if not exists `intimate_extractor`;
 use intimate_extractor;

-CREATE TABLE IF NOT EXISTS `anchor_info` (
-  `uid`           bigint AUTO_INCREMENT,
-  `platform`      varchar(255) NOT NULL,
-  `anchor_id`     varchar(255) NOT NULL,
-  `anchor_name`   varchar(255) NOT NULL,
-  `live_url`      text,
-  `channel`       varchar(128) DEFAULT NULL,
-  `tags`          json DEFAULT NULL,
-  `ext`           json DEFAULT NULL,
-  `update_time`   timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+CREATE TABLE IF NOT EXISTS `streamer` (
+  `uid`           bigint AUTO_INCREMENT COMMENT '自增UID, 便于查询定位',
+  `platform`      varchar(255) NOT NULL COMMENT '平台',
+  `user_id`     varchar(255) NOT NULL COMMENT '用户唯一UID',
+  `user_name`   varchar(255) DEFAULT NULL COMMENT '用户名字 区别于ID',
+  `live_url`      text COMMENT '直播的url', 
+  `channel`       varchar(128) DEFAULT NULL COMMENT'所属 频道,分类 未必所有平台都有明确的标签',
+  `ext`           json DEFAULT NULL COMMENT '扩展类型, 把一些可能需要但是没字段的数据放在json扩展',
+
+  `is_update_streamer` tinyint(1) DEFAULT 0 COMMENT '是否需要持续更新streamer的信息. 1为需要,0则否',
+  `is_update_url` tinyint(1) DEFAULT 0 COMMENT '是否需要持续更新update_url. 1为需要,0则否',
+  `update_url`    json DEFAULT NULL COMMENT '更新数据的url, 如直播url, profile url等',
+  `update_interval` int  DEFAULT 30 COMMENT '分钟单位, 默认30分钟, 下次更新的时间间隔',
+  `update_time`   Timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `latest_log_uid` bigint COMMENT '最新更新的日志表的uid, 方便关联',  
+
+  `error_msg` text DEFAULT NULL COMMENT '错误信息',
+  `operator`      int DEFAULT 0 COMMENT '操作标志位, 根据不同解析方法有不同标志',
+
  PRIMARY KEY (`uid`),
-  UNIQUE KEY `platform_anchor_id_idx` (`platform`, `anchor_id`),
+  UNIQUE KEY `platform_user_id_idx` (`platform`, `user_id`),
  KEY `platform_idx` (`platform`),
-  KEY `anchor_id_idx` (`anchor_id`),
-  KEY `anchor_name_idx` (`anchor_name`),
+  KEY `user_id_idx` (`user_id`),
+  KEY `user_name_idx` (`user_name`),
  KEY `channel_idx` (`channel`),
-  KEY `update_time_idx` (`update_time`)
+  KEY `update_time_idx` (`update_time`),
+  KEY `operator_idx` (`operator`)
 );

 CREATE TABLE IF NOT EXISTS `collect_log` (
-  `uid`     bigint,
-  `platform` varchar(255) NOT NULL,
-  `anchor_id` varchar(255) NOT NULL,
+  `log_uid`        bigint AUTO_INCREMENT COMMENT '日志自增UID',
+  `streamer_uid`     bigint COMMENT '对应streamer表的UID',
+  `platform` varchar(255) NOT NULL COMMENT '平台名称, 方便于搜索日志分类',
+  `user_id` varchar(255) NOT NULL COMMENT '用户UID',

-  `is_live_streaming` tinyint(1) DEFAULT 0,
-  `is_error` tinyint(1) DEFAULT 0,
+  `is_live_streaming` tinyint(1) DEFAULT 0 COMMENT '是否正在直播',
+  `is_error` tinyint(1) DEFAULT 0 COMMENT '是否采集数据的时候出错, 便于定位错误',

-  `followers` bigint(11) DEFAULT NULL,
-  `views` bigint(11) DEFAULT NULL,
-  `giver` json DEFAULT NULL,
-  `gratuity` bigint(11) DEFAULT NULL,
+  `followers` bigint(11) DEFAULT NULL COMMENT '关注数',
+  `views` bigint(11) DEFAULT NULL COMMENT '当前直播的观众',
+  `giver` json DEFAULT NULL COMMENT '打赏礼物者,和一些金额数据等, 数据类型异于平台',
+  `gratuity` bigint(11) DEFAULT NULL COMMENT '打赏值的总值, 数据类型异于平台',

-  `live_title` text DEFAULT NULL,
-  `live_start_time` timestamp   NULL DEFAULT NULL,
-  `live_end_time` timestamp  NULL DEFAULT NULL,
-  `update_time` timestamp  NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `tags` json DEFAULT NULL,
-  `ext` json DEFAULT NULL,
+  `live_title` text DEFAULT NULL COMMENT '直播标题',
+  `live_start_time` Timestamp   NULL DEFAULT NULL COMMENT '直播开始时间',
+  `live_end_time` Timestamp  NULL DEFAULT NULL COMMENT '直播结束时间',
+  `update_time` Timestamp  NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '数据日志更新时间',
+  `tags` json DEFAULT NULL COMMENT '主播直播的类型标签, 非永久固定',
+  `ext` json DEFAULT NULL COMMENT '扩展字段, 用于一些数据不存在的字段, 便于记录扩展',
  
-  `error_msg` text DEFAULT NULL,
+  `error_msg` text DEFAULT NULL COMMENT '错误信息',

-  KEY `uid_idx` (`uid`),
+  PRIMARY KEY (`log_uid`),
+  KEY `streamer_uid_idx` (`streamer_uid`),
  KEY `platform_idx` (`platform`),
-  KEY `anchor_id_idx` (`anchor_id`),
+  KEY `user_id_idx` (`user_id`),
  KEY `is_live_streaming_idx` (`is_live_streaming`),
  KEY `is_error_idx` (`is_error`),
  KEY `followers_idx` (`followers`),
--- a/sql/intimate_source.sql
+++ b/sql/intimate_source.sql
@@ -2,15 +2,18 @@ create database if not exists `intimate_source`;
 use intimate_source;

 CREATE TABLE IF NOT EXISTS `source_openrec` (
-	uid bigint AUTO_INCREMENT,
-	`url` text NOT NULL,
-	`target_type` varchar(64) NOT NULL,
-	`source` longtext DEFAULT NULL,
-	`ext` json DEFAULT NULL,
-	`pass_gob` blob DEFAULT NULL,
-	`update_time` timestamp  NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-	`operator` int DEFAULT 0,
-	`error_msg` text DEFAULT NULL,
+	uid bigint AUTO_INCREMENT COMMENT '自增UID',
+
+	`streamer_id` bigint DEFAULT NULL COMMENT 'streamer uid, 关联主播',
+	`url` text NOT NULL COMMENT '获取源数据地址',
+	`source` longtext DEFAULT NULL COMMENT '源数据',
+	`ext` json DEFAULT NULL COMMENT '扩展字段',
+	`serialize` blob DEFAULT NULL COMMENT '需要给下个任务传递 序列花数据, 非必要不用',
+	`update_time` Timestamp  NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新数据',
+	`error_msg` text DEFAULT NULL COMMENT '错误信息',
+
+	`target_type` varchar(64) NOT NULL COMMENT '目标类型',
+	`operator` int DEFAULT 0 COMMENT '操作标志位, 根据不同解析方法有不同标志',
 	PRIMARY KEY(`uid`),
 	KEY `operator_idx` (`operator`),
 	KEY `update_time_idx` (`update_time`),
--- a/store.go
+++ b/store.go
@@ -3,6 +3,7 @@ package intimate
 import (
 	"database/sql"
 	"log"
+	"time"

 	_ "github.com/go-sql-driver/mysql"
 )
@@ -25,8 +26,17 @@ type ISet interface {
 	Set(string, interface{})
 }

+type IGet interface {
+	Get(string) interface{}
+}
+
+type IGetSet interface {
+	ISet
+	IGet
+}
+
 // SourceStore 储存
-type SourceStore struct {
+type StoreSource struct {
 	table      string
 	db         *sql.DB
 	errorCount int
@@ -34,15 +44,15 @@ type SourceStore struct {
 }

 // NewSourceStore 创建一个存储实例
-func NewSourceStore(table string) *SourceStore {
+func NewStoreSource(table string) *StoreSource {
 	db, err := sql.Open("mysql", InitConfig.Database.SourceURI)
 	if err != nil {
 		panic(err)
 	}
-	return &SourceStore{table: table, db: db}
+	return &StoreSource{table: table, db: db}
 }

-func (store *SourceStore) errorAlarm(err error) {
+func (store *StoreSource) errorAlarm(err error) {
 	if err != nil {
 		log.Println("store error: ", err)
 		// 报警. 如果数据插入有问题
@@ -58,46 +68,58 @@ func (store *SourceStore) errorAlarm(err error) {
 }

 // Insert 插入数据
-func (store *SourceStore) Insert(isource IGetSource) {
-	_, err := store.db.Exec("insert into "+store.table+"(url, target_type, source,  ext, operator, error_msg) values(?,?,?,?,?,?)", isource.GetUrl(), isource.GetTargetType(), isource.GetSource(), isource.GetExt(), isource.GetOperator(), isource.GetErrorMsg())
-	store.errorAlarm(err)
+func (store *StoreSource) Insert(isource IGet) {
+	_, err := store.db.Exec("insert into "+store.table+"(url, target_type, source,  ext, operator, error_msg, streamer_id) values(?,?,?,?,?,?,?)", isource.Get("Url"), isource.Get("TargetType"), isource.Get("Source"), isource.Get("Ext"), isource.Get("Operator"), isource.Get("ErrorMsg"), isource.Get("StreamerId"))
+	if err != nil {
+		panic(err)
+	}
 }

 // Update 更新数据
-func (store *SourceStore) Update(isource IUpdateSource) {
-	_, err := store.db.Exec("update "+store.table+" set  ext = ?, pass_gob = ?, operator = ?, error_msg = ? where uid = ?", isource.GetExt(), isource.GetPassGob(), isource.GetOperator(), isource.GetErrorMsg(), isource.GetUid())
-	store.errorAlarm(err)
+func (store *StoreSource) Update(isource IGet) {
+	_, err := store.db.Exec("update "+store.table+" set  ext = ?, pass_gob = ?, operator = ?, error_msg = ? where uid = ?", isource.Get("Ext"), isource.Get("PassGob"), isource.Get("Operator"), isource.Get("ErrorMsg"), isource.Get("Uid"))
+	if err != nil {
+		panic(err)
+	}
 }

 // UpdateOperator 更新数据操作标志位
-func (store *SourceStore) UpdateOperator(isource IUpdateSource) {
-	_, err := store.db.Exec("update "+store.table+" set  operator = ?, error_msg = ? where uid = ?", isource.GetOperator(), isource.GetErrorMsg(), isource.GetUid())
-	store.errorAlarm(err)
+func (store *StoreSource) UpdateOperator(isource IGet) {
+	_, err := store.db.Exec("update "+store.table+" set  operator = ?, error_msg = ? where uid = ?", isource.Get("Operator"), isource.Get("ErrorMsg"), isource.Get("Uid"))
+	if err != nil {
+		panic(err)
+	}
 }

 // UpdateError 更新错误数据
-func (store *SourceStore) UpdateError(isource IUpdateSource, err error) {
-	isource.SetOperator(int32(OperatorError))
-	isource.SetErrorMsg(sql.NullString{String: err.Error(), Valid: true})
-	_, dberr := store.db.Exec("update "+store.table+" set  operator = ?, error_msg = ? where uid = ?", isource.GetOperator(), isource.GetErrorMsg(), isource.GetUid())
-	store.errorAlarm(dberr)
+func (store *StoreSource) UpdateError(isource IGetSet, err error) {
+	isource.Set("Operator", int32(OperatorError)+isource.Get("Operator").(int32))
+	isource.Set("ErrorMsg", sql.NullString{String: err.Error(), Valid: true})
+	_, dberr := store.db.Exec("update "+store.table+" set  operator = ?, error_msg = ? where uid = ?", isource.Get("Operator"), isource.Get("ErrorMsg"), isource.Get("Uid"))
+	if dberr != nil {
+		// email tell owner to deal with
+		panic(err)
+	}
 }

 // Restore 恢复Operator数据状态
-func (store *SourceStore) Restore(isource IUpdateSource) {
-	_, err := store.db.Exec("update "+store.table+" set  operator = ?  where uid = ?", isource.GetLastOperator(), isource.GetUid())
-	store.errorAlarm(err)
+func (store *StoreSource) Restore(isource IGet) {
+	_, dberr := store.db.Exec("update "+store.table+" set  operator = ?  where uid = ?", isource.Get("LastOperator"), isource.Get("Uid"))
+	if dberr != nil {
+		// email tell owner to deal with
+		panic(dberr)
+	}
 }

 // Pop 弹出一条未处理的数据
-func (store *SourceStore) Pop(targetType string, operators ...int32) (IUpdateSource, error) {
+func (store *StoreSource) Pop(targetType string, operators ...int32) (*Source, error) {

 	tx, err := store.db.Begin()
 	if err != nil {
 		return nil, err
 	}
 	var args = []interface{}{targetType}
-	selectSQL := `select uid, url, target_type, source, ext, operator, update_time from ` + store.table + ` where target_type = ?`
+	selectSQL := `select uid, url, target_type, source, ext, operator, update_time, streamer_id from ` + store.table + ` where target_type = ?`
 	if len(operators) == 0 {
 		selectSQL += " and operator = ?"
 		args = append(args, 0)
@@ -124,31 +146,31 @@ func (store *SourceStore) Pop(targetType string, operators ...int32) (IUpdateSou

 	s := &Source{}
 	// uid, url, target_type, source, ext, operator
-	err = row.Scan(&s.Uid, &s.Url, &s.TargetType, &s.Source, &s.Ext, &s.Operator, &s.UpdateTime)
+	err = row.Scan(&s.Uid, &s.Url, &s.TargetType, &s.Source, &s.Ext, &s.Operator, &s.UpdateTime, &s.StreamerId)
 	if err != nil {
 		return nil, err
 	}
-	s.SetLastOperator(s.Operator)
+	s.Set("LastOperator", s.Operator)
 	_, err = tx.Exec("update "+store.table+" set operator = ? where uid = ?", OperatorWait, s.Uid)
 	return s, nil
 }

-// AnchorTable 主播表名称
-const AnchorTable string = "anchor_info"
+// StreamerTable 主播表名称
+const StreamerTable string = "streamer"

 // CollectLogTable 采集日志表
 const CollectLogTable string = "collect_log"

-type ExtractorStore struct {
+type StoreExtractor struct {
 	db *sql.DB

 	errorCount int
 	errorLimit int
 }

-func (store *ExtractorStore) errorAlarm(err error) {
+func (store *StoreExtractor) errorAlarm(err error) {
 	if err != nil {
-		log.Panic("store error: ", err)
+		log.Println("store error: ", err)
 		// 报警. 如果数据插入有问题
 		store.errorCount++
 		if store.errorCount >= store.errorLimit {
@@ -161,66 +183,161 @@ func (store *ExtractorStore) errorAlarm(err error) {
 	}
 }

-func NewExtractorStore() *ExtractorStore {
+// NewStoreExtractor 生成一个extractor库的相关链接
+func NewStoreExtractor() *StoreExtractor {
 	db, err := sql.Open("mysql", InitConfig.Database.ExtractorURI)
 	if err != nil {
 		panic(err)
 	}
-	return &ExtractorStore{db: db}
+	return &StoreExtractor{db: db}
 }

-/*
-  `uid`           bigint,
-  `platform`      varchar(255) NOT NULL,
-  `anchor_id`     varchar(255) NOT NULL,
-  `anchor_name`   varchar(255) NOT NULL,
-  `live_url`      text,
-  `channel`       varchar(128) DEFAULT NULL,
-  `show_type`     varchar(255) DEFAULT NULL,
-*/
+// Pop 弹出一条未处理的数据
+func (store *StoreExtractor) Pop(platform string, operators ...int32) (*Streamer, error) {

-// InsertAnchorInfo AnchorInfo表, 插入数据
-func (store *ExtractorStore) InsertAnchorInfo(isource IGetAnchorInfo) (Uid int64, err error) {
-	// select uid from table where platform = ? and anchor_id = ?
-	selectSQL := "select uid from " + AnchorTable + " where platform = ? and anchor_id = ?"
 	tx, err := store.db.Begin()
 	if err != nil {
-		log.Println(err)
-		return 0, err
+		return nil, err
+	}
+	var args = []interface{}{platform}
+	selectSQL := `select uid, update_time, user_id, update_url, is_update_streamer from ` + StreamerTable + ` where platform = ? and  TIMESTAMPDIFF(MINUTE , update_time, CURRENT_TIMESTAMP()) >= update_interval`
+	if len(operators) == 0 {
+		selectSQL += " and operator = ?"
+		args = append(args, 0)
+	} else {
+		for _, operator := range operators {
+			selectSQL += " and operator = ?"
+			args = append(args, operator)
+		}
 	}

-	row := tx.QueryRow(selectSQL+` limit 1 for update`, isource.GetPlatform(), isource.GetAnchorId())
-
-	var uid int64
-	if err = row.Scan(&uid); err == nil {
-		return uid, nil
-	}
-
-	result, err := tx.Exec("insert  into "+AnchorTable+"(platform, anchor_id, anchor_name,  live_url, channel, tags, ext) values(?,?,?,?,?,?,?);", isource.GetPlatform(), isource.GetAnchorId(), isource.GetAnchorName(), isource.GetLiveUrl(), isource.GetChannel(), isource.GetTags(), isource.GetExt())
-
-	if err != nil {
-		log.Println(err)
-		return 0, nil
-	}
-
-	err = tx.Commit()
-	if err != nil {
-		log.Println(err)
-		err = tx.Rollback()
+	defer func() {
+		err := tx.Commit()
 		if err != nil {
 			log.Println(err)
+			err = tx.Rollback()
+			if err != nil {
+				log.Println(err)
+			}
 		}
-		return 0, err
+	}()
+
+	// log.Println(selectSQL + ` limit 1 for update`)
+	row := tx.QueryRow(selectSQL+` limit 1 for update`, args...)
+
+	s := &Streamer{}
+	// uid, url, target_type, source, ext, operator
+	err = row.Scan(&s.Uid, &s.UpdateTime, &s.UserId, &s.UpdateUrl, &s.IsUpdateStreamer)
+	if err != nil {
+		return nil, err
+	}
+	s.Set("LastOperator", s.Operator)
+	_, err = tx.Exec("update "+StreamerTable+" set operator = ? where uid = ?", OperatorWait, s.Uid)
+	return s, nil
+}
+
+// InsertStreamer Streamer表, 插入数据
+func (store *StoreExtractor) InsertStreamer(streamer IGet) (isExists bool) {
+	// select uid from table where platform = ? and user_id = ?
+	selectSQL := "SELECT is_update_url FROM " + StreamerTable + " WHERE platform = ? AND user_id = ?"
+	tx, err := store.db.Begin()
+	if err != nil {
+		panic(err)
 	}

-	return result.LastInsertId()
+	defer func() {
+		err = tx.Commit()
+		if err != nil {
+			rerr := tx.Rollback()
+			if rerr != nil {
+				log.Println(rerr)
+			}
+			panic(err)
+		}
+	}()
+
+	row := tx.QueryRow(selectSQL+` LIMIT 1 FOR UPDATE`, streamer.Get("Platform"), streamer.Get("UserId"))
+	var isUpdateUrl bool
+	if err = row.Scan(&isUpdateUrl); err == nil {
+		if isUpdateUrl {
+			tx.Exec("UPDATE "+StreamerTable+" SET update_url = ?", streamer.Get("UpdateUrl"))
+		}
+		return true
+	}
+
+	_, err = tx.Exec("INSERT INTO "+StreamerTable+"(platform, user_id, update_url, update_time) VALUES(?,?,?,?);", streamer.Get("Platform"), streamer.Get("UserId"), streamer.Get("UpdateUrl"), time.Now().Add(-time.Minute*30))
+	if err != nil {
+		panic(err)
+	}
+	return false
+}
+
+// UpdateError 更新错误数据
+func (store *StoreExtractor) UpdateError(isource IGetSet, err error) {
+	isource.Set("Operator", int32(OperatorError)+isource.Get("Operator").(int32))
+	isource.Set("ErrorMsg", sql.NullString{String: err.Error(), Valid: true})
+	_, dberr := store.db.Exec("update "+StreamerTable+" set  operator = ?, error_msg = ? where uid = ?", isource.Get("Operator"), isource.Get("ErrorMsg"), isource.Get("Uid"))
+	if dberr != nil {
+		// email tell owner to deal with
+		panic(err)
+	}
+}
+
+// UpdateStreamerLog 只更新Streamer的关联日志和时间戳
+func (store *StoreExtractor) UpdateStreamerLog(latestUid int64, streamerUid int64) {
+	_, err := store.db.Exec("UPDATE "+StreamerTable+" SET  latest_log_uid = ?,  update_time = CURRENT_TIMESTAMP() WHERE uid = ?", latestUid, streamerUid)
+	if err != nil {
+		panic(err)
+	}
+}
+
+// UpdateOperator Streamer表, 插入数据
+func (store *StoreExtractor) UpdateOperator(isource IGet) {
+	_, err := store.db.Exec("update "+StreamerTable+" set  operator = ?, error_msg = ? where uid = ?", isource.Get("Operator"), isource.Get("ErrorMsg"), isource.Get("Uid"))
+	if err != nil {
+		panic(err)
+	}
+}
+
+// UpdateStreamer Streamer表, 插入数据
+func (store *StoreExtractor) UpdateStreamer(isource IGet) {
+	_, err := store.db.Exec("UPDATE "+StreamerTable+" SET user_name = ?,  live_url = ?, channel = ?, latest_log_uid = ?, ext = ?, operator = ?, update_time = ? WHERE uid = ?;",
+		isource.Get("UserName"), isource.Get("LiveUrl"), isource.Get("Channel"), isource.Get("LatestLogUid"), isource.Get("Ext"), isource.Get("Operator"), isource.Get("UpdateTime"), isource.Get("Uid"))
+	if err != nil {
+		panic(err)
+	}
 }

 // InsertCollectLog CollectLog表插入数据
-func (store *ExtractorStore) InsertCollectLog(isource IGetCollectLog) error {
-	_, err := store.db.Exec("insert  into "+CollectLogTable+"(uid, platform, anchor_id,  is_live_streaming, is_error, followers, views, giver, gratuity, live_title, live_start_time, live_end_time, update_time, tags, ext, error_msg) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
-		isource.GetUid(), isource.GetPlatform(), isource.GetAnchorId(), isource.GetIsLiveStreaming(), isource.GetIsError(), isource.GetFollowers(), isource.GetViews(), isource.GetGiver(), isource.GetGratuity(), isource.GetLiveTitle(), isource.GetLiveStartTime(), isource.GetLiveEndTime(), isource.GetUpdateTime(), isource.GetTags(), isource.GetExt(), isource.GetErrorMsg(),
+func (store *StoreExtractor) InsertCollectLog(isource IGet) int64 {
+	tx, err := store.db.Begin()
+
+	defer func() {
+		if err := recover(); err != nil {
+			tx.Rollback()
+			log.Panic(err)
+		}
+	}()
+
+	if err != nil {
+		panic(err)
+	}
+
+	result, err := tx.Exec("insert  into "+CollectLogTable+"(streamer_uid, platform, user_id,  is_live_streaming, is_error, followers, views, giver, gratuity, live_title, live_start_time, live_end_time, update_time, tags, ext, error_msg) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+		isource.Get("StreamerUid"), isource.Get("Platform"), isource.Get("UserId"), isource.Get("IsLiveStreaming"), isource.Get("IsError"), isource.Get("Followers"), isource.Get("Views"), isource.Get("Giver"), isource.Get("Gratuity"), isource.Get("LiveTitle"), isource.Get("LiveStartTime"), isource.Get("LiveEndTime"), isource.Get("UpdateTime"), isource.Get("Tags"), isource.Get("Ext"), isource.Get("ErrorMsg"),
 	)
-	store.errorAlarm(err)
-	return err
+	if err != nil {
+		panic(err)
+	}
+
+	logUid, err := result.LastInsertId()
+	if err != nil {
+		panic(err)
+	}
+
+	_, err = tx.Exec("update "+StreamerTable+" set latest_log_uid = ? where uid = ?", logUid, isource.Get("StreamerUid"))
+	if err = tx.Commit(); err != nil {
+		panic(err)
+	}
+	return logUid
 }
--- a/store_test.go
+++ b/store_test.go
@@ -2,8 +2,6 @@ package intimate

 import (
 	"testing"
-
-	"github.com/tidwall/gjson"
 )

 func TestStoreInsert(t *testing.T) {
@@ -26,20 +24,20 @@ func TestStoreInsertCase1(t *testing.T) {
 }

 func TestStorePopCase1(t *testing.T) {
-	store := NewSourceStore("source_openrec")
-	source, err := store.Pop(string(TTOpenrecRanking))
-	if err != nil {
-		t.Error(err)
-	}
-	t.Error(source.GetOperator())
-	t.Error(gjson.Valid(source.GetSource().String))
-	result := gjson.Parse(source.GetSource().String)
-	if result.IsArray() {
-		for _, User := range result.Array() {
-			t.Error(User.Get("channel.id").String())
-		}
-	} else {
-		t.Error("array error")
-	}
+	// store := NewSourceStore("source_openrec")
+	// source, err := store.Pop(string(TTOpenrecRanking))
+	// if err != nil {
+	// 	t.Error(err)
+	// }
+	// t.Error(source.GetOperator())
+	// t.Error(gjson.Valid(source.GetSource().String))
+	// result := gjson.Parse(source.GetSource().String)
+	// if result.IsArray() {
+	// 	for _, User := range result.Array() {
+	// 		t.Error(User.Get("channel.id").String())
+	// 	}
+	// } else {
+	// 	t.Error("array error")
+	// }

 }
--- a/target_type_list.go
+++ b/target_type_list.go
@@ -8,5 +8,5 @@ const (
 	TTOpenrecRanking TargetType = "openrec_ranking"

 	// TTOpenrecUser openrec源TargetType名称
-	TTOpenrecUser TargetType = "openrec_ranking"
+	TTOpenrecUser TargetType = "openrec_user"
 )
--- a/tasks/openrec/openrec_task1/source_openrec.go
+++ b/tasks/openrec/openrec_task1/source_openrec.go
@@ -1,19 +0,0 @@
-package main
-
-/*
-CREATE TABLE  `source_openrec` (
-	uid bigint AUTO_INCREMENT,
-	`url` text NOT NULL,
-	`target_type` varchar(64) NOT NULL,
-	`source` longtext DEFAULT NULL,
-	`ext` json DEFAULT NULL,
-
-	`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-	`operator` int DEFAULT 0,
-	`error_msg` text DEFAULT NULL,
-	PRIMARY KEY(`uid`),
-	KEY `operator_idx` (`operator`),
-	KEY `update_time_idx` (`update_time`),
-	KEY `target_type_idx` (`target_type`)
- );
-*/
--- a/tasks/openrec/openrec_task1/task_openrec.go
+++ b/tasks/openrec/openrec_task1/task_openrec.go
@@ -1,7 +1,7 @@
 package main

 import (
-	"database/sql"
+	"encoding/json"
 	"intimate"
 	"log"
 	"os"
@@ -17,8 +17,11 @@ import (

 var openrecRanking *OpenrecRanking

-// store  源存储实例, 为存储源数据的实现. 表格具体参考sql/intimate_source.sql
-var store *intimate.SourceStore = intimate.NewSourceStore(string(intimate.STOpenrec))
+// sstore  源存储实例, 为存储源数据的实现. 表格具体参考sql/intimate_source.sql
+var sstore *intimate.StoreSource = intimate.NewStoreSource(string(intimate.STOpenrec))
+
+// estore 解析存储连接实例
+var estore *intimate.StoreExtractor = intimate.NewStoreExtractor()

 func init() {

@@ -60,55 +63,76 @@ func (or *OpenrecRanking) Execute(cxt *hunter.TaskContext) {
 		resp, err := cxt.Hunt()
 		if err != nil {
 			log.Println(err)
-			break
+			time.Sleep(time.Second * 2)
+			continue
 		}

-		wf := cxt.Temporary()
+		tp := cxt.Temporary()

 		content := resp.Content()
-		if len(content) <= 200 {
-			return
+		if len(content) <= 200 { // 末页退出
+			finishpoint := time.Now()
+			log.Println("任务Ranking UserId结束休眠, 下次启动时间:", finishpoint.Add(time.Minute*60))
+			for time.Now().Sub(finishpoint) < time.Minute*60 {
+				time.Sleep(time.Second)
+				if atomic.LoadInt32(&loop) > 0 {
+					return
+				}
+			}
+
+			log.Println("获取Ranking UserId启动:", time.Now())
+			querys := tp.GetQuery()
+			querys.Set("page", strconv.Itoa(1))
+			tp.SetQuery(querys)
+
+			continue
 		}

 		result := gjson.ParseBytes(content)
 		if result.IsArray() {
 			for _, User := range result.Array() {
-				data := &intimate.Source{}
+
 				userid := User.Get("channel.id").String()

-				data.SetSource(sql.NullString{String: userid, Valid: len(userid) > 0})
-				data.SetUrl(wf.GetRawURL())
-				data.SetTargetType(string(intimate.TTOpenrecUser))
-				store.Insert(data)
+				// data := &intimate.Source{}
+				// data.Source = sql.NullString{String: userid, Valid: len(userid) > 0}
+				// data.Url = tp.GetRawURL()
+				// data.TargetType = string(intimate.TTOpenrecUser)
+				// sstore.Insert(data)
+
+				streamer := &intimate.Streamer{}
+				streamer.UserId = userid
+				streamer.Platform = string(intimate.Popenrec)
+
+				updateUrl := make(map[string]interface{})
+
+				supportersUrl := "curl 'https://www.openrec.tv/viewapp/api/v6/supporters?identify_id=sumomo_xqx&month=&Uuid=B96EE988-E3A2-4A44-A543-611A8B4BC683&Token=46598c320408bd69ae3c63298f6f4a3a97354175&Random=AZVXNAAXQVMOSVWNDPIQ&page_number=1' -H 'accept: application/json, text/javascript, */*; q=0.01'   -H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36'  -H 'cookie: uuid=B96EE988-E3A2-4A44-A543-611A8B4BC683;'   --compressed"
+				updateUrl["supporters"] = supportersUrl
+				updateUrl["user"] = "https://www.openrec.tv/user/" + userid
+				updateUrl["live"] = "https://www.openrec.tv/live/" + userid
+
+				updateUrlBytes, err := json.Marshal(updateUrl)
+				if err != nil {
+					estore.UpdateError(streamer, err)
+					continue
+				}
+
+				streamer.UpdateUrl = updateUrlBytes
+				estore.InsertStreamer(streamer)
 			}
 		}

-		querys := wf.GetQuery()
+		querys := tp.GetQuery()
 		page, err := strconv.Atoi(querys.Get("page"))
 		if err != nil {
 			log.Println(err)
 			return
 		}
-		return
+
 		page++
 		querys.Set("page", strconv.Itoa(page))
-		wf.SetQuery(querys)
-		time.Sleep(time.Second * 2)
+		tp.SetQuery(querys)
+
+		time.Sleep(time.Second * 1)
 	}
 }
-
-// OpenrecUser 获取用户信息
-type OpenrecUser struct {
-	hunter.PreCurlUrl
-}
-
-// Execute 执行方法
-func (or *OpenrecUser) Execute(cxt *hunter.TaskContext) {
-	resp, err := cxt.Hunt()
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	resp.Content()
-}
--- a/tasks/openrec/openrec_task1/source_openrec_test.go
+++ b/tasks/openrec/openrec_task1/source_openrec_test.go
@@ -2,6 +2,7 @@ package main

 import (
 	"testing"
+	"time"

 	"github.com/tidwall/gjson"

@@ -56,6 +57,12 @@ func TestRanking(t *testing.T) {
 	ht.Execute()
 }

+func TestTimeAdd(t *testing.T) {
+	finishpoint := time.Now()
+	time.Sleep(time.Second * 2)
+	t.Error(time.Now().Sub(finishpoint) > time.Second*1)
+}
+
 func TestRankingInsert(t *testing.T) {
 	ht := hunter.NewHunter(openrecRanking)
 	ht.Execute()
--- a/tasks/openrec/openrec_task2/.gitignore
+++ b/tasks/openrec/openrec_task2/.gitignore
@@ -1 +1,2 @@
-openrec_task2
+openrec_task2
+log
--- a/tasks/openrec/openrec_task2/task_openrec.go
+++ b/tasks/openrec/openrec_task2/task_openrec.go
@@ -20,8 +20,11 @@ import (

 var oer *OpenrecExtratorRanking

-// store  源存储实例, 为存储源数据的实现. 表格具体参考sql/intimate_source.sql
-var store *intimate.SourceStore = intimate.NewSourceStore(string(intimate.STOpenrec))
+// sstore  源存储实例, 为存储源数据的实现. 表格具体参考sql/intimate_source.sql
+var sstore *intimate.StoreSource = intimate.NewStoreSource(string(intimate.STOpenrec))
+
+// estore  源存储实例, 为存储源数据的实现. 表格具体参考sql/intimate_extractor.sql
+var estore *intimate.StoreExtractor = intimate.NewStoreExtractor()

 func init() {
 	oer = &OpenrecExtratorRanking{}
@@ -44,34 +47,46 @@ func (oer *OpenrecExtratorRanking) Execute(cxt *hunter.TaskContext) {
 		atomic.StoreInt32(&loop, 0)
 	}()

+	var lasterr error = nil
+
 	for atomic.LoadInt32(&loop) > 0 {

-		source, err := store.Pop(string(intimate.TTOpenrecUser))
+		streamer, err := estore.Pop(string(intimate.Popenrec))

-		if source == nil || err != nil {
-			log.Println(err)
+		if streamer == nil || err != nil {
+			if err != lasterr {
+				log.Println(err, lasterr)
+				lasterr = err
+			}
 			time.Sleep(time.Second * 2)
 			continue
 		}

-		userSource := &intimate.Source{}
-		userid := source.GetSource().String
-		userUrl := "https://www.openrec.tv/user/" + userid
-		userSource.SetUrl(userUrl)
+		userId := streamer.UserId

-		wf := cxt.Session().Get(userUrl)
-		resp, err := wf.Execute()
-		source.SetUpdateTime(sql.NullTime{Time: time.Now(), Valid: true})
+		var updateUrl map[string]string
+
+		err = json.Unmarshal(streamer.UpdateUrl.([]byte), &updateUrl)
+		if err != nil {
+			log.Println(err)
+			continue
+		}
+		// Check Userid
+
+		userUrl := updateUrl["user"]
+		tp := cxt.Session().Get(userUrl)
+		resp, err := tp.Execute()
+		streamer.UpdateTime = sql.NullTime{Time: time.Now(), Valid: true}

 		if err != nil {
 			log.Println(err)
-			store.UpdateError(source, err)
+			estore.UpdateError(streamer, err)
 			continue
 		}

-		cookies := cxt.Session().GetCookies(wf.GetParsedURL())
+		cookies := cxt.Session().GetCookies(tp.GetParsedURL())

-		scurl := "https://www.openrec.tv/viewapp/api/v6/supporters?identify_id=sumomo_xqx&month=&Uuid=B96EE988-E3A2-4A44-A543-611A8B4BC683&Token=46598c320408bd69ae3c63298f6f4a3a97354175&Random=AZVXNAAXQVMOSVWNDPIQ&page_number=1 -H 'accept: application/json, text/javascript, */*; q=0.01'   -H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36'  -H 'cookie: uuid=B96EE988-E3A2-4A44-A543-611A8B4BC683;'   --compressed"
+		scurl := updateUrl["supporters"]
 		curl := gcurl.ParseRawCURL(scurl)
 		supportersSession := curl.CreateSession()

@@ -99,7 +114,7 @@ func (oer *OpenrecExtratorRanking) Execute(cxt *hunter.TaskContext) {
 				}
 			}

-			supportersQuery.Set("identify_id", source.GetSource().String)
+			supportersQuery.Set("identify_id", userId)
 			temporary.SetQuery(supportersQuery)

 			resp, err := temporary.Execute()
@@ -128,28 +143,36 @@ func (oer *OpenrecExtratorRanking) Execute(cxt *hunter.TaskContext) {
 		// cookies := cxt.Session().GetCookies(wf.GetParsedURL())
 		ext := make(map[string]interface{})

-		ext["supporters"] = supporters
-		ext["user"] = string(resp.Content())
+		ext["json_supporters"] = supporters
+		ext["html_user"] = string(resp.Content())

-		wf = cxt.Session().Get("https://www.openrec.tv/live/" + userid)
-		resp, err = wf.Execute()
+		liveUrl := updateUrl["live"]
+		tp = cxt.Session().Get(liveUrl)
+		resp, err = tp.Execute()
 		if err != nil {
 			log.Println(err)
-			store.UpdateError(source, err)
+			estore.UpdateError(streamer, err)
 			continue
 		}
-		ext["user_live"] = string(resp.Content())
+		ext["html_live"] = string(resp.Content())
+		ext["var_user_id"] = userId

 		extJsonBytes, err := json.Marshal(ext)
 		if err != nil {
 			log.Println(err)
-			store.UpdateError(source, err)
+			estore.UpdateError(streamer, err)
 			continue
 		}

-		source.SetOperator(int32(intimate.OperatorOK))
-		source.SetExt(string(extJsonBytes))
-		store.Update(source)
+		streamer.Operator = int32(intimate.OperatorOK)
+
+		source := &intimate.Source{}
+		source.TargetType = string(intimate.TTOpenrecUser)
+		source.Ext = string(extJsonBytes)
+		source.StreamerId = sql.NullInt64{Int64: streamer.Uid, Valid: true}
+		sstore.Insert(source)
+
+		estore.UpdateOperator(streamer)
 	}

 }
Author	SHA1	Message	Date
eson	9c4b3eb60b	Merge branch 'release/v0.3.0'	2020-07-21 15:07:18 +08:00
eson	079488a2ba	v0.3.0版本重构. 以主播为目标单位.	2020-07-21 15:05:56 +08:00
eson	d7a6da287d	TODO: extractor 的重构.	2020-07-20 18:54:34 +08:00
eson	f0f83a9f00	1.最后一次数据存储结构重构. 2.数据最接近需求方.	2020-07-20 18:13:54 +08:00
eson	6369387179	Merge tag 'v0.2.1' into develop 测试完整	2020-07-17 19:21:33 +08:00
eson	2611e1df9f	Merge branch 'release/v0.2.1'	2020-07-17 19:21:04 +08:00
eson	7182da2cbe	fix: 时区问题. sqluri导致解析错误.	2020-07-17 19:20:08 +08:00
eson	e1040e69cd	1.重构命名, 简化代码, 加入build.sh 2.重构数据字段结构, 使数据合理性提高. 3.测试通过openrec获取数据完整性. TODO: 测试时区问题.	2020-07-17 18:21:38 +08:00
eson	bb0f3845b7	Merge tag 'v0.2.0' into develop openrec基本完成	2020-07-16 18:35:46 +08:00