更新总后台grpc

assembly/base/repository/postgre/init.go

@@ -19,6 +19,7 @@ func Init() {
 	if err != nil {
 		panic(err)
 	}
+	// todo，需要从数据库取出sys_token用作系统验证，存全局变量，每次调用总后台接口需要传递sys_token
 }
 func getClient() *lib.DB {
 	return repository.Repository.GetGormClient()

assembly/base/service/shop.go

@@ -0,0 +1,13 @@
+/**
+ * @ File:
+ * @ Date: 2021/3/25 14:15
+ * @ Author: JYQ
+ * @ Description:
+ */
+package service
+
+import "sportfitness/base/repository/grpc/bsw/im"
+
+func SingUp() {
+	im.SignUp()
+}

proto/client/bsw/im/im.proto

@@ -0,0 +1,146 @@
+syntax = "proto3";
+
+option go_package =".;im";
+
+package im;
+
+
+enum ErrorCode{
+  OK = 0;
+  PARAM = 4001;
+  Exist = 4002;
+}
+
+// metadata 中需要字段 token 用作登录验证, sys_token用作系统验证
+service Api {
+  rpc SignUpUserCode (SignUpRequest) returns (SignUpReply) {}
+  rpc SignUpPhone (SignUpRequest) returns (SignUpReply) {}
+  rpc SignInUserCode (SignInPasswordRequest) returns (SignInReply)  {}
+  rpc SignInWithPhonePassword (SignInPasswordRequest) returns (SignInReply)  {}
+  rpc SessionCheck (SessionCheckRequest) returns (SessionCheckReply)  {}
+  rpc SignOut (DefaultRequest) returns (DefaultReply)  {}
+
+  rpc SelfInfo (DefaultRequest) returns (UserInfo)  {}
+
+  rpc ServiceSaveList (SaveServiceListRequest) returns (DefaultReply)  {}
+
+  rpc UserAddRoles(UserRolesRequest) returns (DefaultReply)  {}
+  rpc UserRemoveRoles(UserRolesRequest) returns (DefaultReply)  {}
+
+  rpc RoleCreate(CreateRoleRequest) returns (DefaultReply)  {}
+  rpc RoleList(RoleListRequest) returns (RoleListReply)  {}
+  rpc RoleEdit(Role) returns (DefaultReply)  {}
+  rpc RoleAddPermissions(RolePermissionRequest) returns (DefaultReply)  {}
+  rpc RoleRemovePermissions(RolePermissionRequest) returns (DefaultReply)  {}
+
+
+  // 总后台专用API
+  rpc IMSystemCreate (CreateSystemRequest) returns (SignInReply)  {}
+}
+message DefaultRequest{
+}
+message DefaultReply{}
+
+message SignUpReply{
+  int64 userId = 1;
+}
+
+message SignInPasswordRequest {
+  string auth = 1;
+  string password = 2;
+  int64 sysId = 3;
+  //session有效期,单位:秒
+  int64 expirationSec = 4;
+}
+
+
+message SignInReply {
+  string token = 1;
+}
+
+enum Status{
+  Ban = 0;
+  On = 1;
+  Delete = 9;
+}
+
+message SignUpRequest {
+  string userCode = 1 ;
+  string name = 2 ;
+  string email = 3 ;
+  string phone = 4 ;
+  string wxOpenId = 5;
+  string qq = 6;
+  string password = 7;
+  string question = 8;
+  string answer = 9;
+  string memo = 10;
+
+}
+
+message UserInfo {
+  int64  id = 1 ;
+  string userCode = 2 ;
+  string name = 3 ;
+  string email = 4 ;
+  string phone = 5 ;
+  string qq = 7;
+  string memo = 11;
+}
+
+
+message SessionCheckRequest {
+  string token = 1;
+}
+
+message SessionCheckReply {
+  int64 userId = 1;
+}
+
+message Service {
+  string path = 1;
+  string memo = 2;
+}
+
+message SaveServiceListRequest{
+  repeated Service list = 1;
+}
+
+message CreateSystemRequest{
+  string fullName = 1;
+  string shortname = 2;
+  string sysUrl = 3;
+  string memo = 4;
+}
+
+message CreateRoleRequest{
+  string name = 1;
+  string memo = 2;
+}
+
+message Role {
+  int64  id = 1;
+  string name = 2;
+  string memo = 3;
+  Status status = 4;
+  string systemName = 5;
+}
+
+message RoleListRequest{
+  int64 userId = 1;
+  int64 sysId = 2;
+}
+
+message UserRolesRequest{
+  int64 userId = 1;
+  repeated int64 roleIdList = 2;
+}
+
+message RoleListReply {
+  repeated Role list = 1;
+}
+
+message RolePermissionRequest{
+  int64 roleId = 1;
+  repeated string servicePath = 2;
+}

repository/grpc/bsw/im/im/im_grpc.pb.go

@@ -24,6 +24,17 @@ type ApiClient interface {
 	SignInWithPhonePassword(ctx context.Context, in *SignInPasswordRequest, opts ...grpc.CallOption) (*SignInReply, error)
 	SessionCheck(ctx context.Context, in *SessionCheckRequest, opts ...grpc.CallOption) (*SessionCheckReply, error)
 	SignOut(ctx context.Context, in *DefaultRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	SelfInfo(ctx context.Context, in *DefaultRequest, opts ...grpc.CallOption) (*UserInfo, error)
+	ServiceSaveList(ctx context.Context, in *SaveServiceListRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	UserAddRoles(ctx context.Context, in *UserRolesRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	UserRemoveRoles(ctx context.Context, in *UserRolesRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	RoleCreate(ctx context.Context, in *CreateRoleRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	RoleList(ctx context.Context, in *RoleListRequest, opts ...grpc.CallOption) (*RoleListReply, error)
+	RoleEdit(ctx context.Context, in *Role, opts ...grpc.CallOption) (*DefaultReply, error)
+	RoleAddPermissions(ctx context.Context, in *RolePermissionRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	RoleRemovePermissions(ctx context.Context, in *RolePermissionRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	// 总后台专用API
+	IMSystemCreate(ctx context.Context, in *CreateSystemRequest, opts ...grpc.CallOption) (*SignInReply, error)
 }
 
 type apiClient struct {
@@ -88,6 +99,96 @@ func (c *apiClient) SignOut(ctx context.Context, in *DefaultRequest, opts ...grp
 	return out, nil
 }
 
+func (c *apiClient) SelfInfo(ctx context.Context, in *DefaultRequest, opts ...grpc.CallOption) (*UserInfo, error) {
+	out := new(UserInfo)
+	err := c.cc.Invoke(ctx, "/im.Api/SelfInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) ServiceSaveList(ctx context.Context, in *SaveServiceListRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/ServiceSaveList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) UserAddRoles(ctx context.Context, in *UserRolesRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/UserAddRoles", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) UserRemoveRoles(ctx context.Context, in *UserRolesRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/UserRemoveRoles", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) RoleCreate(ctx context.Context, in *CreateRoleRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/RoleCreate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) RoleList(ctx context.Context, in *RoleListRequest, opts ...grpc.CallOption) (*RoleListReply, error) {
+	out := new(RoleListReply)
+	err := c.cc.Invoke(ctx, "/im.Api/RoleList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) RoleEdit(ctx context.Context, in *Role, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/RoleEdit", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) RoleAddPermissions(ctx context.Context, in *RolePermissionRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/RoleAddPermissions", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) RoleRemovePermissions(ctx context.Context, in *RolePermissionRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/RoleRemovePermissions", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) IMSystemCreate(ctx context.Context, in *CreateSystemRequest, opts ...grpc.CallOption) (*SignInReply, error) {
+	out := new(SignInReply)
+	err := c.cc.Invoke(ctx, "/im.Api/IMSystemCreate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ApiServer is the server API for Api service.
 // All implementations must embed UnimplementedApiServer
 // for forward compatibility
@@ -98,6 +199,17 @@ type ApiServer interface {
 	SignInWithPhonePassword(context.Context, *SignInPasswordRequest) (*SignInReply, error)
 	SessionCheck(context.Context, *SessionCheckRequest) (*SessionCheckReply, error)
 	SignOut(context.Context, *DefaultRequest) (*DefaultReply, error)
+	SelfInfo(context.Context, *DefaultRequest) (*UserInfo, error)
+	ServiceSaveList(context.Context, *SaveServiceListRequest) (*DefaultReply, error)
+	UserAddRoles(context.Context, *UserRolesRequest) (*DefaultReply, error)
+	UserRemoveRoles(context.Context, *UserRolesRequest) (*DefaultReply, error)
+	RoleCreate(context.Context, *CreateRoleRequest) (*DefaultReply, error)
+	RoleList(context.Context, *RoleListRequest) (*RoleListReply, error)
+	RoleEdit(context.Context, *Role) (*DefaultReply, error)
+	RoleAddPermissions(context.Context, *RolePermissionRequest) (*DefaultReply, error)
+	RoleRemovePermissions(context.Context, *RolePermissionRequest) (*DefaultReply, error)
+	// 总后台专用API
+	IMSystemCreate(context.Context, *CreateSystemRequest) (*SignInReply, error)
 	mustEmbedUnimplementedApiServer()
 }
 
@@ -123,6 +235,36 @@ func (UnimplementedApiServer) SessionCheck(context.Context, *SessionCheckRequest
 func (UnimplementedApiServer) SignOut(context.Context, *DefaultRequest) (*DefaultReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignOut not implemented")
 }
+func (UnimplementedApiServer) SelfInfo(context.Context, *DefaultRequest) (*UserInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SelfInfo not implemented")
+}
+func (UnimplementedApiServer) ServiceSaveList(context.Context, *SaveServiceListRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ServiceSaveList not implemented")
+}
+func (UnimplementedApiServer) UserAddRoles(context.Context, *UserRolesRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserAddRoles not implemented")
+}
+func (UnimplementedApiServer) UserRemoveRoles(context.Context, *UserRolesRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserRemoveRoles not implemented")
+}
+func (UnimplementedApiServer) RoleCreate(context.Context, *CreateRoleRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RoleCreate not implemented")
+}
+func (UnimplementedApiServer) RoleList(context.Context, *RoleListRequest) (*RoleListReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RoleList not implemented")
+}
+func (UnimplementedApiServer) RoleEdit(context.Context, *Role) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RoleEdit not implemented")
+}
+func (UnimplementedApiServer) RoleAddPermissions(context.Context, *RolePermissionRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RoleAddPermissions not implemented")
+}
+func (UnimplementedApiServer) RoleRemovePermissions(context.Context, *RolePermissionRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RoleRemovePermissions not implemented")
+}
+func (UnimplementedApiServer) IMSystemCreate(context.Context, *CreateSystemRequest) (*SignInReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method IMSystemCreate not implemented")
+}
 func (UnimplementedApiServer) mustEmbedUnimplementedApiServer() {}
 
 // UnsafeApiServer may be embedded to opt out of forward compatibility for this service.
@@ -244,6 +386,186 @@ func _Api_SignOut_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Api_SelfInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DefaultRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).SelfInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/SelfInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).SelfInfo(ctx, req.(*DefaultRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_ServiceSaveList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SaveServiceListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).ServiceSaveList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/ServiceSaveList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).ServiceSaveList(ctx, req.(*SaveServiceListRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_UserAddRoles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserRolesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).UserAddRoles(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/UserAddRoles",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).UserAddRoles(ctx, req.(*UserRolesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_UserRemoveRoles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserRolesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).UserRemoveRoles(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/UserRemoveRoles",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).UserRemoveRoles(ctx, req.(*UserRolesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_RoleCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateRoleRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).RoleCreate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/RoleCreate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).RoleCreate(ctx, req.(*CreateRoleRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_RoleList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RoleListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).RoleList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/RoleList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).RoleList(ctx, req.(*RoleListRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_RoleEdit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(Role)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).RoleEdit(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/RoleEdit",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).RoleEdit(ctx, req.(*Role))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_RoleAddPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RolePermissionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).RoleAddPermissions(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/RoleAddPermissions",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).RoleAddPermissions(ctx, req.(*RolePermissionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_RoleRemovePermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RolePermissionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).RoleRemovePermissions(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/RoleRemovePermissions",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).RoleRemovePermissions(ctx, req.(*RolePermissionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_IMSystemCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateSystemRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).IMSystemCreate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/IMSystemCreate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).IMSystemCreate(ctx, req.(*CreateSystemRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Api_ServiceDesc is the grpc.ServiceDesc for Api service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -275,6 +597,46 @@ var Api_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SignOut",
 			Handler:    _Api_SignOut_Handler,
 		},
+		{
+			MethodName: "SelfInfo",
+			Handler:    _Api_SelfInfo_Handler,
+		},
+		{
+			MethodName: "ServiceSaveList",
+			Handler:    _Api_ServiceSaveList_Handler,
+		},
+		{
+			MethodName: "UserAddRoles",
+			Handler:    _Api_UserAddRoles_Handler,
+		},
+		{
+			MethodName: "UserRemoveRoles",
+			Handler:    _Api_UserRemoveRoles_Handler,
+		},
+		{
+			MethodName: "RoleCreate",
+			Handler:    _Api_RoleCreate_Handler,
+		},
+		{
+			MethodName: "RoleList",
+			Handler:    _Api_RoleList_Handler,
+		},
+		{
+			MethodName: "RoleEdit",
+			Handler:    _Api_RoleEdit_Handler,
+		},
+		{
+			MethodName: "RoleAddPermissions",
+			Handler:    _Api_RoleAddPermissions_Handler,
+		},
+		{
+			MethodName: "RoleRemovePermissions",
+			Handler:    _Api_RoleRemovePermissions_Handler,
+		},
+		{
+			MethodName: "IMSystemCreate",
+			Handler:    _Api_IMSystemCreate_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "im.proto",