修改

jyBXBase/api/logs/access.log

@@ -27,3 +27,15 @@
 {"@timestamp":"2022-10-12T15:42:57.734+08:00","level":"info","duration":"13.3ms","content":"[HTTP] POST - 200 - /jybx/base/included - 127.0.0.1:55934 - PostmanRuntime/7.26.8","trace":"90f2eea92ebefd97a4f729a17c91beee","span":"b1983d71c917a998"}
 {"@timestamp":"2022-10-12T17:11:57.412+08:00","level":"info","duration":"12.9ms","content":"[HTTP] POST - 200 - /jybx/base/included - 127.0.0.1:55934 - PostmanRuntime/7.26.8","trace":"7f2f93494b914f2d8baab86b240f952e","span":"e3668b9468cf2d21"}
 {"@timestamp":"2022-10-12T17:13:36.047+08:00","level":"info","duration":"10.7ms","content":"[HTTP] POST - 200 - /jybx/base/included - 127.0.0.1:55934 - PostmanRuntime/7.26.8","trace":"27d8b28aef5acee0a3a1ceb6050e7771","span":"12caf523988bf255"}
+{"@timestamp":"2022-12-08T16:53:55.415+08:00","level":"info","content":"info--日志记录"}
+{"@timestamp":"2022-12-08T16:53:55.415+08:00","level":"info","content":"error--日志记录"}
+{"@timestamp":"2022-12-08T16:53:55.415+08:00","level":"info","content":"--初始化 mongodb log--"}
+{"@timestamp":"2022-12-08T16:53:55.416+08:00","level":"info","content":"Starting pprof agent at 0.0.0.0:6060"}
+{"@timestamp":"2022-12-08T16:54:26.465+08:00","level":"info","content":"info--日志记录"}
+{"@timestamp":"2022-12-08T16:54:26.465+08:00","level":"info","content":"error--日志记录"}
+{"@timestamp":"2022-12-08T16:54:26.466+08:00","level":"info","content":"--初始化 mongodb log--"}
+{"@timestamp":"2022-12-08T16:54:26.467+08:00","level":"info","content":"Starting pprof agent at 0.0.0.0:6060"}
+{"@timestamp":"2022-12-09T15:50:36.735+08:00","level":"info","content":"info--日志记录"}
+{"@timestamp":"2022-12-09T15:50:36.735+08:00","level":"info","content":"error--日志记录"}
+{"@timestamp":"2022-12-09T15:50:36.735+08:00","level":"info","content":"--初始化 mongodb log--"}
+{"@timestamp":"2022-12-09T15:50:36.736+08:00","level":"info","content":"Starting pprof agent at 0.0.0.0:6060"}

jyBXBase/api/logs/error.log

@@ -0,0 +1 @@
+{"@timestamp":"2022-12-09T15:50:36.763+08:00","level":"error","content":"discovbuilder.go:34 bad resolver state"}

jyBXBase/rpc/internal/logic/newestbiddinglogic_test.go

@@ -1,123 +1,124 @@
 package logic
 
 import (
-      elastic "app.yhyue.com/moapp/jybase/esv1"
-      "app.yhyue.com/moapp/jybase/mongodb"
-      "app.yhyue.com/moapp/jybase/mysql"
-      "app.yhyue.com/moapp/jybase/redis"
-      "context"
-      "github.com/zeromicro/go-zero/core/logx"
-      "jyBXBase/entity"
-      "jyBXBase/rpc/bxbase"
-      IC "jyBXBase/rpc/init"
-      "jyBXBase/rpc/internal/config"
-      "jyBXBase/rpc/internal/svc"
-      "reflect"
-      "strings"
-      "testing"
+        elastic "app.yhyue.com/moapp/jybase/esv1"
+        "app.yhyue.com/moapp/jybase/mongodb"
+        "app.yhyue.com/moapp/jybase/mysql"
+        "app.yhyue.com/moapp/jybase/redis"
+        "context"
+        "github.com/zeromicro/go-zero/core/logx"
+        "jyBXBase/entity"
+        "jyBXBase/rpc/bxbase"
+        IC "jyBXBase/rpc/init"
+        "jyBXBase/rpc/internal/config"
+        "jyBXBase/rpc/internal/svc"
+        "reflect"
+        "strings"
+        "testing"
 )
