Explorar o código

feat:更新缓存

wangchuanjin hai 1 ano
pai
achega
97d799aceb

+ 1 - 1
pushentniche/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 
 require (
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
-	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7
+	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 	github.com/gogf/gf/v2 v2.6.4
 	github.com/gogf/gf/v2 v2.6.4
 	go.mongodb.org/mongo-driver v1.11.4
 	go.mongodb.org/mongo-driver v1.11.4

+ 2 - 2
pushentniche/go.sum

@@ -2,8 +2,8 @@ app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+j
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7 h1:r3g5G08ivFsAyNt+wKFreLP+kmjIg1e+tRjg2AVu1l0=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83 h1:5Gv/pdq3CEfLS8VTZozTyZlTXDZhIsnS+1DbkTK3pzs=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=

+ 3 - 0
pushentniche/public/util.go

@@ -209,6 +209,9 @@ func SaveToMysql(mysql, pushMysql *Mysql, savePool chan bool, sleep int, isProje
 		} else {
 		} else {
 			pushCa.Source = 1
 			pushCa.Source = 1
 		}
 		}
+		if len(matchInfo.MatchWays) == 1 && matchInfo.MatchWays[0] == "3" {
+			pushCa.Filetext_search = true
+		}
 		pushCas = append(pushCas, pushCa)
 		pushCas = append(pushCas, pushCa)
 		//
 		//
 		values = append(values, u.Entniche.EntId, u.Entniche.DeptId, u.Entniche.UserId, _id, unix)
 		values = append(values, u.Entniche.EntId, u.Entniche.DeptId, u.Entniche.UserId, _id, unix)

+ 1 - 1
pushmember/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 
 require (
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
-	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7
+	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 )
 )

+ 2 - 2
pushmember/go.sum

@@ -2,8 +2,8 @@ app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+j
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7 h1:r3g5G08ivFsAyNt+wKFreLP+kmjIg1e+tRjg2AVu1l0=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83 h1:5Gv/pdq3CEfLS8VTZozTyZlTXDZhIsnS+1DbkTK3pzs=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=

+ 3 - 0
pushmember/public/util.go

@@ -103,6 +103,9 @@ func SaveToMysql(mysql *Mysql, savePool chan bool, sleep int, isProjectInfo bool
 		if attachment_count > 0 {
 		if attachment_count > 0 {
 			pushCa.FileExists = true
 			pushCa.FileExists = true
 		}
 		}
+		if len(matchInfo.MatchWays) == 1 && matchInfo.MatchWays[0] == "3" {
+			pushCa.Filetext_search = true
+		}
 		pushCas = append(pushCas, pushCa)
 		pushCas = append(pushCas, pushCa)
 		//
 		//
 		values = append(values, user.BaseUserId, _id, unix)
 		values = append(values, user.BaseUserId, _id, unix)

+ 1 - 1
pushsubscribe/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 
 require (
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
-	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7
+	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 )
 )
 
 

+ 2 - 2
pushsubscribe/go.sum

@@ -2,8 +2,8 @@ app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+j
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7 h1:r3g5G08ivFsAyNt+wKFreLP+kmjIg1e+tRjg2AVu1l0=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83 h1:5Gv/pdq3CEfLS8VTZozTyZlTXDZhIsnS+1DbkTK3pzs=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=

+ 3 - 0
pushsubscribe/public/util.go

@@ -101,6 +101,9 @@ func SaveToMysql(mysql *Mysql, savePool chan bool, saveSleep int, u *UserInfo, m
 		if attachment_count > 0 {
 		if attachment_count > 0 {
 			pushCa.FileExists = true
 			pushCa.FileExists = true
 		}
 		}
+		if len(matchInfo.MatchWays) == 1 && matchInfo.MatchWays[0] == "3" {
+			pushCa.Filetext_search = true
+		}
 		pushCas = append(pushCas, pushCa)
 		pushCas = append(pushCas, pushCa)
 		//
 		//
 		values = append(values, u.BaseUserId, _id, unix)
 		values = append(values, u.BaseUserId, _id, unix)

+ 1 - 1
pushsupersub/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 
 require (
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
-	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7
+	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 )
 )
 
 

+ 2 - 2
pushsupersub/go.sum

@@ -2,8 +2,8 @@ app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+j
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66 h1:kCRYqzclN4dtGuGC89ID2w5lGrJgqZC8bNL8mRR+tiU=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7 h1:r3g5G08ivFsAyNt+wKFreLP+kmjIg1e+tRjg2AVu1l0=
-bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408022643-cd12bbd39ba7/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83 h1:5Gv/pdq3CEfLS8VTZozTyZlTXDZhIsnS+1DbkTK3pzs=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20240408032230-511af2024e83/go.mod h1:ECcF3i8XJ9J6vZ9ZK0gyxHqMRm9UBtgQAdWD2Tw7vvA=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0 h1:60fFbyRAnn5vrnsPk99pVB2aJVin6nDIkNnmekdpFso=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.0/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.17 h1:QHjAuAYPJjml8e19ytWxgKAboo9+f6aQUH/s1UUEfrA=

+ 3 - 0
pushsupersub/public/util.go

@@ -113,6 +113,9 @@ func SaveToMysql(mysql *Mysql, savePool chan bool, saveSleep int, isProjectInfo
 		if attachment_count > 0 {
 		if attachment_count > 0 {
 			pushCa.FileExists = true
 			pushCa.FileExists = true
 		}
 		}
+		if len(matchInfo.MatchWays) == 1 && matchInfo.MatchWays[0] == "3" {
+			pushCa.Filetext_search = true
+		}
 		pushCas = append(pushCas, pushCa)
 		pushCas = append(pushCas, pushCa)
 		//
 		//
 		values = append(values, u.BaseUserId, _id, unix)
 		values = append(values, u.BaseUserId, _id, unix)