Merge branch 'main' into v0926_project_layout

# Conflicts:
#	cmd/open_im_api/main.go
#	internal/rpc/auth/rpcAuth.go
#	internal/rpc/chat/rpcChat.go
#	src/common/log/logrus.go

config/config.yaml

@@ -60,7 +60,7 @@ serverip:
 api:
   openImApiPort: [ 10000 ]
 sdk:
-  sdkWsPort: [ 30000 ]
+  openImSdkWsPort: [ 30000 ]
 
 credential:
   tencent:
@@ -88,12 +88,13 @@ rpcregistername:
   openImPushName: Push
   openImOnlineMessageRelayName: OnlineMessageRelay
   openImGroupName: Group
-  rpcGetTokenName: Auth
+  openImAuthName: Auth
 
 log:
   storageLocation: ../logs/
-  rotationTime: 12
-  remainRotationCount: 10
+  rotationTime: 24
+  remainRotationCount: 5
+  remainLogLevel: 6
   elasticSearchSwitch: false
   elasticSearchAddr: [ 127.0.0.1:9201 ]
   elasticSearchUser: ""
@@ -105,7 +106,7 @@ modulename:
   pushName: push
 
 longconnsvr:
-  websocketPort: [ 17778 ]
+  openImWsPort: [ 17778 ]
   websocketMaxConnNum: 10000
   websocketMaxMsgLen: 4096
   websocketTimeOut: 10