+
 func init() {
 
-      logx.Info("--初始化 mongodb--")
-      IC.Mgo = mongodb.MongodbSim{
-	  MongodbAddr: "192.168.3.206:27080",
-	  Size:        5,
-	  DbName:      "qfw",
-      }
-      IC.Mgo.InitPool()
-      IC.DB = config.Db{Mongo: entity.Mongo{
-	  Bidding: &entity.MongoStruct{
-	        Collection:     "bidding",
-	        CollectionBack: "bidding_back",
-	  },
-      }}
-      IC.DB.Mongo.Bidding.Collection = "bidding_back"
-      //
-      logx.Info("--初始化 mongodb bidding--")
-      IC.MgoBidding = mongodb.MongodbSim{
-	  MongodbAddr: "192.168.3.206:27001",
-	  Size:        5,
-	  DbName:      "qfw_data",
-	  UserName:    "jyDevGroup",
-	  Password:    "jy@DevGroup",
-      }
-      IC.MgoBidding.InitPool()
+        logx.Info("--初始化 mongodb--")
+        IC.Mgo = mongodb.MongodbSim{
+	      MongodbAddr: "192.168.3.206:27080",
+	      Size:        5,
+	      DbName:      "qfw",
+        }
+        IC.Mgo.InitPool()
+        IC.DB = config.Db{Mongo: entity.Mongo{
+	      Bidding: &entity.MongoStruct{
+		    Collection:     "bidding",
+		    CollectionBack: "bidding_back",
+	      },
+        }}
+        IC.DB.Mongo.Bidding.Collection = "bidding_back"
+        //
+        logx.Info("--初始化 mongodb bidding--")
+        IC.MgoBidding = mongodb.MongodbSim{
+	      MongodbAddr: "192.168.3.206:27001",
+	      Size:        5,
+	      DbName:      "qfw_data",
+	      UserName:    "jyDevGroup",
+	      Password:    "jy@DevGroup",
+        }
+        IC.MgoBidding.InitPool()
 
-      logx.Info("--初始化 mysql--")
-      IC.MainMysql = &mysql.Mysql{
-	  Address:      "192.168.3.11:3366",
-	  UserName:     "root",
-	  PassWord:     "Topnet123",
-	  DBName:       "jianyu",
-	  MaxOpenConns: 5,
-	  MaxIdleConns: 5,
-      }
-      IC.MainMysql.Init()
+        logx.Info("--初始化 mysql--")
+        IC.MainMysql = &mysql.Mysql{
+	      Address:      "192.168.3.11:3366",
+	      UserName:     "root",
+	      PassWord:     "Topnet123",
+	      DBName:       "jianyu",
+	      MaxOpenConns: 5,
+	      MaxIdleConns: 5,
+        }
+        IC.MainMysql.Init()
 
-      //初始化 mysql-EntnichePush
-      logx.Info("--初始化 商机管理推送 mysql--")
-      IC.BaseServiceMysql = &mysql.Mysql{
-	  Address:      "192.168.3.217:4000",
-	  UserName:     "root",
-	  PassWord:     "=PDT49#80Z!RVv52_z",
-	  DBName:       "base_service",
-	  MaxOpenConns: 5,
-	  MaxIdleConns: 5,
-      }
-      IC.BaseServiceMysql.Init()
+        //初始化 mysql-EntnichePush
+        logx.Info("--初始化 商机管理推送 mysql--")
+        IC.BaseServiceMysql = &mysql.Mysql{
+	      Address:      "192.168.3.217:4000",
+	      UserName:     "root",
+	      PassWord:     "=PDT49#80Z!RVv52_z",
+	      DBName:       "base_service",
+	      MaxOpenConns: 5,
+	      MaxIdleConns: 5,
+        }
+        IC.BaseServiceMysql.Init()
 
-      logx.Info("--初始化 redis--")
-      redis.InitRedisBySize(strings.Join([]string{"other=192.168.3.206:1712", "push=192.168.3.206:1712", "pushcache_1=192.168.3.206:5000", "pushcache_2_a=192.168.3.206:5001", "pushcache_2_b=192.168.3.206:5002"}, ","), 100, 30, 300)
-      //初始化 elasticsearch
-      logx.Info("--初始化 elasticsearch--")
-      elastic.InitElasticSize("http://192.168.3.206:9800", 5)
+        logx.Info("--初始化 redis--")
+        redis.InitRedisBySize(strings.Join([]string{"other=192.168.3.206:1712", "push=192.168.3.206:1712", "pushcache_1=192.168.3.206:5000", "pushcache_2_a=192.168.3.206:5001", "pushcache_2_b=192.168.3.206:5002"}, ","), 100, 30, 300)
+        //初始化 elasticsearch
+        logx.Info("--初始化 elasticsearch--")
+        elastic.InitElasticSize("http://192.168.3.206:9800", 5)
 }
 
