Merge remote-tracking branch 'origin/3.6.1-code-conventions' into 3.6.1-code-conventions

pkg/common/config/config.go

@@ -21,6 +21,7 @@ import (
 
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 	"github.com/openimsdk/tools/discoveryregistry"
+	"gopkg.in/yaml.v2"
 )
 
 var Config GlobalConfig

pkg/common/config/parse.go

@@ -24,6 +24,7 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 	"github.com/openimsdk/tools/errs"
+	"gopkg.in/yaml.v2"
 )
 
 //go:embed version