Merge remote-tracking branch 'origin/ver3' into ver3

config/config.yaml

@@ -98,7 +98,7 @@ object:
     externalId:
     roleSessionName:
 
-rpcPort:                              #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如 openImUserPort: [10110, 10111]
+rpcPort:                              #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如  [10110, 10111]
   openImUserPort: [ 10110 ]
   openImFriendPort: [ 10120 ]
   openImMessagePort: [ 10130 ]

internal/api/route.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw"
@@ -27,6 +28,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	}
 	log.ZInfo(context.Background(), "load config", "config", config.Config)
 	r.Use(gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID())
+	u := NewUserApi(discov)
 	if config.Config.Prometheus.Enable {
 		prome.NewApiRequestCounter()
 		prome.NewApiRequestFailedCounter()
@@ -36,7 +38,6 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	}
 	userRouterGroup := r.Group("/user")
 	{
-		u := NewUserApi(discov)
 		userRouterGroupChild := mw.NewRouterGroup(userRouterGroup, "")
 		userRouterGroupChildToken := mw.NewRouterGroup(userRouterGroup, "", mw.WithGinParseToken(rdb))
 		userRouterGroupChild.POST("/user_register", u.UserRegister)
@@ -105,7 +106,6 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	authRouterGroup := r.Group("/auth")
 	{
 		a := NewAuthApi(discov)
-		u := NewUserApi(discov)
 		authRouterGroupChild := mw.NewRouterGroup(authRouterGroup, "")
 		authRouterGroupChildToken := mw.NewRouterGroup(authRouterGroup, "", mw.WithGinParseToken(rdb))
 		authRouterGroupChild.POST("/user_register", u.UserRegister)    //1
@@ -173,9 +173,9 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 
 	statisticsGroup := r.Group("/statistics")
 	{
-		s := NewStatisticsApi(discov)
+		// s := NewStatisticsApi(discov)
 		conversationGroup.Use(mw.GinParseToken(rdb))
-		statisticsGroup.POST("/user_register", s.UserRegister)
+		statisticsGroup.POST("/user_register", u.UserRegisterCount)
 	}
 	return r
 }

internal/api/user.go

@@ -57,3 +57,7 @@ func (u *UserApi) GetUsersOnlineStatus(c *gin.Context) {
 		return
 	}
 }
+
+func (s *UserApi) UserRegisterCount(c *gin.Context) {
+	a2r.Call(user.UserClient.UserRegisterCount, s.Client, c)
+}

pkg/discoveryregistry/zookeeper/resolver.go

@@ -2,6 +2,7 @@ package zookeeper
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
@@ -19,6 +20,7 @@ type Resolver struct {
 
 func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) {
 	log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/"))
+	fmt.Println("start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/"))
 	newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/"))
 	if err != nil {
 		log.ZError(context.Background(), "resolve now error", err, "target", r.target)
@@ -37,7 +39,7 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {}
 func (s *Resolver) Close() {}
 
 func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
-	//s.logger.Printf("build resolver: %+v, cc: %+v", "target", target, "cc", cc.UpdateState())
+	s.logger.Printf("build resolver: %+v, cc: %+v", target, cc.UpdateState)
 	log.ZDebug(context.Background(), "build resolver start", "target", target, "cc", cc.UpdateState)
 	r := &Resolver{}
 	r.target = target
@@ -48,7 +50,7 @@ func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts re
 	defer s.lock.Unlock()
 	serviceName := strings.TrimLeft(target.URL.Path, "/")
 	s.resolvers[serviceName] = r
-	s.logger.Printf("build resolver finished: %+v, cc: %+v, key: ", target, cc, serviceName)
+	s.logger.Printf("build resolver finished: %+v, cc: %+v, key: %s", target, cc.UpdateState, serviceName)
 	log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState, "serviceName", serviceName)
 	return r, nil
 }