-
 func TestNewestBiddingLogic_NewestBidding(t *testing.T) {
-      type fields struct {
-	  ctx    context.Context
-	  svcCtx *svc.ServiceContext
-	  Logger logx.Logger
-      }
-      type args struct {
-	  in *bxbase.NewestBiddingReq
-      }
-      tests := []struct {
-	  name    string
-	  fields  fields
-	  args    args
-	  want    *bxbase.NewsetBiddingResp
-	  wantErr bool
-      }{
-	  // TODO: Add test cases.
-            {name: "app首页数据",
-                  args: args{
-                  in: &bxbase.NewestBiddingReq{
-		    City: "",
-		    IsSearch:  0,
-		    UserId:    "5e8eb60ae138234b4f91aacf",
-		    AppId:     "10000",
-		    EntUserId: "",
-		    NewUserId: 11111,
-	        },
-	        }},
-      }
-      for _, tt := range tests {
-	  t.Run(tt.name, func(t *testing.T) {
-	        l := &NewestBiddingLogic{
-		    ctx:    tt.fields.ctx,
-		    svcCtx: tt.fields.svcCtx,
-		    Logger: tt.fields.Logger,
-	        }
-	        got, err := l.NewestBidding(tt.args.in)
-	        if (err != nil) != tt.wantErr {
-		    t.Errorf("NewestBidding() error = %v, wantErr %v", err, tt.wantErr)
-		    return
-	        }
-	        if !reflect.DeepEqual(got, tt.want) {
-		    t.Errorf("NewestBidding() got = %v, want %v", got, tt.want)
-	        }
-	  })
-      }
-}
+        type fields struct {
+	      ctx    context.Context
+	      svcCtx *svc.ServiceContext
+	      Logger logx.Logger
+        }
+        type args struct {
+	      in *bxbase.NewestBiddingReq
+        }
+        tests := []struct {
+	      name    string
+	      fields  fields
+	      args    args
+	      want    *bxbase.NewsetBiddingResp
+	      wantErr bool
+        }{
+	      // TODO: Add test cases.
+	      {name: "app首页数据",
+		    args: args{
+			  in: &bxbase.NewestBiddingReq{
+				City:      "",
+				IsSearch:  0,
+				UserId:    "5e8eb60ae138234b4f91aacf",
+				AppId:     "10000",
+				EntUserId: "4530",
+				NewUserId: 11111,
+				EntId:     "15232",
+			  },
+		    }},
+        }
+        for _, tt := range tests {
+	      t.Run(tt.name, func(t *testing.T) {
+		    l := &NewestBiddingLogic{
+			  ctx:    tt.fields.ctx,
+			  svcCtx: tt.fields.svcCtx,
+			  Logger: tt.fields.Logger,
+		    }
+		    got, err := l.NewestBidding(tt.args.in)
+		    if (err != nil) != tt.wantErr {
+			  t.Errorf("NewestBidding() error = %v, wantErr %v", err, tt.wantErr)
+			  return
+		    }
+		    if !reflect.DeepEqual(got, tt.want) {
+			  t.Errorf("NewestBidding() got = %v, want %v", got, tt.want)
+		    }
+	      })
+        }
+}

jyBXBase/rpc/logs/access.log

@@ -72,3 +72,36 @@
 {"@timestamp":"2022-10-12T17:21:14.924+08:00","level":"info","content":"info--日志记录"}
 {"@timestamp":"2022-10-12T17:21:14.925+08:00","level":"info","content":"error--日志记录"}
 {"@timestamp":"2022-10-12T17:21:40.964+08:00","level":"info","duration":"1.9ms","content":"127.0.0.1:59291 - /bxcol.bxbase/Included - {\"AppId\":\"10000\"}","trace":"a63570a4bc03f94425a0a317e2db1613","span":"b79fdb0e3c574a01"}
