blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 10:22:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update proto

Browse Source
This commit is contained in:
skiffer-git 2022-09-20 23:31:28 +08:00
parent 2ad71fc4ac
commit e85463c4a1
16 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -24,7 +24,6 @@ require (
github.com/go-playground/validator/v10 v10.11.0 github.com/go-playground/validator/v10 v10.11.0
github.com/go-redis/redis/v8 v8.11.5 github.com/go-redis/redis/v8 v8.11.5
github.com/gogo/protobuf v1.3.2 github.com/gogo/protobuf v1.3.2
github.com/golang-jwt/jwt/v4 v4.1.0
github.com/golang/protobuf v1.5.2 github.com/golang/protobuf v1.5.2
github.com/gorilla/websocket v1.4.2 github.com/gorilla/websocket v1.4.2
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0

2
go.sum
View File

@ -249,8 +249,6 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=

2
pkg/proto/admin_cms/admin_cms.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
option go_package = "./admin_cms;admin_cms"; option go_package = "./admin_cms;admin_cms";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
package admin_cms; package admin_cms;

2
pkg/proto/auth/auth.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
package pbAuth; package pbAuth;
option go_package = "./auth;pbAuth"; option go_package = "./auth;pbAuth";

6
pkg/proto/auto_proto.sh
View File

@ -6,12 +6,12 @@ for ((i = 0; i < ${#all_proto[*]}; i++)); do
proto=${all_proto[$i]} proto=${all_proto[$i]}
protoc -I ../../../ -I ./ --go_out=plugins=grpc:. $proto protoc -I ../../../ -I ./ --go_out=plugins=grpc:. $proto
s=`echo $proto | sed 's/ //g'`
v=${s//proto/pb.go}
protoc-go-inject-tag -input=./$v
echo "protoc --go_out=plugins=grpc:." $proto echo "protoc --go_out=plugins=grpc:." $proto
done done
echo "proto file generate success..." echo "proto file generate success..."
find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdk_ws\"/\"Open_IM\/pkg\/proto\/sdk_ws\"/g' find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdk_ws\"/\"Open_IM\/pkg\/proto\/sdk_ws\"/g'

2
pkg/proto/cache/cache.proto vendored
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "./cache;cache"; option go_package = "./cache;cache";
package cache; package cache;

2
pkg/proto/friend/friend.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "./friend;friend"; option go_package = "./friend;friend";
package friend; package friend;

4
pkg/proto/group/group.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
import "Open_IM/pkg/proto/sdk_ws/wrappers.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/wrappers.proto";
option go_package = "./group;group"; option go_package = "./group;group";
package group; package group;

2
pkg/proto/msg/msg.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "./msg;msg"; option go_package = "./msg;msg";
package msg; package msg;

2
pkg/proto/office/office.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "./office;office"; option go_package = "./office;office";
package office; package office;

2
pkg/proto/organization/organization.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "./organization;organization"; option go_package = "./organization;organization";
package organization; package organization;

6
pkg/proto/proto_dir.cfg
View File

@ -8,9 +8,13 @@ all_proto=(
group/group.proto group/group.proto
user/user.proto user/user.proto
rtc/rtc.proto rtc/rtc.proto
chat/chat.proto msg/msg.proto
push/push.proto push/push.proto
relay/relay.proto relay/relay.proto
sdk_ws/ws.proto sdk_ws/ws.proto
conversation/conversation.proto conversation/conversation.proto
office/office.proto
cache/cache.proto
organization/organization.proto
) )

2
pkg/proto/push/push.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "./push;pbPush"; option go_package = "./push;pbPush";
package push; package push;

2
pkg/proto/relay/relay.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "./relay;pbRelay"; option go_package = "./relay;pbRelay";
package relay; package relay;

2
pkg/proto/sdk_ws/ws.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/wrappers.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/wrappers.proto";
option go_package = "./sdk_ws;server_api_params"; option go_package = "./sdk_ws;server_api_params";
package server_api_params; package server_api_params;

4
pkg/proto/user/user.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto"; import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
import "Open_IM/pkg/proto/conversation/conversation.proto"; import "Open-IM-Server/pkg/proto/conversation/conversation.proto";
option go_package = "./user;user"; option go_package = "./user;user";
package user; package user;