资源中台升级

compatible/compatible_test.go

@@ -3,6 +3,7 @@ package compatible
 import (
 	"log"
 	"testing"
+	"time"
 
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	. "app.yhyue.com/moapp/jybase/mysql"
@@ -45,16 +46,18 @@ func init() {
 }
 func TestSelect(t *testing.T) {
 	c := NewCompatible(mgo, baseService, mainMysql, middleground)
-	log.Println(c.Select("5d6378301c298a5aac7b5402", `{"s_phone":1,"i_vip_status":1,"i_member_status":1,"o_vipjy":1,"o_member_jy":1}`))
+	log.Println(c.Select("60067", `{"o_vipjy.a_items":1,"o_member_jy.a_items":1}`))
 }
 func TestUpdate(t *testing.T) {
 	c := NewCompatible(mgo, baseService, mainMysql, middleground)
-	log.Println(c.Update("935", map[string]interface{}{
-		"$inc": map[string]interface{}{
-			"test": 1,
-		},
-		"$set": map[string]interface{}{
-			"o_vipjy.test": 1,
-		},
+	saveData := map[string]interface{}{}
+	saveData["o_member_jy.a_items.0.s_item"] = "未分类"
+	saveData["o_member_jy.a_items.0.a_key.0.key"] = []string{"软件"}
+	saveData["o_member_jy.a_items.0.a_key.0.appendkey"] = []string{}
+	saveData["o_member_jy.a_items.0.a_key.0.notkey"] = []string{}
+	saveData["o_member_jy.a_items.0.a_key.0.matchway"] = 1
+	saveData["o_member_jy.a_items.0.a_key.0.updatetime"] = time.Now().Unix()
+	log.Println(c.Update("60067", map[string]interface{}{
+		"$set": saveData,
 	}))
 }

go.mod

@@ -7,7 +7,7 @@ require (
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230209051900-1e7dcb8f83b7
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230207054315-b05f3dd4c4d3
-	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.4
+	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7
 	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba
 	github.com/nsqio/go-nsq v1.1.0
 	github.com/robfig/cron v1.2.0

go.sum

@@ -27,8 +27,9 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419023723-0b32d4a41
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419063004-233fc7ce006c/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220420075831-0b59892e9982/go.mod h1:wsHNO91h37H+xE4ZNny0yd7mtpODeDJxbVYhIRMR+qw=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.3/go.mod h1:Z353aucNO5hH4ZYjeKST3kE1PN3W8/uPc4J8s0Upz40=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.4 h1:LXD8woSkDDtqCQ19S9TGvx7GVir300nGszoIidBTlGM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.4/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 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=

middleground/resourcecenter.go

@@ -37,15 +37,18 @@ func (r *resourceCenter) newClient() zrpc.Client {
 }
 
 //
-func (r *resourceCenter) Haspowers(userId int64) *pb.HaspowersResp {
+func (r *resourceCenter) Haspowers(accountId, entAccountId, entId, entUserId int64) *pb.HaspowersResp {
 	client := r.newClient()
 	if client == nil {
 		return nil
 	}
 	defer client.Conn().Close()
 	resp, err := resource.NewResource(client).Haspowers(context.Background(), &pb.HaspowersReq{
-		Appid:  "10000",
-		UserId: userId,
+		Appid:        "10000",
+		AccountId:    accountId,
+		EntAccountId: entAccountId,
+		EntId:        entId,
+		EntUserId:    entUserId,
 	})
 	if err != nil {
 		log.Println(err)