+{"@timestamp":"2022-12-08T16:52:45.677+08:00","level":"info","content":"info--日志记录"}
+{"@timestamp":"2022-12-08T16:52:45.677+08:00","level":"info","content":"error--日志记录"}
+{"@timestamp":"2022-12-08T16:52:45.678+08:00","level":"info","content":"--初始化 mongodb--"}
+{"@timestamp":"2022-12-08T16:52:45.678+08:00","level":"info","content":"--初始化 mongodb bidding--"}
+{"@timestamp":"2022-12-08T16:52:45.678+08:00","level":"info","content":"--初始化 mongodb ent--"}
+{"@timestamp":"2022-12-08T16:52:45.678+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:52:45.697+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:52:45.704+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:52:45.712+08:00","level":"info","content":"--初始化 BaseServiceMysql tidb--"}
+{"@timestamp":"2022-12-08T16:52:45.718+08:00","level":"info","content":"--初始化 redis--"}
+{"@timestamp":"2022-12-08T16:52:45.718+08:00","level":"info","content":"--初始化 elasticsearch--"}
+{"@timestamp":"2022-12-08T16:52:52.638+08:00","level":"info","content":"info--日志记录"}
+{"@timestamp":"2022-12-08T16:52:52.638+08:00","level":"info","content":"error--日志记录"}
+{"@timestamp":"2022-12-08T16:52:52.639+08:00","level":"info","content":"--初始化 mongodb--"}
+{"@timestamp":"2022-12-08T16:52:52.639+08:00","level":"info","content":"--初始化 mongodb bidding--"}
+{"@timestamp":"2022-12-08T16:52:52.640+08:00","level":"info","content":"--初始化 mongodb ent--"}
+{"@timestamp":"2022-12-08T16:52:52.640+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:52:52.648+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:52:52.658+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:52:52.666+08:00","level":"info","content":"--初始化 BaseServiceMysql tidb--"}
+{"@timestamp":"2022-12-08T16:52:52.676+08:00","level":"info","content":"--初始化 redis--"}
+{"@timestamp":"2022-12-08T16:52:52.676+08:00","level":"info","content":"--初始化 elasticsearch--"}
+{"@timestamp":"2022-12-08T16:54:31.719+08:00","level":"info","content":"info--日志记录"}
+{"@timestamp":"2022-12-08T16:54:31.719+08:00","level":"info","content":"error--日志记录"}
+{"@timestamp":"2022-12-08T16:54:31.720+08:00","level":"info","content":"--初始化 mongodb--"}
+{"@timestamp":"2022-12-08T16:54:31.720+08:00","level":"info","content":"--初始化 mongodb bidding--"}
+{"@timestamp":"2022-12-08T16:54:31.721+08:00","level":"info","content":"--初始化 mongodb ent--"}
+{"@timestamp":"2022-12-08T16:54:31.721+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:54:31.735+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:54:31.741+08:00","level":"info","content":"--初始化 main mysql--"}
+{"@timestamp":"2022-12-08T16:54:31.749+08:00","level":"info","content":"--初始化 BaseServiceMysql tidb--"}
+{"@timestamp":"2022-12-08T16:54:31.759+08:00","level":"info","content":"--初始化 redis--"}
+{"@timestamp":"2022-12-08T16:54:31.759+08:00","level":"info","content":"--初始化 elasticsearch--"}

jyBXBase/rpc/logs/error.log

@@ -0,0 +1 @@
+{"@timestamp":"2022-12-08T16:52:52.711+08:00","level":"error","content":"server.go:90 listen tcp 127.0.0.1:8005: bind: Only one usage of each socket address (protocol/network address/port) is normally permitted."}

jyBXBase/rpc/logs/stat.log

