diff --git a/go.mod b/go.mod index 200c0dcf3..6d98b054e 100644 --- a/go.mod +++ b/go.mod @@ -58,6 +58,7 @@ require ( golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect golang.org/x/image v0.0.0-20211028202545-6944b10bf410 golang.org/x/net v0.0.0-20220622184535-263ec571b305 + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 // indirect golang.org/x/tools v0.1.11 // indirect google.golang.org/api v0.59.0 diff --git a/pkg/proto/admin_cms/admin_cms.proto b/pkg/proto/admin_cms/admin_cms.proto index bf1de9f53..d0b59a716 100644 --- a/pkg/proto/admin_cms/admin_cms.proto +++ b/pkg/proto/admin_cms/admin_cms.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "./admin_cms;admin_cms"; +option go_package = "Open_IM/pkg/proto/admin_cms;admin_cms"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; package admin_cms; diff --git a/pkg/proto/auth/auth.proto b/pkg/proto/auth/auth.proto index bc4eaecf9..0b4595cba 100644 --- a/pkg/proto/auth/auth.proto +++ b/pkg/proto/auth/auth.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; package pbAuth; -option go_package = "./auth;pbAuth"; +option go_package = "Open_IM/pkg/proto/auth;pbAuth"; message CommonResp{ int32 errCode = 1; diff --git a/pkg/proto/cache/cache.proto b/pkg/proto/cache/cache.proto index f6c3c081a..970a77a58 100644 --- a/pkg/proto/cache/cache.proto +++ b/pkg/proto/cache/cache.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "./cache;cache"; +option go_package = "Open_IM/pkg/proto/cache;cache"; package cache; message CommonResp{ diff --git a/pkg/proto/conversation/conversation.proto b/pkg/proto/conversation/conversation.proto index 48973fdc1..e8447f1b0 100644 --- a/pkg/proto/conversation/conversation.proto +++ b/pkg/proto/conversation/conversation.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "./conversation;conversation"; +option go_package = "Open_IM/pkg/proto/conversation;conversation"; package conversation; message CommonResp{ diff --git a/pkg/proto/friend/friend.proto b/pkg/proto/friend/friend.proto index 10314d92a..00d07f17a 100644 --- a/pkg/proto/friend/friend.proto +++ b/pkg/proto/friend/friend.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; -option go_package = "./friend;friend"; +option go_package = "Open_IM/pkg/proto/friend;friend"; package friend; message CommonResp{ diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index 93a96eaff..412f6c73b 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/wrappers.proto"; -option go_package = "./group;group"; +option go_package = "Open_IM/pkg/proto/group;group"; package group; message CommonResp{ diff --git a/pkg/proto/msg/msg.proto b/pkg/proto/msg/msg.proto index 837df4754..e52422dd8 100644 --- a/pkg/proto/msg/msg.proto +++ b/pkg/proto/msg/msg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; -option go_package = "./msg;msg"; +option go_package = "Open_IM/pkg/proto/msg;msg"; package msg; message MsgDataToMQ{ diff --git a/pkg/proto/office/office.proto b/pkg/proto/office/office.proto index 65e9a7847..23b422bad 100644 --- a/pkg/proto/office/office.proto +++ b/pkg/proto/office/office.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; -option go_package = "./office;office"; +option go_package = "Open_IM/pkg/proto/office;office"; package office; message CommonResp{ diff --git a/pkg/proto/organization/organization.proto b/pkg/proto/organization/organization.proto index 309abc881..3dfa9f3bc 100644 --- a/pkg/proto/organization/organization.proto +++ b/pkg/proto/organization/organization.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; -option go_package = "./organization;organization"; +option go_package = "Open_IM/pkg/proto/organization;organization"; package organization; diff --git a/pkg/proto/push/push.proto b/pkg/proto/push/push.proto index 0954e8bc5..ce46692df 100644 --- a/pkg/proto/push/push.proto +++ b/pkg/proto/push/push.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; -option go_package = "./push;pbPush"; +option go_package = "Open_IM/pkg/proto/push;pbPush"; package push; message PushMsgReq { diff --git a/pkg/proto/relay/relay.proto b/pkg/proto/relay/relay.proto index 7d7dd932d..878d65ac4 100644 --- a/pkg/proto/relay/relay.proto +++ b/pkg/proto/relay/relay.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; -option go_package = "./relay;pbRelay"; +option go_package = "Open_IM/pkg/proto/relay;pbRelay"; package relay; message OnlinePushMsgReq { diff --git a/pkg/proto/rtc/rtc.proto b/pkg/proto/rtc/rtc.proto index aafc9345f..bb5c54c19 100644 --- a/pkg/proto/rtc/rtc.proto +++ b/pkg/proto/rtc/rtc.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "./rtc;rtc"; +option go_package = "Open_IM/pkg/proto/rtc;rtc"; package proto; message CommonResp{ diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index 6c0500c09..61ba73c65 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/wrappers.proto"; -option go_package = "./sdk_ws;server_api_params"; +option go_package = "Open_IM/pkg/proto/sdk_ws;server_api_params"; package server_api_params; diff --git a/pkg/proto/user/user.proto b/pkg/proto/user/user.proto index a32b6a594..685d9e150 100644 --- a/pkg/proto/user/user.proto +++ b/pkg/proto/user/user.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/conversation/conversation.proto"; -option go_package = "./user;user"; +option go_package = "Open_IM/pkg/proto/user;user"; package user; message CommonResp{