Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

2025-05-01 15:18:59 +08:00 · 2022-09-14 18:33:18 +08:00 · 2022-09-14 18:33:18 +08:00 · aafbda47d4
commit aafbda47d4
parent e1b1af9a48 5ce0cf1aad
39 changed files with 181 additions and 71 deletions
--- a/cmd/open_im_api/main.go
+++ b/cmd/open_im_api/main.go
@ -46,7 +46,8 @@ func main() {
 	f, _ := os.Create("../logs/api.log")
 	gin.DefaultWriter = io.MultiWriter(f)
 	//	gin.SetMode(gin.DebugMode)
-	r := gin.Default()
+	r := gin.New()
+	r.Use(gin.Recovery())
 	r.Use(utils.CorsHandler())
 	log.Info("load config: ", config.Config)
 	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
@ -226,10 +227,10 @@ func main() {
 	if config.Config.Api.ListenIP != "" {
 		address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
 	}
-	address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
-	fmt.Println("start api server, address: ", address)
+	fmt.Println("start api server, address: ", address, "OpenIM version: ", constant.CurrentVersion, "\n")
 	err := r.Run(address)
 	if err != nil {
-		log.Error("", "api run failed ", *ginPort, err.Error())
+		log.Error("", "api run failed ", address, err.Error())
+		panic("api start failed " + err.Error())
 	}
 }
--- a/cmd/open_im_cms_api/main.go
+++ b/cmd/open_im_cms_api/main.go
@ -2,6 +2,7 @@ package main

 import (
 	"Open_IM/internal/cms_api"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/utils"
 	"flag"
 	"fmt"
@ -24,6 +25,6 @@ func main() {
 		address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
 	}
 	address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
-	fmt.Println("start cms api server, address: ", address)
+	fmt.Println("start cms api server, address: ", address, "OpenIM version: ", constant.CurrentVersion, "\n")
 	router.Run(address)
 }
--- a/cmd/open_im_demo/main.go
+++ b/cmd/open_im_demo/main.go
@ -71,7 +71,7 @@ func main() {
 		address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
 	}
 	address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
-	fmt.Println("start demo api server address: ", address)
+	fmt.Println("start demo api server address: ", address, "OpenIM version: ", constant.CurrentVersion, "\n")
 	go register.OnboardingProcessRoutine()
 	go register.ImportFriendRoutine()
 	err := r.Run(address)
--- a/cmd/open_im_msg_gateway/main.go
+++ b/cmd/open_im_msg_gateway/main.go
@ -21,7 +21,7 @@ func main() {
 	flag.Parse()
 	var wg sync.WaitGroup
 	wg.Add(1)
-	fmt.Println("start rpc/msg_gateway server, port: ", *rpcPort, *wsPort, *prometheusPort)
+	fmt.Println("start rpc/msg_gateway server, port: ", *rpcPort, *wsPort, *prometheusPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	gate.Init(*rpcPort, *wsPort)
 	gate.Run(*prometheusPort)
 	wg.Wait()
--- a/cmd/open_im_msg_transfer/main.go
+++ b/cmd/open_im_msg_transfer/main.go
@ -17,7 +17,7 @@ func main() {
 	flag.Parse()
 	log.NewPrivateLog(constant.LogFileName)
 	logic.Init()
-	fmt.Println("start msg_transfer server")
+	fmt.Println("start msg_transfer server ", "OpenIM version: ", constant.CurrentVersion, "\n")
 	logic.Run(*prometheusPort)
 	wg.Wait()
 }
--- a/cmd/open_im_push/main.go
+++ b/cmd/open_im_push/main.go
@ -18,7 +18,7 @@ func main() {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	log.NewPrivateLog(constant.LogFileName)
-	fmt.Println("start push rpc server, port: ", *rpcPort)
+	fmt.Println("start push rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	logic.Init(*rpcPort)
 	logic.Run(*prometheusPort)
 	wg.Wait()
--- a/cmd/rpc/open_im_admin_cms/main.go
+++ b/cmd/rpc/open_im_admin_cms/main.go
@ -3,6 +3,7 @@ package main
 import (
 	rpcMessageCMS "Open_IM/internal/rpc/admin_cms"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.AdminCmsPrometheusPort[0], "adminCMSPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start cms rpc server, port: ", *rpcPort)
+	fmt.Println("start cms rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpcMessageCMS.NewAdminCMSServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_auth/main.go
+++ b/cmd/rpc/open_im_auth/main.go
@ -3,6 +3,7 @@ package main
 import (
 	rpcAuth "Open_IM/internal/rpc/auth"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "RpcToken default listen port 10800")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.AuthPrometheusPort[0], "authPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start auth rpc server, port: ", *rpcPort)
+	fmt.Println("start auth rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpcAuth.NewRpcAuthServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_cache/main.go
+++ b/cmd/rpc/open_im_cache/main.go
@ -3,6 +3,7 @@ package main
 import (
 	rpcCache "Open_IM/internal/rpc/cache"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"

 	"flag"
@ -14,7 +15,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "RpcToken default listen port 10800")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.CachePrometheusPort[0], "cachePrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start cache rpc server, port: ", *rpcPort)
+	fmt.Println("start cache rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpcCache.NewCacheServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_conversation/main.go
+++ b/cmd/rpc/open_im_conversation/main.go
@ -3,6 +3,7 @@ package main
 import (
 	rpcConversation "Open_IM/internal/rpc/conversation"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "RpcConversation default listen port 11300")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.ConversationPrometheusPort[0], "conversationPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start conversation rpc server, port: ", *rpcPort)
+	fmt.Println("start conversation rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpcConversation.NewRpcConversationServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_friend/main.go
+++ b/cmd/rpc/open_im_friend/main.go
@ -3,6 +3,7 @@ package main
 import (
 	"Open_IM/internal/rpc/friend"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "get RpcFriendPort from cmd,default 12000 as port")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.FriendPrometheusPort[0], "friendPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start friend rpc server, port: ", *rpcPort)
+	fmt.Println("start friend rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := friend.NewFriendServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_group/main.go
+++ b/cmd/rpc/open_im_group/main.go
@ -3,6 +3,7 @@ package main
 import (
 	"Open_IM/internal/rpc/group"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "get RpcGroupPort from cmd,default 16000 as port")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.GroupPrometheusPort[0], "groupPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start group rpc server, port: ", *rpcPort)
+	fmt.Println("start group rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := group.NewGroupServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_msg/main.go
+++ b/cmd/rpc/open_im_msg/main.go
@ -3,6 +3,7 @@ package main
 import (
 	"Open_IM/internal/rpc/msg"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessagePrometheusPort[0], "msgPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start msg rpc server, port: ", *rpcPort)
+	fmt.Println("start msg rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := msg.NewRpcChatServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_office/main.go
+++ b/cmd/rpc/open_im_office/main.go
@ -3,6 +3,7 @@ package main
 import (
 	rpc "Open_IM/internal/rpc/office"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.OfficePrometheusPort[0], "officePrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start office rpc server, port: ", *rpcPort)
+	fmt.Println("start office rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpc.NewOfficeServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_organization/main.go
+++ b/cmd/rpc/open_im_organization/main.go
@ -3,6 +3,7 @@ package main
 import (
 	"Open_IM/internal/rpc/organization"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "get RpcOrganizationPort from cmd,default 11200 as port")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.OrganizationPrometheusPort[0], "organizationPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start organization rpc server, port: ", *rpcPort)
+	fmt.Println("start organization rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := organization.NewServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/cmd/rpc/open_im_user/main.go
+++ b/cmd/rpc/open_im_user/main.go
@ -3,6 +3,7 @@ package main
 import (
 	"Open_IM/internal/rpc/user"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
@ -13,7 +14,7 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.UserPrometheusPort[0], "userPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start user rpc server, port: ", *rpcPort)
+	fmt.Println("start user rpc server, port: ", *rpcPort, "OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := user.NewUserServer(*rpcPort)
 	go func() {
 		err := promePkg.StartPromeSrv(*prometheusPort)
--- a/config/config.yaml
+++ b/config/config.yaml
@ -20,6 +20,8 @@ mysql:
  dbMaxOpenConns: 100
  dbMaxIdleConns: 10
  dbMaxLifeTime: 5
+  logLevel: 1 #1=slient 2=error 3=warn 4=info
+  slowThreshold: 500

 mongo:
  dbUri: ""#当dbUri值不为空则直接使用该值
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -153,11 +153,11 @@ services:
  grafana:
    image: grafana/grafana
    volumes:
-    # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json
-    # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
    - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
    - ./docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini
-    - ./docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json
+    # - ./docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json
+    # - ./components/grafana:/var/lib/grafana
+    - ./docker-compose_cfg/grafana.db:/var/lib/grafana/grafana.db
    container_name: grafana
    ports:
    - 10007:10007
--- a/go.mod
+++ b/go.mod
@ -38,7 +38,7 @@ require (
 	github.com/olivere/elastic/v7 v7.0.23
 	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.13.0 // indirect
+	github.com/prometheus/client_golang v1.13.0
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.8.1
@ -49,7 +49,6 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.428
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.428
 	github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20210325043845-84a0811633ca
-	github.com/xuri/excelize/v2 v2.6.0
 	go.etcd.io/etcd/api/v3 v3.5.4
 	go.etcd.io/etcd/client/v3 v3.5.4
 	go.mongodb.org/mongo-driver v1.8.3
--- a/go.sum
+++ b/go.sum
@ -156,6 +156,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
@ -178,6 +179,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@ -249,6 +251,7 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
 github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@ -419,6 +422,7 @@ github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkL
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
 github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
 github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w=
 github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w=
@ -430,6 +434,7 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@ -450,8 +455,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
-github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@ -521,10 +524,6 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
-github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
-github.com/richardlehane/msoleps v1.0.1 h1:RfrALnSNXzmXLbGct/P2b4xkFz4e8Gmj/0Vj9M9xC1o=
-github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
@ -594,12 +593,6 @@ github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyh
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 github.com/xdg/scram v1.0.3/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 h1:3X7aE0iLKJ5j+tz58BpvIZkXNV7Yq4jC93Z/rbN2Fxk=
-github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/excelize/v2 v2.6.0 h1:m/aXAzSAqxgt74Nfd+sNzpzVKhTGl7+S9nbG4A57mF4=
-github.com/xuri/excelize/v2 v2.6.0/go.mod h1:Q1YetlHesXEKwGFfeJn7PfEZz2IvHb6wdOeYjBxVcVs=
-github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Qsdt4+M5+ltca05dA5bG2M=
-github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@ -654,7 +647,6 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@ -747,7 +739,6 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21jo2PjChrtGaAvF5M3I=
 golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@ -766,8 +757,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 h1:B333XXssMuKQeBwiNODx4TupZy7bf4sxFZnN2ZOcvUE=
 golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg=
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -779,7 +770,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -1076,7 +1066,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
--- a/internal/cms_api/admin/admin.go
+++ b/internal/cms_api/admin/admin.go
@ -3,6 +3,7 @@ package admin
 import (
 	apiStruct "Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbAdmin "Open_IM/pkg/proto/admin_cms"
@ -25,6 +26,7 @@ var (
 )

 func init() {
+	log.NewPrivateLog(constant.LogFileName)
 	operationID := utils.OperationIDGenerator()
 	log.NewInfo(operationID, utils.GetSelfFuncName(), "minio config: ", config.Config.Credential.Minio)
 	var initUrl string
--- a/internal/cms_api/router.go
+++ b/internal/cms_api/router.go
@ -18,7 +18,8 @@ import (

 func NewGinRouter() *gin.Engine {
 	gin.SetMode(gin.ReleaseMode)
-	baseRouter := gin.Default()
+	baseRouter := gin.New()
+	baseRouter.Use()
 	if config.Config.Prometheus.Enable {
 		baseRouter.GET("/metrics", promePkg.PrometheusHandler())
 	}
--- a/internal/msg_transfer/logic/persistent_msg_handler.go
+++ b/internal/msg_transfer/logic/persistent_msg_handler.go
@ -44,6 +44,7 @@ func (pc *PersistentConsumerHandler) Init() {
 }

 func (pc *PersistentConsumerHandler) initPrometheus() {
+	// counter
 	msgInsertMysqlCounter = promauto.NewCounter(prometheus.CounterOpts{
 		Name: "insert_mysql_msg_total",
 		Help: "The total number of msg insert mysql events",
@ -52,6 +53,17 @@ func (pc *PersistentConsumerHandler) initPrometheus() {
 		Name: "insert_mysql_failed_msg_total",
 		Help: "The total number of msg insert mysql events",
 	})
+
+	// 启动计时器
+	// requestDurations := prometheus.NewHistogram(prometheus.HistogramOpts{
+	// 	Name:    "http_request_duration_seconds",
+	// 	Help:    "A histogram of the HTTP request durations in seconds.",
+	// 	Buckets: []float64{0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10},
+	// })
+	// 开始
+	// timer := prometheus.NewTimer(requestDurations)
+	// 停止
+	// timer.ObserveDuration()
 }

 func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMessage, msgKey string, _ sarama.ConsumerGroupSession) {
@ -85,7 +97,9 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMes
 			log.NewInfo(msgFromMQ.OperationID, "msg_transfer msg persisting", string(msg))
 			if err = im_mysql_msg_model.InsertMessageToChatLog(msgFromMQ); err != nil {
 				log.NewError(msgFromMQ.OperationID, "Message insert failed", "err", err.Error(), "msg", msgFromMQ.String())
+				if config.Config.Prometheus.Enable {
 					msgInsertFailedMysqlCounter.Inc()
+				}
 				return
 			}
 			if config.Config.Prometheus.Enable {
--- a/internal/rpc/auth/auth.go
+++ b/internal/rpc/auth/auth.go
@ -5,6 +5,7 @@ import (
 	"Open_IM/pkg/common/db"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbAuth "Open_IM/pkg/proto/auth"
@ -21,6 +22,11 @@ import (
 	"google.golang.org/grpc"
 )

+func (rpc *rpcAuth) initPrometheus() {
+	promePkg.NewUserLoginCounter()
+	promePkg.NewUserRegisterCounter()
+}
+
 func (rpc *rpcAuth) UserRegister(_ context.Context, req *pbAuth.UserRegisterReq) (*pbAuth.UserRegisterResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String())
 	var user db.User
@ -35,6 +41,7 @@ func (rpc *rpcAuth) UserRegister(_ context.Context, req *pbAuth.UserRegisterReq)
 		log.NewError(req.OperationID, errMsg, user)
 		return &pbAuth.UserRegisterResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}}, nil
 	}
+	promePkg.PromeInc(promePkg.UserRegisterCounter)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", pbAuth.UserRegisterResp{CommonResp: &pbAuth.CommonResp{}})
 	return &pbAuth.UserRegisterResp{CommonResp: &pbAuth.CommonResp{}}, nil
 }
@ -47,6 +54,7 @@ func (rpc *rpcAuth) UserToken(_ context.Context, req *pbAuth.UserTokenReq) (*pbA
 		log.NewError(req.OperationID, errMsg)
 		return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}}, nil
 	}
+	promePkg.PromeInc(promePkg.UserLoginCounter)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{}, Token: tokens, ExpiredTime: expTime})
 	return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{}, Token: tokens, ExpiredTime: expTime}, nil
 }
@ -141,6 +149,9 @@ func (rpc *rpcAuth) Run() {

 	}
 	log.NewInfo(operationID, "RegisterAuthServer ok ", rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), rpcRegisterIP, rpc.rpcPort, rpc.rpcRegisterName)
+	if config.Config.Prometheus.Enable {
+		rpc.initPrometheus()
+	}
 	err = srv.Serve(listener)
 	if err != nil {
 		log.NewError(operationID, "Serve failed ", err.Error())
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@ -1552,6 +1552,9 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 	if err := rocksCache.DelGroupInfoFromCache(req.GroupID); err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
 	}
+	if err := rocksCache.DelGroupMemberListHashFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
 }
--- a/internal/rpc/msg/rpcChat.go
+++ b/internal/rpc/msg/rpcChat.go
@ -9,10 +9,18 @@ import (
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
-	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+	"google.golang.org/grpc"
+)
+
+var (
+	sendMsgSuccessCounter prometheus.Counter
+	sendMsgFailedCounter  prometheus.Counter
 )

 type rpcChat struct {
@ -46,6 +54,17 @@ func NewRpcChatServer(port int) *rpcChat {
 	return &rc
 }

+func (rpc *rpcChat) initPrometheus() {
+	sendMsgSuccessCounter = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "send_msg_success",
+		Help: "The number of send msg success",
+	})
+	sendMsgFailedCounter = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "send_msg_failed",
+		Help: "The number of send msg failed",
+	})
+}
+
 func (rpc *rpcChat) Run() {
 	log.Info("", "rpcChat init...")
 	listenIP := ""
@ -78,6 +97,9 @@ func (rpc *rpcChat) Run() {
 		panic(utils.Wrap(err, "register chat module  rpc to etcd err"))
 	}
 	go rpc.runCh()
+	if config.Config.Prometheus.Enable {
+		rpc.initPrometheus()
+	}
 	err = srv.Serve(listener)
 	if err != nil {
 		log.Error("", "rpc rpcChat failed ", err.Error())
--- a/internal/rpc/msg/send_msg.go
+++ b/internal/rpc/msg/send_msg.go
@ -30,7 +30,9 @@ import (
 //When the number of group members is greater than this value，Online users will be sent first，Guaranteed service availability
 const GroupMemberNum = 500

-var ExcludeContentType = []int{constant.HasReadReceipt, constant.GroupHasReadReceipt}
+var (
+	ExcludeContentType = []int{constant.HasReadReceipt, constant.GroupHasReadReceipt}
+)

 type MsgCallBackReq struct {
 	SendID       string `json:"sendID"`
--- a/internal/utils/local_cache.go
+++ b/internal/utils/local_cache.go
@ -33,6 +33,13 @@ func GetGroupMemberUserIDList(groupID string, operationID string) ([]string, err

 	CacheGroupMtx.Lock()
 	defer CacheGroupMtx.Unlock()
+
+	if groupHashRemote == 0 {
+		log.Info(operationID, "groupHashRemote == 0  ", groupID)
+		delete(CacheGroupMemberUserIDList, groupID)
+		return []string{}, nil
+	}
+
 	groupInLocalCache, ok := CacheGroupMemberUserIDList[groupID]
 	if ok && groupInLocalCache.MemberListHash == groupHashRemote {
 		log.Debug(operationID, "in local cache ", groupID)
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@ -1,7 +1,6 @@
 package config

 import (
-	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@ -100,6 +99,8 @@ type config struct {
 		DBMaxOpenConns int      `yaml:"dbMaxOpenConns"`
 		DBMaxIdleConns int      `yaml:"dbMaxIdleConns"`
 		DBMaxLifeTime  int      `yaml:"dbMaxLifeTime"`
+		LogLevel       int      `yaml:"logLevel"`
+		SlowThreshold  int      `yaml:"slowThreshold"`
 	}
 	Mongo struct {
 		DBUri                string `yaml:"dbUri"`
@ -545,7 +546,6 @@ type PDefaultTips struct {

 func init() {
 	cfgName := os.Getenv("CONFIG_NAME")
-	fmt.Println("GET IM DEFAULT CONFIG PATH :", Root, "ENV PATH:", cfgName)
 	if len(cfgName) != 0 {
 		bytes, err := ioutil.ReadFile(filepath.Join(cfgName, "config", "config.yaml"))
 		if err != nil {
--- a/pkg/common/constant/constant.go
+++ b/pkg/common/constant/constant.go
@ -336,3 +336,5 @@ const LogFileName = "OpenIM.log"
 const StatisticsTimeInterval = 60

 const MaxNotificationNum = 100
+
+const CurrentVersion = "v2.3.3"
--- a/pkg/common/db/model.go
+++ b/pkg/common/db/model.go
@ -77,7 +77,7 @@ func init() {
 			panic(err1.Error())
 		}
 	}
-	fmt.Println("0", utils.GetSelfFuncName(), "mongo driver client init success: ", uri)
+	fmt.Println("mongo driver client init success: ", uri)
 	// mongodb create index
 	if err := createMongoIndex(mongoClient, cSendLog, false, "send_id", "-send_time"); err != nil {
 		fmt.Println("send_id", "-send_time", "index create failed", err.Error())
@ -100,7 +100,7 @@ func init() {
 	if err := createMongoIndex(mongoClient, cTag, true, "tag_id"); err != nil {
 		fmt.Println("tag_id", "index create failed", err.Error())
 	}
-	fmt.Println("create index success")
+	fmt.Println("createMongoIndex success")
 	DB.mongoClient = mongoClient

 	// redis pool init
--- a/pkg/common/db/mysql.go
+++ b/pkg/common/db/mysql.go
@ -23,6 +23,7 @@ func (w Writer) Printf(format string, args ...interface{}) {
 }

 func initMysqlDB() {
+	fmt.Println("init mysqlDB start")
 	//When there is no open IM database, connect to the mysql built-in database to create openIM database
 	dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local",
 		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], "mysql")
@ -30,33 +31,34 @@ func initMysqlDB() {
 	var err1 error
 	db, err := gorm.Open(mysql.Open(dsn), nil)
 	if err != nil {
-		fmt.Println("0", "Open failed ", err.Error(), dsn)
+		fmt.Println("Open failed ", err.Error(), dsn)
 	}
 	if err != nil {
 		time.Sleep(time.Duration(30) * time.Second)
 		db, err1 = gorm.Open(mysql.Open(dsn), nil)
 		if err1 != nil {
-			fmt.Println("0", "Open failed ", err1.Error(), dsn)
+			fmt.Println("Open failed ", err1.Error(), dsn)
 			panic(err1.Error())
 		}
 	}

 	//Check the database and table during initialization
 	sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci;", config.Config.Mysql.DBDatabaseName)
+	fmt.Println("exec sql: ", sql, " begin")
 	err = db.Exec(sql).Error
 	if err != nil {
-		fmt.Println("0", "Exec failed ", err.Error(), sql)
+		fmt.Println("Exec failed ", err.Error(), sql)
 		panic(err.Error())
 	}
-
+	fmt.Println("exec sql: ", sql, " end")
 	dsn = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local",
 		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName)

 	newLogger := logger.New(
 		Writer{},
 		logger.Config{
-			SlowThreshold:             200 * time.Millisecond, // Slow SQL threshold
-			LogLevel:                  logger.Warn,            // Log level
+			SlowThreshold:             time.Duration(config.Config.Mysql.SlowThreshold) * time.Millisecond, // Slow SQL threshold
+			LogLevel:                  logger.LogLevel(config.Config.Mysql.LogLevel),                       // Log level
 			IgnoreRecordNotFoundError: true,                                                                // Ignore ErrRecordNotFound error for logger
 			Colorful:                  true,                                                                // Disable color
 		},
@ -65,7 +67,7 @@ func initMysqlDB() {
 		Logger: newLogger,
 	})
 	if err != nil {
-		fmt.Println("0", "Open failed ", err.Error(), dsn)
+		fmt.Println("Open failed ", err.Error(), dsn)
 		panic(err.Error())
 	}

@ -78,7 +80,7 @@ func initMysqlDB() {
 	sqlDB.SetMaxOpenConns(config.Config.Mysql.DBMaxOpenConns)
 	sqlDB.SetMaxIdleConns(config.Config.Mysql.DBMaxIdleConns)

-	fmt.Println("open db ok ", dsn)
+	fmt.Println("open mysql ok ", dsn)
 	db.AutoMigrate(
 		&Register{},
 		&Friend{},
--- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
@ -12,11 +12,9 @@ import (
 )

 func init() {
-	//init managers
 	for k, v := range config.Config.Manager.AppManagerUid {
-		user, err := GetUserByUserID(v)
+		_, err := GetUserByUserID(v)
 		if err != nil {
-			fmt.Println("GetUserByUserID failed ", err.Error(), v, user)
 		} else {
 			continue
 		}
@ -30,9 +28,10 @@ func init() {
 		appMgr.AppMangerLevel = constant.AppAdmin
 		err = UserRegister(appMgr)
 		if err != nil {
-			fmt.Println("AppManager insert error", err.Error(), appMgr, "time: ", appMgr.Birth.Unix())
+			fmt.Println("AppManager insert error ", err.Error(), appMgr)
+		} else {
+			fmt.Println("AppManager insert ", appMgr)
 		}
-
 	}
 }

--- a/pkg/common/db/rocks_cache/rocks_cache.go
+++ b/pkg/common/db/rocks_cache/rocks_cache.go
@ -433,6 +433,13 @@ func DelJoinedSuperGroupIDListFromCache(userID string) error {

 func GetGroupMemberListHashFromCache(groupID string) (uint64, error) {
 	generateHash := func() (string, error) {
+		groupInfo, err := GetGroupInfoFromCache(groupID)
+		if err != nil {
+			return "0", utils.Wrap(err, "GetGroupInfoFromCache failed")
+		}
+		if groupInfo.Status == constant.GroupStatusDismissed {
+			return "0", nil
+		}
 		groupMemberIDList, err := GetGroupMemberIDListFromCache(groupID)
 		if err != nil {
 			return "", utils.Wrap(err, "GetGroupMemberIDListFromCache failed")
@ -447,6 +454,9 @@ func GetGroupMemberListHashFromCache(groupID string) (uint64, error) {
 		return strconv.Itoa(int(bi.Uint64())), nil
 	}
 	hashCode, err := db.DB.Rc.Fetch(groupMemberListHashCache+groupID, time.Second*30*60, generateHash)
+	if err != nil {
+		return 0, utils.Wrap(err, "fetch failed")
+	}
 	hashCodeUint64, err := strconv.Atoi(hashCode)
 	return uint64(hashCodeUint64), err
 }
--- a/pkg/common/prometheus/constant.go
+++ b/pkg/common/prometheus/constant.go
@ -0,0 +1,26 @@
+package prometheus
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+var (
+	// user rpc
+	UserLoginCounter    prometheus.Counter
+	UserRegisterCounter prometheus.Counter
+)
+
+func NewUserLoginCounter() {
+	UserLoginCounter = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "user_login",
+		Help: "The number of user login",
+	})
+}
+
+func NewUserRegisterCounter() {
+	UserRegisterCounter = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "user_register",
+		Help: "The number of user register",
+	})
+}
--- a/pkg/common/prometheus/prometheus.go
+++ b/pkg/common/prometheus/prometheus.go
@ -6,6 +6,7 @@ import (
 	"strconv"

 	"github.com/gin-gonic/gin"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )

@ -24,3 +25,9 @@ func PrometheusHandler() gin.HandlerFunc {
 		h.ServeHTTP(c.Writer, c.Request)
 	}
 }
+
+func PromeInc(counter prometheus.Counter) {
+	if config.Config.Prometheus.Enable {
+		counter.Inc()
+	}
+}
--- a/pkg/utils/get_server_ip.go
+++ b/pkg/utils/get_server_ip.go
@ -2,7 +2,6 @@ package utils

 import (
 	"errors"
-	"fmt"
 	"net"
 )

@ -11,14 +10,12 @@ var ServerIP = ""
 func GetLocalIP() (string, error) {
 	addrs, err := net.InterfaceAddrs()
 	if err != nil {
-
 		return "", err
 	}
 	for _, address := range addrs {

 		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
 			if ipnet.IP.To4() != nil {
-				fmt.Println(ipnet.IP.String())
 				return ipnet.IP.String(), nil
 			}
 		}
--- a/script/msg_transfer_start.sh
+++ b/script/msg_transfer_start.sh
@ -22,7 +22,12 @@ sleep 1

 cd ${msg_transfer_binary_root}
 for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
-      nohup ./${msg_transfer_name}  -prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 &
+      prome_port=${prome_ports[$i]}
+      cmd="nohup ./${msg_transfer_name}"
+      if [ $prome_port != "" ]; then
+        cmd="$cmd -prometheus_port $prome_port"
+      fi
+      $cmd >>../logs/openIM.log 2>&1 &
 done

 #Check launched service process
--- a/script/start_rpc_service.sh
+++ b/script/start_rpc_service.sh
@ -80,10 +80,8 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do
  list_to_string $portList2
  prome_ports=($ports_array)
  #Start related rpc services based on the number of ports
-  # for j in ${service_ports}; do
  for ((j = 0; j < ${#service_ports[*]}; j++)); do
    #Start the service in the background
-    #    ./${service_filename[$i]} -port $j &
    cmd="./${service_filename[$i]} -port ${service_ports[$j]} -prometheus_port ${prome_ports[$j]}"
    if [ $i -eq 0 -o $i -eq 1 ]; then
      cmd="./${service_filename[$i]} -port ${service_ports[$j]}"