更新go mod

src/config.json

@@ -383,9 +383,5 @@
     "expurasingtime": true,
     "winnerMap": true
   },
-  "keywordsLimitNologin": 25,
-  "etcd": {
-    "hosts": "192.168.3.206:27080",
-    "key": "powercheck.rpc"
-  }
+  "keywordsLimitNologin": 25
 }

src/config.yaml

@@ -1,4 +1,5 @@
 etcd:
   hosts:
   - 127.0.0.1:2379
-userCenterKey: "usercenter.rpc" #用户中台rpc
+userCenterKey: "usercenter.rpc" #用户中台rpc
+powerCheckCenterKey: "powercheck.rpc" #权益校验中台

src/go.mod

@@ -4,8 +4,8 @@ go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8
-	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1
+	app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3
+	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/dchest/captcha v1.0.0
 	github.com/fsnotify/fsnotify v1.6.0

src/go.sum

@@ -13,8 +13,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tc
 app.yhyue.com/moapp/jybase v0.0.0-20230109015757-aa3d5e19b196/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8 h1:bpCxm9zroB4vy4IF2PAlD+iIPc+GwC1YMquORPBWuLI=
-app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8/go.mod h1:MqJfBFTSfZhrNDEnE4e19BmaLkaMr+lYActLXm6lrpw=
+app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3 h1:8JwEPCjpV+4XysYMfNnRDVR11MGmtWQsHvx1aHfsDN4=
+app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3/go.mod h1:NrRgv24VIpf/xMMvsGC1EgoD+z6z5ea3MqIVxEcSPhE=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -31,8 +31,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.4/go.mod h1:rRiGzKG4F/fmkN
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220905055615-8540037e1b06/go.mod h1:LS21iwbgP8i3ZHJ1n4yNpLXQ/nzEudUOk0klC6VM2dQ=
-bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1 h1:LH/gm2iRShZ64FEuF7LTzF62iJhOVVD9AxGVHFd0ORI=
-bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1/go.mod h1:m7/aZ1r1FapNT2h3gqmCFVb0EV+CaJaNKNPHMzLHx8Y=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba h1:WATZdho/2XJ8DP3EuaSo10WiFrXRgxeLpmYoGEcSdMw=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba/go.mod h1:m7/aZ1r1FapNT2h3gqmCFVb0EV+CaJaNKNPHMzLHx8Y=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

src/jfw/config/config.go

@@ -21,8 +21,6 @@ var (
 	GmailAuth            []*mail.GmailAuth
 	EntnichePcConf       *entnichePcConf
 	Middleground         *middleground.Middleground
-	EtcdHost             []string
-	PowerCheckKey        string
 )
 
 type ResourceApiConfig struct {
@@ -68,7 +66,5 @@ func init() {
 	}
 	ResourceApi.HasPowers = resourceCenter + util.ObjToString(resourceCenterUrl["haspowers"])
 	var ctx = gctx.New()
-	EtcdHost = g.Cfg().MustGet(ctx, "etcd.hosts").Strings()
-	PowerCheckKey = g.Cfg().MustGet(ctx, "powerCheckKey").String()
-	Middleground = middleground.NewMiddleground(EtcdHost, g.Cfg().MustGet(ctx, "userCenterKey").String())
+	Middleground = middleground.NewMiddleground(g.Cfg().MustGet(ctx, "etcd.hosts").Strings()).RegUserCenter(g.Cfg().MustGet(ctx, "userCenterKey").String()).RegPowerCheckCenter(g.Cfg().MustGet(ctx, "powerCheckKey").String())
 }

src/jfw/modules/app/src/config.json

@@ -168,9 +168,5 @@
   "searchTypeSwitch": true,
   "baseUserFilterFlag": true,
   "userCenterApi": "https://web-zxl.jydev.jianyu360.com",
-  "freeProjectFocus": 10,
-  "etcd": {
-    "hosts": "192.168.3.206:27080",
-    "key": "powercheck.rpc"
-  }
+  "freeProjectFocus": 10
 }

src/jfw/modules/app/src/config.yaml

@@ -1,4 +1,5 @@
 etcd:
   hosts:
   - 127.0.0.1:2379
-userCenterKey: "usercenter.rpc" #用户中台rpc
+userCenterKey: "usercenter.rpc" #用户中台rpc
+powerCheckCenterKey: "powercheck.rpc" #权益校验中台

src/jfw/modules/app/src/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8
+	app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3
 	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/dchest/captcha v1.0.0

src/jfw/modules/app/src/go.sum

@@ -13,8 +13,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tc
 app.yhyue.com/moapp/jybase v0.0.0-20230109015757-aa3d5e19b196/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8 h1:bpCxm9zroB4vy4IF2PAlD+iIPc+GwC1YMquORPBWuLI=
