Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@withchao
withchao committed Jul 5, 2023
1 parent b626d50 commit f032138
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 55 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
)

require (
github.com/OpenIMSDK/Open-IM-Server v0.0.0-20230702094900-7930a8bf851b
github.com/OpenIMSDK/Open-IM-Server v0.0.0-20230705123117-b494c73328c7
github.com/alibabacloud-go/darabonba-openapi v0.2.1
github.com/alibabacloud-go/dysmsapi-20170525/v2 v2.0.18
github.com/alibabacloud-go/tea v1.1.20
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/OpenIMSDK/Open-IM-Server v0.0.0-20230702094900-7930a8bf851b h1:1LTQ1l+ACFf6j9655SDz/ls/olJz6yYdVlbJL0uWsus=
github.com/OpenIMSDK/Open-IM-Server v0.0.0-20230702094900-7930a8bf851b/go.mod h1:sgp4idb/zDClK8RSct3EpRzYKIwKWi1d7mu6+En1RHI=
github.com/OpenIMSDK/Open-IM-Server v0.0.0-20230705123117-b494c73328c7 h1:SrydfYQulXD+2mJkkExIzu2u1r0eumE/mgWE4K1hfxE=
github.com/OpenIMSDK/Open-IM-Server v0.0.0-20230705123117-b494c73328c7/go.mod h1:TKF0pcxM9+CLGS9y7YAyqtiJ1qlWziuloJyCMlVeRGg=
github.com/OpenIMSDK/Open-IM-Server v1.0.8-0.20230630091751-3c10e2bb65ce h1:yqYqsUXIucBZ94GyUAUvAVZVJa2AfgPDwVtxp9vt1Nc=
github.com/OpenIMSDK/Open-IM-Server v1.0.8-0.20230630091751-3c10e2bb65ce/go.mod h1:sgp4idb/zDClK8RSct3EpRzYKIwKWi1d7mu6+En1RHI=
github.com/OpenIMSDK/open_utils v1.0.8 h1:IopxWgJwEF5ZAPsRuiZZOfcxNOQOCt/p8VDENcHN9r4=
Expand Down
70 changes: 35 additions & 35 deletions internal/api/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,139 +23,139 @@ import (
"github.com/OpenIMSDK/chat/pkg/proto/chat"
)

func NewAdmin(chatConn, adminConn grpc.ClientConnInterface) *Admin {
return &Admin{chatClient: chat.NewChatClient(chatConn), adminClient: admin.NewAdminClient(adminConn)}
func NewAdmin(chatConn, adminConn grpc.ClientConnInterface) *AdminApi {
return &AdminApi{chatClient: chat.NewChatClient(chatConn), adminClient: admin.NewAdminClient(adminConn)}
}

type Admin struct {
type AdminApi struct {
chatClient chat.ChatClient
adminClient admin.AdminClient
}

func (o *Admin) AdminLogin(c *gin.Context) {
func (o *AdminApi) AdminLogin(c *gin.Context) {
a2r.Call(admin.AdminClient.Login, o.adminClient, c)
}

func (o *Admin) ResetUserPassword(c *gin.Context) {
func (o *AdminApi) ResetUserPassword(c *gin.Context) {
a2r.Call(chat.ChatClient.ChangePassword, o.chatClient, c)
}

func (o *Admin) AdminUpdateInfo(c *gin.Context) {
func (o *AdminApi) AdminUpdateInfo(c *gin.Context) {
a2r.Call(admin.AdminClient.AdminUpdateInfo, o.adminClient, c)
}

func (o *Admin) AdminInfo(c *gin.Context) {
func (o *AdminApi) AdminInfo(c *gin.Context) {
a2r.Call(admin.AdminClient.GetAdminInfo, o.adminClient, c)
}

func (o *Admin) AddDefaultFriend(c *gin.Context) {
func (o *AdminApi) AddDefaultFriend(c *gin.Context) {
a2r.Call(admin.AdminClient.AddDefaultFriend, o.adminClient, c)
}

func (o *Admin) DelDefaultFriend(c *gin.Context) {
func (o *AdminApi) DelDefaultFriend(c *gin.Context) {
a2r.Call(admin.AdminClient.DelDefaultFriend, o.adminClient, c)
}

func (o *Admin) SearchDefaultFriend(c *gin.Context) {
func (o *AdminApi) SearchDefaultFriend(c *gin.Context) {
a2r.Call(admin.AdminClient.SearchDefaultFriend, o.adminClient, c)
}

func (o *Admin) FindDefaultFriend(c *gin.Context) {
func (o *AdminApi) FindDefaultFriend(c *gin.Context) {
a2r.Call(admin.AdminClient.FindDefaultFriend, o.adminClient, c)
}

func (o *Admin) AddDefaultGroup(c *gin.Context) {
func (o *AdminApi) AddDefaultGroup(c *gin.Context) {
a2r.Call(admin.AdminClient.AddDefaultGroup, o.adminClient, c)
}

func (o *Admin) DelDefaultGroup(c *gin.Context) {
func (o *AdminApi) DelDefaultGroup(c *gin.Context) {
a2r.Call(admin.AdminClient.DelDefaultGroup, o.adminClient, c)
}

func (o *Admin) FindDefaultGroup(c *gin.Context) {
func (o *AdminApi) FindDefaultGroup(c *gin.Context) {
a2r.Call(admin.AdminClient.FindDefaultGroup, o.adminClient, c)
}

func (o *Admin) SearchDefaultGroup(c *gin.Context) {
func (o *AdminApi) SearchDefaultGroup(c *gin.Context) {
a2r.Call(admin.AdminClient.SearchDefaultGroup, o.adminClient, c)
}

func (o *Admin) AddInvitationCode(c *gin.Context) {
func (o *AdminApi) AddInvitationCode(c *gin.Context) {
a2r.Call(admin.AdminClient.AddInvitationCode, o.adminClient, c)
}

func (o *Admin) GenInvitationCode(c *gin.Context) {
func (o *AdminApi) GenInvitationCode(c *gin.Context) {
a2r.Call(admin.AdminClient.GenInvitationCode, o.adminClient, c)
}

func (o *Admin) DelInvitationCode(c *gin.Context) {
func (o *AdminApi) DelInvitationCode(c *gin.Context) {
a2r.Call(admin.AdminClient.DelInvitationCode, o.adminClient, c)
}

func (o *Admin) SearchInvitationCode(c *gin.Context) {
func (o *AdminApi) SearchInvitationCode(c *gin.Context) {
a2r.Call(admin.AdminClient.SearchInvitationCode, o.adminClient, c)
}

func (o *Admin) AddUserIPLimitLogin(c *gin.Context) {
func (o *AdminApi) AddUserIPLimitLogin(c *gin.Context) {
a2r.Call(admin.AdminClient.AddUserIPLimitLogin, o.adminClient, c)
}

func (o *Admin) SearchUserIPLimitLogin(c *gin.Context) {
func (o *AdminApi) SearchUserIPLimitLogin(c *gin.Context) {
a2r.Call(admin.AdminClient.SearchUserIPLimitLogin, o.adminClient, c)
}

func (o *Admin) DelUserIPLimitLogin(c *gin.Context) {
func (o *AdminApi) DelUserIPLimitLogin(c *gin.Context) {
a2r.Call(admin.AdminClient.DelUserIPLimitLogin, o.adminClient, c)
}

func (o *Admin) SearchIPForbidden(c *gin.Context) {
func (o *AdminApi) SearchIPForbidden(c *gin.Context) {
a2r.Call(admin.AdminClient.SearchIPForbidden, o.adminClient, c)
}

func (o *Admin) AddIPForbidden(c *gin.Context) {
func (o *AdminApi) AddIPForbidden(c *gin.Context) {
a2r.Call(admin.AdminClient.AddIPForbidden, o.adminClient, c)
}

func (o *Admin) DelIPForbidden(c *gin.Context) {
func (o *AdminApi) DelIPForbidden(c *gin.Context) {
a2r.Call(admin.AdminClient.DelIPForbidden, o.adminClient, c)
}

func (o *Admin) ParseToken(c *gin.Context) {
func (o *AdminApi) ParseToken(c *gin.Context) {
a2r.Call(admin.AdminClient.ParseToken, o.adminClient, c)
}

func (o *Admin) BlockUser(c *gin.Context) {
func (o *AdminApi) BlockUser(c *gin.Context) {
a2r.Call(admin.AdminClient.BlockUser, o.adminClient, c)
}

func (o *Admin) UnblockUser(c *gin.Context) {
func (o *AdminApi) UnblockUser(c *gin.Context) {
a2r.Call(admin.AdminClient.UnblockUser, o.adminClient, c)
}

func (o *Admin) SearchBlockUser(c *gin.Context) {
func (o *AdminApi) SearchBlockUser(c *gin.Context) {
a2r.Call(admin.AdminClient.SearchBlockUser, o.adminClient, c)
}

func (o *Admin) SetClientConfig(c *gin.Context) {
func (o *AdminApi) SetClientConfig(c *gin.Context) {
a2r.Call(admin.AdminClient.SetClientConfig, o.adminClient, c)
}

func (o *Admin) GetClientConfig(c *gin.Context) {
func (o *AdminApi) GetClientConfig(c *gin.Context) {
a2r.Call(admin.AdminClient.GetClientConfig, o.adminClient, c)
}

func (o *Admin) AddApplet(c *gin.Context) {
func (o *AdminApi) AddApplet(c *gin.Context) {
a2r.Call(admin.AdminClient.AddApplet, o.adminClient, c)
}

func (o *Admin) DelApplet(c *gin.Context) {
func (o *AdminApi) DelApplet(c *gin.Context) {
a2r.Call(admin.AdminClient.DelApplet, o.adminClient, c)
}

func (o *Admin) UpdateApplet(c *gin.Context) {
func (o *AdminApi) UpdateApplet(c *gin.Context) {
a2r.Call(admin.AdminClient.UpdateApplet, o.adminClient, c)
}

func (o *Admin) SearchApplet(c *gin.Context) {
func (o *AdminApi) SearchApplet(c *gin.Context) {
a2r.Call(admin.AdminClient.SearchApplet, o.adminClient, c)
}
38 changes: 19 additions & 19 deletions internal/api/chat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ import (
"github.com/OpenIMSDK/chat/pkg/proto/chat"
)

func NewChat(chatConn, adminConn grpc.ClientConnInterface) *Chat {
func NewChat(chatConn, adminConn grpc.ClientConnInterface) *ChatApi {

return &Chat{chatClient: chat.NewChatClient(chatConn), adminClient: admin.NewAdminClient(adminConn)}
return &ChatApi{chatClient: chat.NewChatClient(chatConn), adminClient: admin.NewAdminClient(adminConn)}
}

type Chat struct {
type ChatApi struct {
chatClient chat.ChatClient
adminClient admin.AdminClient
}

// ################## ACCOUNT ##################

func (o *Chat) SendVerifyCode(c *gin.Context) {
func (o *ChatApi) SendVerifyCode(c *gin.Context) {
var req chat.SendVerifyCodeReq
if err := c.BindJSON(&req); err != nil {
apiresp.GinError(c, err)
Expand All @@ -63,11 +63,11 @@ func (o *Chat) SendVerifyCode(c *gin.Context) {
apiresp.GinSuccess(c, resp)
}

func (o *Chat) VerifyCode(c *gin.Context) {
func (o *ChatApi) VerifyCode(c *gin.Context) {
a2r.Call(chat.ChatClient.VerifyCode, o.chatClient, c)
}

func (o *Chat) RegisterUser(c *gin.Context) {
func (o *ChatApi) RegisterUser(c *gin.Context) {
var req chat.RegisterUserReq
if err := c.BindJSON(&req); err != nil {
apiresp.GinError(c, err)
Expand All @@ -88,7 +88,7 @@ func (o *Chat) RegisterUser(c *gin.Context) {
// a2r.Call(chat.ChatClient.RegisterUser, o.chatClient, c)
}

func (o *Chat) Login(c *gin.Context) {
func (o *ChatApi) Login(c *gin.Context) {
var req chat.LoginReq
if err := c.BindJSON(&req); err != nil {
apiresp.GinError(c, err)
Expand All @@ -108,55 +108,55 @@ func (o *Chat) Login(c *gin.Context) {
apiresp.GinSuccess(c, resp)
}

func (o *Chat) ResetPassword(c *gin.Context) {
func (o *ChatApi) ResetPassword(c *gin.Context) {
a2r.Call(chat.ChatClient.ResetPassword, o.chatClient, c)
}

func (o *Chat) ChangePassword(c *gin.Context) {
func (o *ChatApi) ChangePassword(c *gin.Context) {
a2r.Call(chat.ChatClient.ChangePassword, o.chatClient, c)
}

// ################## USER ##################

func (o *Chat) UpdateUserInfo(c *gin.Context) {
func (o *ChatApi) UpdateUserInfo(c *gin.Context) {
a2r.Call(chat.ChatClient.UpdateUserInfo, o.chatClient, c)
}

func (o *Chat) FindUserPublicInfo(c *gin.Context) {
func (o *ChatApi) FindUserPublicInfo(c *gin.Context) {
a2r.Call(chat.ChatClient.FindUserPublicInfo, o.chatClient, c)
}

func (o *Chat) FindUserFullInfo(c *gin.Context) {
func (o *ChatApi) FindUserFullInfo(c *gin.Context) {
a2r.Call(chat.ChatClient.FindUserFullInfo, o.chatClient, c)
}

//func (o *Chat) GetUsersFullInfo(c *gin.Context) {
//func (o *ChatApi) GetUsersFullInfo(c *gin.Context) {
// a2r.Call(chat.ChatClient.GetUsersFullInfo, o.chatClient, c)
//}

func (o *Chat) SearchUserFullInfo(c *gin.Context) {
func (o *ChatApi) SearchUserFullInfo(c *gin.Context) {
a2r.Call(chat.ChatClient.SearchUserFullInfo, o.chatClient, c)
}

func (o *Chat) SearchUserPublicInfo(c *gin.Context) {
func (o *ChatApi) SearchUserPublicInfo(c *gin.Context) {
a2r.Call(chat.ChatClient.SearchUserPublicInfo, o.chatClient, c)
}

// ################## APPLET ##################

func (o *Chat) FindApplet(c *gin.Context) {
func (o *ChatApi) FindApplet(c *gin.Context) {
a2r.Call(admin.AdminClient.FindApplet, o.adminClient, c)
}

// ################## CONFIG ##################

func (o *Chat) GetClientConfig(c *gin.Context) {
func (o *ChatApi) GetClientConfig(c *gin.Context) {
a2r.Call(admin.AdminClient.GetClientConfig, o.adminClient, c)
}

// ################## CALLBACK ##################

func (o *Chat) OpenIMCallback(c *gin.Context) {
func (o *ChatApi) OpenIMCallback(c *gin.Context) {
body, err := io.ReadAll(c.Request.Body)
if err != nil {
apiresp.GinError(c, err)
Expand All @@ -173,7 +173,7 @@ func (o *Chat) OpenIMCallback(c *gin.Context) {
apiresp.GinSuccess(c, nil)
}

func (o *Chat) getClientIP(c *gin.Context) (string, error) {
func (o *ChatApi) getClientIP(c *gin.Context) (string, error) {
if config.Config.ProxyHeader == "" {
ip, _, err := net.SplitHostPort(c.Request.RemoteAddr)
return ip, err
Expand Down

0 comments on commit f032138

Please sign in to comment.