wangkaiyue 9 сар өмнө
parent
commit
1ab70a9a9c

+ 1 - 0
saleFlush/config.yaml

@@ -3,6 +3,7 @@ database:
     link: "mysql:readuser:jyTi_R202403@tcp(192.168.3.71:4003)/jianyu"
     debug: true
   default:
+    #link: "mysql:readuser:jyTi_R202403@tcp(192.168.3.71:4003)/jianyu"
     #link: "mysql:root:=PDT49#80Z!RVv52_z@tcp(192.168.3.14:4000)/jianyu"
     link: "mysql:Wangkaiyue:Wky@20230316#@tcp(127.0.0.1:4000)/jianyu"
     debug: true

+ 1 - 0
saleFlush/main.go

@@ -52,6 +52,7 @@ func flushOrderSaleTime(flush bool) {
 	}
 	g.Log().Infof(ctx, "加载完成 耗时%v秒", time.Now().Sub(start).Seconds())
 	_ = gfile.PutContents("./update.json", gconv.String(updateMapping))
+
 	if !flush {
 		return
 	}

+ 19 - 9
userSign/config.yaml

@@ -1,17 +1,27 @@
 database:
   default:
-    link: "clickhouse:jydev:Jsh2scksi7&hs@tcp(127.0.0.1:3900)/pub_tags?dial_timeout=2000ms&max_execution_time=60"
-    debug: true
-  order:
-    link: "mysql:readuser:jyTi_R202403@tcp(192.168.3.71:4003)/jianyu"
+    link: "clickhouse:jytop:pwdTopJy123@tcp(192.168.3.207:19000)/pub_tags?dial_timeout=2000ms&max_execution_time=60"
+    #debug: true
+  jianyu:
+    link: "mysql:root:=PDT49#80Z!RVv52_z@tcp(192.168.3.14:4000)/jianyu"
     debug: true
 
 
 
 mongodb:
   default:
-    address: "172.17.189.140:27080,172.17.189.141:27081"
-    size: 10
-    dbName: "qfw"
-    userName: "JS2Z_Rbid_ProG"
-    password: "JS2z@S1e3aR5Ch"
+    address: "192.168.3.149:27180"
+    size: 5
+    dbName: qfw
+    replSet: ""
+    userName: ""
+    password: ""
+
+runCron:
+  "# 40 14 * * *"
+
+testUserPhone:
+  - 15225181827
+  - 15136225931
+  - 13682301034
+  - 13027620557

+ 24 - 0
userSign/config_release.yaml

@@ -0,0 +1,24 @@
+database:
+  default:
+    link: "clickhouse:jydev:Jsh2scksi7&hs@tcp(127.0.0.1:3900)/pub_tags?dial_timeout=2000ms&max_execution_time=60"
+    #debug: true
+  jianyu:
+    link: "mysql:readuser:jyTi_R202403@tcp(192.168.3.71:4003)/jianyu"
+    debug: true
+
+
+
+mongodb:
+  default:
+    address: "127.0.0.1:27080"
+    size: 10
+    dbName: "qfw"
+
+runCron:
+  "# 0 2 * * *"
+
+testUserPhone:
+  - 15225181827
+  - 15136225931
+  - 13682301034
+  - 13027620557

+ 18 - 0
userSign/main.go

@@ -6,12 +6,30 @@ import (
 	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
 	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gcron"
+	"github.com/gogf/gf/v2/os/gctx"
 	"time"
 	"workTasks/userSign/userAnalysis"
+	"workTasks/userSign/userTag"
 )
 
 func main() {
+	ctx := gctx.New()
 	runOnce(context.TODO())
+	//if e := userTag.BaseUserTag(); e != nil {
+	//	g.Log().Errorf(ctx, "BaseUserTag 异常", e)
+	//}
+	return
+	_, err := gcron.Add(gctx.New(), g.Cfg().MustGet(ctx, "runCron", "# 0 2 * * *").String(), func(ctx context.Context) {
+		runOnce(context.TODO())
+		if e := userTag.BaseUserTag(); e != nil {
+			g.Log().Errorf(ctx, "BaseUserTag 异常", e)
+		}
+	}, "userSign")
+	if err != nil {
+		panic(err)
+	}
+	select {}
 }
 
 func runOnce(ctx context.Context) {

+ 3 - 0
userSign/userAnalysis/analysisManager.go

@@ -17,6 +17,8 @@ type (
 		BinPhone, BindMail   map[BaseUserId]bool
 		Vip, Vip15, Vip30    map[BaseUserId]bool
 		Member, MemberExpire map[BaseUserId]bool
+
+		TestUser map[BaseUserId]bool
 	}
 	BaseUserId int64
 
@@ -79,6 +81,7 @@ func NewManager() *UserAnalysis {
 		Vip30:            map[BaseUserId]bool{},
 		Member:           map[BaseUserId]bool{},
 		MemberExpire:     map[BaseUserId]bool{},
+		TestUser:         map[BaseUserId]bool{},
 	}
 }
 

+ 8 - 0
userSign/userAnalysis/jobMgoUserRange.go

@@ -2,6 +2,7 @@ package userAnalysis
 
 import (
 	"context"
+	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"strings"
@@ -19,6 +20,7 @@ func (ua *UserAnalysis) GetMgoUserRes(ctx context.Context) ([]*AnalysisRes, erro
 			{Name: "超级订阅15天到期", Code: "vipExpire_15", Data: ua.Vip15},
 			{Name: "超级订阅30天到期", Code: "vipExpire_30", Data: ua.Vip30},
 			{Name: "大会员用户", Code: "member", Data: ua.Member},
+			{Name: "测试用户", Code: "testGroup", Data: ua.TestUser},
 			{Name: "曾购大会员用户", Code: "memberExpired", Data: ua.MemberExpire}},
 		nil
 }
@@ -48,6 +50,12 @@ func (ua *UserAnalysis) mgoUserRange(ctx context.Context) {
 		if len(s_phone) == 11 || len(s_m_phone) == 11 {
 			ua.BinPhone[base_user_id] = true
 		}
+		for _, p := range g.Cfg().MustGet(ctx, "testUserPhone").Strings() {
+			if (p == s_phone || p == s_m_phone) && p != "" {
+				fmt.Println(p, base_user_id)
+				ua.TestUser[base_user_id] = true
+			}
+		}
 		//绑定邮箱用户
 		if s_email != "" && strings.Contains(s_email, "@") {
 			ua.BindMail[base_user_id] = true