@@ -0,0 +1,96 @@
+{"@timestamp":"2022-12-08T16:53:45.669+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.3Mi, TotalAlloc=8.0Mi, Sys=18.5Mi, NumGC=4"}
+{"@timestamp":"2022-12-08T16:53:45.750+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T16:55:31.707+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.3Mi, TotalAlloc=8.1Mi, Sys=18.3Mi, NumGC=4"}
+{"@timestamp":"2022-12-08T16:55:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T16:56:31.706+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=9.1Mi, Sys=22.4Mi, NumGC=4"}
+{"@timestamp":"2022-12-08T16:56:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T16:57:31.701+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.4Mi, TotalAlloc=9.7Mi, Sys=22.4Mi, NumGC=5"}
+{"@timestamp":"2022-12-08T16:57:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T16:58:31.709+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=10.6Mi, Sys=22.4Mi, NumGC=5"}
+{"@timestamp":"2022-12-08T16:58:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T16:59:31.700+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.4Mi, TotalAlloc=11.4Mi, Sys=22.4Mi, NumGC=6"}
+{"@timestamp":"2022-12-08T16:59:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:00:31.710+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=12.2Mi, Sys=22.4Mi, NumGC=6"}
+{"@timestamp":"2022-12-08T17:00:31.805+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:01:31.710+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.4Mi, TotalAlloc=12.9Mi, Sys=22.4Mi, NumGC=7"}
+{"@timestamp":"2022-12-08T17:01:31.804+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:02:31.707+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.1Mi, TotalAlloc=13.6Mi, Sys=22.4Mi, NumGC=7"}
+{"@timestamp":"2022-12-08T17:02:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:03:31.713+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.4Mi, TotalAlloc=14.3Mi, Sys=22.4Mi, NumGC=8"}
+{"@timestamp":"2022-12-08T17:03:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:04:31.707+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=15.0Mi, Sys=22.4Mi, NumGC=8"}
+{"@timestamp":"2022-12-08T17:04:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:05:31.706+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.4Mi, TotalAlloc=15.8Mi, Sys=22.4Mi, NumGC=9"}
+{"@timestamp":"2022-12-08T17:05:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:06:31.704+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.1Mi, TotalAlloc=16.5Mi, Sys=22.4Mi, NumGC=9"}
+{"@timestamp":"2022-12-08T17:06:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:07:31.700+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=17.2Mi, Sys=22.4Mi, NumGC=10"}
+{"@timestamp":"2022-12-08T17:07:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:08:31.705+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=18.0Mi, Sys=22.4Mi, NumGC=10"}
+{"@timestamp":"2022-12-08T17:08:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:09:31.708+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=18.8Mi, Sys=22.4Mi, NumGC=11"}
+{"@timestamp":"2022-12-08T17:09:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:10:31.704+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=19.5Mi, Sys=22.4Mi, NumGC=11"}
+{"@timestamp":"2022-12-08T17:10:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:11:31.712+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=20.3Mi, Sys=22.4Mi, NumGC=12"}
+{"@timestamp":"2022-12-08T17:11:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:12:31.705+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=21.1Mi, Sys=22.4Mi, NumGC=12"}
+{"@timestamp":"2022-12-08T17:12:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:13:31.699+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=21.9Mi, Sys=22.4Mi, NumGC=13"}
+{"@timestamp":"2022-12-08T17:13:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:14:31.708+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=22.7Mi, Sys=22.4Mi, NumGC=13"}
+{"@timestamp":"2022-12-08T17:14:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:15:31.706+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=23.4Mi, Sys=22.4Mi, NumGC=14"}
+{"@timestamp":"2022-12-08T17:15:31.799+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:16:31.708+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.1Mi, TotalAlloc=24.0Mi, Sys=22.4Mi, NumGC=14"}
+{"@timestamp":"2022-12-08T17:16:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:17:31.704+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=24.8Mi, Sys=22.4Mi, NumGC=15"}
+{"@timestamp":"2022-12-08T17:17:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:18:31.704+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=25.6Mi, Sys=22.4Mi, NumGC=15"}
+{"@timestamp":"2022-12-08T17:18:31.796+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:19:31.705+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=26.4Mi, Sys=22.4Mi, NumGC=16"}
+{"@timestamp":"2022-12-08T17:19:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:20:31.712+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=27.1Mi, Sys=22.4Mi, NumGC=16"}
+{"@timestamp":"2022-12-08T17:20:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:21:31.708+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=27.9Mi, Sys=22.4Mi, NumGC=17"}
+{"@timestamp":"2022-12-08T17:21:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:22:31.705+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=28.6Mi, Sys=22.4Mi, NumGC=17"}
+{"@timestamp":"2022-12-08T17:22:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:23:31.707+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=29.4Mi, Sys=22.4Mi, NumGC=18"}
+{"@timestamp":"2022-12-08T17:23:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:24:31.701+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=30.1Mi, Sys=22.4Mi, NumGC=18"}
+{"@timestamp":"2022-12-08T17:24:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:25:31.703+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=30.9Mi, Sys=22.4Mi, NumGC=19"}
+{"@timestamp":"2022-12-08T17:25:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:26:31.703+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=31.7Mi, Sys=22.4Mi, NumGC=19"}
+{"@timestamp":"2022-12-08T17:26:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:27:31.701+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=32.5Mi, Sys=22.4Mi, NumGC=20"}
+{"@timestamp":"2022-12-08T17:27:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:28:31.702+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=33.2Mi, Sys=22.4Mi, NumGC=20"}
+{"@timestamp":"2022-12-08T17:28:31.792+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:29:31.711+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=34.0Mi, Sys=22.4Mi, NumGC=21"}
+{"@timestamp":"2022-12-08T17:29:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:30:31.710+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=34.8Mi, Sys=22.4Mi, NumGC=21"}
+{"@timestamp":"2022-12-08T17:30:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:31:31.708+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=35.6Mi, Sys=22.4Mi, NumGC=22"}
+{"@timestamp":"2022-12-08T17:31:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:32:31.704+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=36.3Mi, Sys=22.4Mi, NumGC=22"}
+{"@timestamp":"2022-12-08T17:32:31.799+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:33:31.710+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=36.9Mi, Sys=22.4Mi, NumGC=23"}
+{"@timestamp":"2022-12-08T17:33:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:34:31.707+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=37.7Mi, Sys=22.4Mi, NumGC=23"}
+{"@timestamp":"2022-12-08T17:34:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:35:31.711+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.5Mi, TotalAlloc=38.4Mi, Sys=22.4Mi, NumGC=24"}
+{"@timestamp":"2022-12-08T17:35:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:36:31.702+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=39.2Mi, Sys=22.4Mi, NumGC=24"}
+{"@timestamp":"2022-12-08T17:36:31.791+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:37:31.711+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.6Mi, TotalAlloc=40.0Mi, Sys=22.4Mi, NumGC=25"}
+{"@timestamp":"2022-12-08T17:37:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:38:31.701+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=40.7Mi, Sys=22.4Mi, NumGC=25"}
+{"@timestamp":"2022-12-08T17:38:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:39:31.709+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.6Mi, TotalAlloc=41.6Mi, Sys=22.4Mi, NumGC=26"}
+{"@timestamp":"2022-12-08T17:39:31.802+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:40:31.701+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=42.3Mi, Sys=22.4Mi, NumGC=26"}
+{"@timestamp":"2022-12-08T17:40:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}
+{"@timestamp":"2022-12-08T17:41:31.711+08:00","level":"stat","content":"CPU: 0m, MEMORY: Alloc=4.6Mi, TotalAlloc=43.1Mi, Sys=22.4Mi, NumGC=27"}
+{"@timestamp":"2022-12-08T17:41:31.790+08:00","level":"stat","content":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0"}

jyBXSubscribe/rpc/internal/logic/getkeylogic_test.go

@@ -30,15 +30,15 @@ func TestGetKeyLogic_GetKey(t *testing.T) {
 			name: "超级订阅获取",
 			args: args{
 				in: &bxsubscribe.GetKeyReq{
-					UserType:  "mType",
-					UserId:    "61e675d6f24e3943c7d21b04",
-					EntId:     "14640",
-					AppId:     "10000",
-					EntUserId: "3662",
-					NewUserId: 73044,
-					UserPower: 1,
-					DeptId:    "3816",
-					IsEnt:     false,
+					UserType:    "eType",
+					UserId:      "63537f6928a125cdb8a36071",
+					EntId:       "14640",
+					AppId:       "10000",
+					EntUserId:   "4962",
+					NewUserId:   185483,
+					UserPower:   1,
+					MemberPower: 1,
+					IsEnt:       true,
 				},
 			},
 		},

jyBXSubscribe/rpc/model/push.go

@@ -1568,7 +1568,6 @@ func (s *subscribePush) Keys(spqp *KeyParam) (result []*bxsubscribe.KeyItems) {
 	} else {
 		//企业关键词查找
 		res_, _ := IC.Mgo.Find("entniche_rule", map[string]interface{}{
-			"i_deptid": map[string]interface{}{"$exists": true},
 			"i_userid": map[string]interface{}{
 				"$exists": false,
 			},