From d01403e6fb5b879fc329232653b18e51fdd1c1c3 Mon Sep 17 00:00:00 2001
From: away <1819625428@qq.com>
Date: Mon, 28 Jun 2021 15:28:07 +0800
Subject: [PATCH] update

---
 src/api/open_im_api.go                        | 39 +++++++++++++------
 .../third/tencent_cloud_storage_credential.go |  4 ++
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/api/open_im_api.go b/src/api/open_im_api.go
index a2b6f45ae..702a9bde3 100644
--- a/src/api/open_im_api.go
+++ b/src/api/open_im_api.go
@@ -4,16 +4,27 @@ import (
 	apiAuth "Open_IM/src/api/auth"
 	apiChat "Open_IM/src/api/chat"
 	"Open_IM/src/api/friend"
+	"Open_IM/src/api/group"
 	apiThird "Open_IM/src/api/third"
 	"Open_IM/src/api/user"
 	"Open_IM/src/common/log"
 	"Open_IM/src/utils"
 	"flag"
 	"github.com/gin-gonic/gin"
+	"os"
 	"strconv"
+	"syscall"
 )
 
 func main() {
+
+	logFile, err := os.OpenFile("./fatal.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, 0660)
+	if err != nil {
+
+		return
+	}
+	syscall.Dup2(int(logFile.Fd()), int(os.Stderr.Fd()))
+
 	log.Info("", "", "api server running...")
 	r := gin.Default()
 	r.Use(utils.CorsHandler())
@@ -26,9 +37,10 @@ func main() {
 	//friend routing group
 	friendRouterGroup := r.Group("/friend")
 	{
-		friendRouterGroup.POST("/search_friend", friend.SearchFriend)
+		friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo)
 		friendRouterGroup.POST("/add_friend", friend.AddFriend)
 		friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList)
+		friendRouterGroup.POST("/get_self_apply_list", friend.GetSelfApplyList)
 		friendRouterGroup.POST("/get_friend_list", friend.GetFriendList)
 		friendRouterGroup.POST("/add_blacklist", friend.AddBlacklist)
 		friendRouterGroup.POST("/get_blacklist", friend.GetBlacklist)
@@ -36,20 +48,25 @@ func main() {
 		friendRouterGroup.POST("/delete_friend", friend.DeleteFriend)
 		friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse)
 		friendRouterGroup.POST("/set_friend_comment", friend.SetFriendComment)
+		friendRouterGroup.POST("/is_friend", friend.IsFriend)
 	}
 	//group related routing group
-	/*groupRouterGroup := r.Group("/group")
+	groupRouterGroup := r.Group("/group")
 	{
 		groupRouterGroup.POST("/create_group", group.CreateGroup)
-		groupRouterGroup.POST("/get_group_list", group.GetGroupList)
-		groupRouterGroup.POST("/get_group_info", group.GetGroupInfo)
-		groupRouterGroup.POST("/delete_group_member", group.DeleteGroupMember)
-		groupRouterGroup.POST("/set_group_name", group.SetGroupName)
-		groupRouterGroup.POST("/set_group_bulletin", group.SetGroupBulletin)
-		groupRouterGroup.POST("/set_owner_group_nickname", group.SetOwnerGroupNickname)
-		groupRouterGroup.POST("/set_group_head_image", group.SetGroupHeadImage)
-		groupRouterGroup.POST("/member_exit_group", group.MemberExitGroup)
-	}*/
+		groupRouterGroup.POST("/set_group_info", group.SetGroupInfo)
+		groupRouterGroup.POST("join_group", group.JoinGroup)
+		groupRouterGroup.POST("/quit_group", group.QuitGroup)
+		groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse)
+		groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner)
+		groupRouterGroup.POST("/get_group_applicationList", group.GetGroupApplicationList)
+		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo)
+		groupRouterGroup.POST("/kick_group", group.KickGroupMember)
+		groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)
+		groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo)
+		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup)
+		groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList)
+	}
 	//certificate
 	authRouterGroup := r.Group("/auth")
 	{
diff --git a/src/api/third/tencent_cloud_storage_credential.go b/src/api/third/tencent_cloud_storage_credential.go
index e7d299842..a9b7399be 100644
--- a/src/api/third/tencent_cloud_storage_credential.go
+++ b/src/api/third/tencent_cloud_storage_credential.go
@@ -56,6 +56,8 @@ func TencentCloudStorageCredential(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{
 			"errCode": config.ErrTencentCredential.ErrCode,
 			"errMsg":  err.Error(),
+			"bucket":  "",
+			"region":  "",
 			"data":    res,
 		})
 		return
@@ -65,6 +67,8 @@ func TencentCloudStorageCredential(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{
 		"errCode": 0,
 		"errMsg":  "",
+		"region":  config.Config.Credential.Tencent.Region,
+		"bucket":  config.Config.Credential.Tencent.Bucket,
 		"data":    res,
 	})
 }