IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-15 06:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	cmd/Open-IM-SDK-Core
#	pkg/common/config/config.go
This commit is contained in:
skiffer-git
2022-01-22 09:55:54 +08:00
parent 264451d923 e63b3ab0e3
commit 27d402104e
32 changed files with 1773 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/open_im_api/main.go
+4 -2
View File
@@ -12,8 +12,9 @@ import (
"Open_IM/pkg/common/log"
"Open_IM/pkg/utils"
"flag"
"github.com/gin-gonic/gin"
"strconv"
"github.com/gin-gonic/gin"
//"syscall"
)
@@ -87,6 +88,7 @@ func main() {
managementGroup.POST("/delete_user", manage.DeleteUser)
managementGroup.POST("/send_msg", manage.ManagementSendMsg)
managementGroup.POST("/get_all_users_uid", manage.GetAllUsersUid)
managementGroup.POST("/account_check", manage.AccountCheck)
managementGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus)
}
//Conversation
@@ -100,5 +102,5 @@ func main() {
log.NewPrivateLog("api")
ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port")
flag.Parse()
r.Run(utils.ServerIP + ":" + strconv.Itoa(*ginPort))
r.Run(":" + strconv.Itoa(*ginPort))
}
cmd/open_im_demo/main.go
+3 -2
View File
@@ -5,8 +5,9 @@ import (
"Open_IM/pkg/common/log"
"Open_IM/pkg/utils"
"flag"
"github.com/gin-gonic/gin"
"strconv"
"github.com/gin-gonic/gin"
)
func main() {
@@ -24,5 +25,5 @@ func main() {
log.NewPrivateLog("demo")
ginPort := flag.Int("port", 42233, "get ginServerPort from cmd,default 42233 as port")
flag.Parse()
r.Run(utils.ServerIP + ":" + strconv.Itoa(*ginPort))
r.Run(":" + strconv.Itoa(*ginPort))
}