-app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8/go.mod h1:MqJfBFTSfZhrNDEnE4e19BmaLkaMr+lYActLXm6lrpw=
+app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3 h1:8JwEPCjpV+4XysYMfNnRDVR11MGmtWQsHvx1aHfsDN4=
+app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3/go.mod h1:NrRgv24VIpf/xMMvsGC1EgoD+z6z5ea3MqIVxEcSPhE=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

src/jfw/modules/app/src/jfw/config/config.go

@@ -39,5 +39,5 @@ func init() {
 		GmailAuth = append(GmailAuth, mailConf)
 	}
 	var ctx = gctx.New()
-	Middleground = middleground.NewMiddleground(g.Cfg().MustGet(ctx, "etcd.hosts").Strings(), g.Cfg().MustGet(ctx, "userCenterKey").String())
+	Middleground = middleground.NewMiddleground(g.Cfg().MustGet(ctx, "etcd.hosts").Strings()).RegUserCenter(g.Cfg().MustGet(ctx, "userCenterKey").String()).RegPowerCheckCenter(g.Cfg().MustGet(ctx, "powerCheckKey").String())
 }

src/jfw/modules/publicapply/src/config.json

@@ -54,9 +54,5 @@
   },
   "tipInfo": {
     "box_moving": 1670774400
-  },
-  "etcd": {
-    "hosts": "192.168.3.206:27080",
-    "key": "powercheck.rpc"
   }
 }

src/jfw/modules/publicapply/src/config.yaml

@@ -1,4 +1,5 @@
 etcd:
   hosts:
   - 127.0.0.1:2379
-userCenterKey: "usercenter.rpc" #用户中台rpc
+userCenterKey: "usercenter.rpc" #用户中台rpc
+powerCheckCenterKey: "powercheck.rpc" #权益校验中台

src/jfw/modules/publicapply/src/config/config.go

@@ -32,10 +32,6 @@ type config struct {
 	}
 	ExhibitionLog string
 	TipInfo       map[string]int64
-	Etcd          struct {
-		Hosts string `json:"hosts"`
-		Key   string `json:"key"`
-	} `json:"etcd"`
 }
 type BidColl struct {
 	PayUserCollLimit      int    //付费用户收藏数量最大限制
@@ -79,5 +75,5 @@ func init() {
 	qutil.ReadConfig("./adLeague.json", &AdLeaguefig)
 	qutil.ReadConfig("./shareFission.json", &ShareConfig)
 	var ctx = gctx.New()
-	Middleground = middleground.NewMiddleground(g.Cfg().MustGet(ctx, "etcd.hosts").Strings(), g.Cfg().MustGet(ctx, "userCenterKey").String())
+	Middleground = middleground.NewMiddleground(g.Cfg().MustGet(ctx, "etcd.hosts").Strings()).RegUserCenter(g.Cfg().MustGet(ctx, "userCenterKey").String()).RegPowerCheckCenter(g.Cfg().MustGet(ctx, "powerCheckKey").String())
 }

src/jfw/modules/publicapply/src/go.mod

@@ -4,8 +4,8 @@ go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8
-	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1
+	app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3
+	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.0.6
 	github.com/zeromicro/go-zero v1.4.4

src/jfw/modules/publicapply/src/go.sum

@@ -13,8 +13,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tc
 app.yhyue.com/moapp/jybase v0.0.0-20230109015757-aa3d5e19b196/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8 h1:bpCxm9zroB4vy4IF2PAlD+iIPc+GwC1YMquORPBWuLI=
-app.yhyue.com/moapp/jypkg v0.0.0-20230131023215-ca51808c57b8/go.mod h1:MqJfBFTSfZhrNDEnE4e19BmaLkaMr+lYActLXm6lrpw=
+app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3 h1:8JwEPCjpV+4XysYMfNnRDVR11MGmtWQsHvx1aHfsDN4=
+app.yhyue.com/moapp/jypkg v0.0.0-20230202083520-858975e007e3/go.mod h1:NrRgv24VIpf/xMMvsGC1EgoD+z6z5ea3MqIVxEcSPhE=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -31,8 +31,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.4/go.mod h1:rRiGzKG4F/fmkN
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220905055615-8540037e1b06/go.mod h1:LS21iwbgP8i3ZHJ1n4yNpLXQ/nzEudUOk0klC6VM2dQ=
-bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1 h1:LH/gm2iRShZ64FEuF7LTzF62iJhOVVD9AxGVHFd0ORI=
-bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1/go.mod h1:m7/aZ1r1FapNT2h3gqmCFVb0EV+CaJaNKNPHMzLHx8Y=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba h1:WATZdho/2XJ8DP3EuaSo10WiFrXRgxeLpmYoGEcSdMw=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba/go.mod h1:m7/aZ1r1FapNT2h3gqmCFVb0EV+CaJaNKNPHMzLHx8Y=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=