Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release

pkg/common/config/config.go

@@ -578,7 +578,7 @@ func init() {
 			panic(err.Error())
 		}
 	} else {
-		bytes, err := ioutil.ReadFile(filepath.Join(Root, "config", "config.yaml"))
+		bytes, err := ioutil.ReadFile("../config/config.yaml")
 		if err != nil {
 			panic(err.Error())
 		}

pkg/common/db/mysql.go

@@ -3,7 +3,6 @@ package db
 import (
 	"Open_IM/pkg/common/config"
 	"fmt"
-	"sync"
 	"time"
 
 	"gorm.io/driver/mysql"
@@ -12,7 +11,7 @@ import (
 )
 
 type mysqlDB struct {
-	sync.RWMutex
+	//sync.RWMutex
 	db *gorm.DB
 }
 

pkg/common/db/mysql_model/im_mysql_model/client_config.go

@@ -17,6 +17,6 @@ func SetClientInitConfig(m map[string]interface{}) error {
 
 func GetClientInitConfig() (db.ClientInitConfig, error) {
 	var config db.ClientInitConfig
-	err := db.DB.MysqlDB.DefaultGormDB().Model((&db.ClientInitConfig{})).First(&config).Error
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.ClientInitConfig{}).First(&config).Error
 	return config, err
 }

pkg/proto/auth/auth.proto

@@ -31,7 +31,6 @@ message UserTokenResp {
 }
 
 
-
 message ForceLogoutReq {
     int32  Platform = 1;
     string FromUserID = 2;
@@ -56,8 +55,6 @@ message ParseTokenResp{
 }
 
 
-
-
 service Auth {
     rpc UserRegister(UserRegisterReq) returns(UserRegisterResp);
     rpc UserToken(UserTokenReq) returns(UserTokenResp);