Merge remote-tracking branch 'origin/master'

api/grpc/base/base.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.14.0
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.11.3
 // source: base.proto
 
 package base

api/grpc/base/base_grpc.pb.go

@@ -11,7 +11,6 @@ import (
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
 // ApiClient is the client API for Api service.
@@ -91,7 +90,7 @@ type UnsafeApiServer interface {
 }
 
 func RegisterApiServer(s grpc.ServiceRegistrar, srv ApiServer) {
-	s.RegisterService(&Api_ServiceDesc, srv)
+	s.RegisterService(&_Api_serviceDesc, srv)
 }
 
 func _Api_SignUp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -148,10 +147,7 @@ func _Api_SignOut_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	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)
-var Api_ServiceDesc = grpc.ServiceDesc{
+var _Api_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "base.Api",
 	HandlerType: (*ApiServer)(nil),
 	Methods: []grpc.MethodDesc{

proto/client/bsw/im/im.proto

@@ -14,8 +14,8 @@ enum ErrorCode{
 
 // metadata: 综合管理系统前端调用需要字段 token 用作登录验证；子系统调用需要字段 sys_token 用作系统验证
 service Api {
-  rpc SignUpUserCode (SignUpRequest) returns (SignUpReply) {}
-  rpc SignUpPhone (SignUpRequest) returns (SignUpReply) {}
+  rpc SignUpUserCode (SignUpRequest) returns (CreateReply) {}
+  rpc SignUpPhone (SignUpRequest) returns (CreateReply) {}
 
   rpc SignInUserCode (SignInPasswordRequest) returns (TokenParam)  {}
   rpc SignInWithPhonePassword (SignInPasswordRequest) returns (TokenParam)  {}
@@ -59,10 +59,31 @@ service Api {
   // 移除service
   rpc ServiceRemoveList(ServiceRemoveRequest) returns (DefaultReply)  {}
 
+  // 创建商户
   rpc ShopCreate (CreateShopRequest) returns (CreateReply)  {}
+  // 商户列表
   rpc ShopList (ShopListRequest) returns (ShopListReply)  {}
+  // 商户添加用户
+  rpc ShopAddUser (ShopAddUserRequest) returns (DefaultReply)  {}
+  // 商户添加许可证
+  rpc ShopAddLicense (ShopAddLicenseRequest) returns (DefaultReply)  {}
+
+  // 系统添加商户
   rpc SystemAddShop (SystemAddShopRequest) returns (DefaultReply)  {}
+  // 系统添加用户
   rpc SystemAddUser (SystemAddUserRequest) returns (DefaultReply)  {}
+
+  // 创建栏目
+  rpc ColumnCreate (ColumnCreateRequest) returns (CreateReply)  {}
+
+  // 创建许可
+  rpc LicenseCreate (LicenseCreateRequest) returns (CreateReply)  {}
+
+  // 许可证批量绑定栏目(之前绑定的会全部取消)
+  rpc LicenseBindColumns (LicenseBindColumnsRequest) returns (DefaultReply)  {}
+
+
+
   // ---总后台专用API---
 
   rpc IMSystemCreate (CreateSystemRequest) returns (TokenParam)  {}
@@ -80,16 +101,20 @@ message TokenParam{
 
 message DefaultReply{}
 
-message SignUpReply{
-  int64 userId = 1;
+message CreateReply{
+  int64 id = 1;
 }
 
 message SignInPasswordRequest {
-  string auth = 1;
+  //登录凭据，用户名、手机号等
+  string credential = 1;
   string password = 2;
+  //仅综合管理后台有效
   int64 sysId = 3;
   //session有效期,单位:秒
   int64 expirationSec = 4;
+  string ip = 5;
+  string clientInfo = 6;
 }
 
 enum Status{
@@ -123,9 +148,6 @@ message UserInfo {
   Status status = 12;
 }
 
-message CreateReply{
-  int64 id = 1;
-}
 
 message PermissionCheck {
   string token = 1;
@@ -269,6 +291,20 @@ message ShopListRequest{
   int64 sId = 4;
 }
 
+message ShopAddUserRequest{
+  int64 shopId = 1;
+  int64 userId = 2;
+}
+message ShopAddLicenseRequest{
+  int64 shopId = 1;
+  int64 licenseId = 2;
+  int64 feeId = 3;
+  int64 beginTimestamp = 4;
+  int64 execUserId = 5;
+  string memo = 6;
+}
+
+
 message ShopInfo{
   int64 shopId          =1;
   string name           =2;
@@ -298,6 +334,40 @@ message SystemAddUserRequest{
   // 仅总后台调用有效
   int64 sysId = 1;
   int64 userId = 2;
+  string memo = 3;
+}
+message ColumnCreateRequest{
+  // 仅总后台调用有效
+  int64 sysId = 1;
+  // 父级栏目ID
+  int64 parentId = 2;
+  string name = 3;
+  string url =  4;
+  // 栏目代码
+  string code = 5;
+  // 栏目序号，排序用
+  int32 no = 6;
+  bool show = 7;
+}
+
+message LicenseCreateRequest{
+  // 仅总后台调用有效
+  int64 sysId = 1;
+
+  string name = 2;
+  // 有效期时长，单位秒
+  int64 validPeriodSec = 3;
+  // 单位：分
+  int32 price = 4;
+  string memo = 5;
+  int64 execUser = 6;
+}
+
+message LicenseBindColumnsRequest{
+  int64 licenseId  =1;
+  repeated int64 columnIdList = 2;
+  string memo = 3;
+  int64 execUser = 4;
 }
 
 message Message{

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

@@ -11,15 +11,14 @@ import (
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
 // ApiClient is the client API for Api service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type ApiClient interface {
-	SignUpUserCode(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*SignUpReply, error)
-	SignUpPhone(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*SignUpReply, error)
+	SignUpUserCode(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*CreateReply, error)
+	SignUpPhone(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*CreateReply, error)
 	SignInUserCode(ctx context.Context, in *SignInPasswordRequest, opts ...grpc.CallOption) (*TokenParam, error)
 	SignInWithPhonePassword(ctx context.Context, in *SignInPasswordRequest, opts ...grpc.CallOption) (*TokenParam, error)
 	// 检查token有效性
@@ -54,10 +53,24 @@ type ApiClient interface {
 	ServiceList(ctx context.Context, in *ServiceListRequest, opts ...grpc.CallOption) (*ServiceListReply, error)
 	// 移除service
 	ServiceRemoveList(ctx context.Context, in *ServiceRemoveRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	// 创建商户
 	ShopCreate(ctx context.Context, in *CreateShopRequest, opts ...grpc.CallOption) (*CreateReply, error)
+	// 商户列表
 	ShopList(ctx context.Context, in *ShopListRequest, opts ...grpc.CallOption) (*ShopListReply, error)
+	// 商户添加用户
+	ShopAddUser(ctx context.Context, in *ShopAddUserRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	// 商户添加许可证
+	ShopAddLicense(ctx context.Context, in *ShopAddLicenseRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	// 系统添加商户
 	SystemAddShop(ctx context.Context, in *SystemAddShopRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	// 系统添加用户
 	SystemAddUser(ctx context.Context, in *SystemAddUserRequest, opts ...grpc.CallOption) (*DefaultReply, error)
+	// 创建栏目
+	ColumnCreate(ctx context.Context, in *ColumnCreateRequest, opts ...grpc.CallOption) (*CreateReply, error)
+	// 创建许可
+	LicenseCreate(ctx context.Context, in *LicenseCreateRequest, opts ...grpc.CallOption) (*CreateReply, error)
+	// 许可证批量绑定栏目(之前绑定的会全部取消)
+	LicenseBindColumns(ctx context.Context, in *LicenseBindColumnsRequest, opts ...grpc.CallOption) (*DefaultReply, error)
 	IMSystemCreate(ctx context.Context, in *CreateSystemRequest, opts ...grpc.CallOption) (*TokenParam, error)
 	IMSignOut(ctx context.Context, in *DefaultRequest, opts ...grpc.CallOption) (*DefaultReply, error)
 	IMSelfInfo(ctx context.Context, in *DefaultRequest, opts ...grpc.CallOption) (*UserInfo, error)
@@ -72,8 +85,8 @@ func NewApiClient(cc grpc.ClientConnInterface) ApiClient {
 	return &apiClient{cc}
 }
 
-func (c *apiClient) SignUpUserCode(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*SignUpReply, error) {
-	out := new(SignUpReply)
+func (c *apiClient) SignUpUserCode(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*CreateReply, error) {
+	out := new(CreateReply)
 	err := c.cc.Invoke(ctx, "/im.Api/SignUpUserCode", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -81,8 +94,8 @@ func (c *apiClient) SignUpUserCode(ctx context.Context, in *SignUpRequest, opts
 	return out, nil
 }
 
-func (c *apiClient) SignUpPhone(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*SignUpReply, error) {
-	out := new(SignUpReply)
+func (c *apiClient) SignUpPhone(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*CreateReply, error) {
+	out := new(CreateReply)
 	err := c.cc.Invoke(ctx, "/im.Api/SignUpPhone", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -270,6 +283,24 @@ func (c *apiClient) ShopList(ctx context.Context, in *ShopListRequest, opts ...g
 	return out, nil
 }
 
+func (c *apiClient) ShopAddUser(ctx context.Context, in *ShopAddUserRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/ShopAddUser", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) ShopAddLicense(ctx context.Context, in *ShopAddLicenseRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/ShopAddLicense", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *apiClient) SystemAddShop(ctx context.Context, in *SystemAddShopRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
 	out := new(DefaultReply)
 	err := c.cc.Invoke(ctx, "/im.Api/SystemAddShop", in, out, opts...)
@@ -288,6 +319,33 @@ func (c *apiClient) SystemAddUser(ctx context.Context, in *SystemAddUserRequest,
 	return out, nil
 }
 
+func (c *apiClient) ColumnCreate(ctx context.Context, in *ColumnCreateRequest, opts ...grpc.CallOption) (*CreateReply, error) {
+	out := new(CreateReply)
+	err := c.cc.Invoke(ctx, "/im.Api/ColumnCreate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) LicenseCreate(ctx context.Context, in *LicenseCreateRequest, opts ...grpc.CallOption) (*CreateReply, error) {
+	out := new(CreateReply)
+	err := c.cc.Invoke(ctx, "/im.Api/LicenseCreate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *apiClient) LicenseBindColumns(ctx context.Context, in *LicenseBindColumnsRequest, opts ...grpc.CallOption) (*DefaultReply, error) {
+	out := new(DefaultReply)
+	err := c.cc.Invoke(ctx, "/im.Api/LicenseBindColumns", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *apiClient) IMSystemCreate(ctx context.Context, in *CreateSystemRequest, opts ...grpc.CallOption) (*TokenParam, error) {
 	out := new(TokenParam)
 	err := c.cc.Invoke(ctx, "/im.Api/IMSystemCreate", in, out, opts...)
@@ -316,7 +374,7 @@ func (c *apiClient) IMSelfInfo(ctx context.Context, in *DefaultRequest, opts ...
 }
 
 func (c *apiClient) IMMessageRcv(ctx context.Context, in *DefaultRequest, opts ...grpc.CallOption) (Api_IMMessageRcvClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Api_ServiceDesc.Streams[0], "/im.Api/IMMessageRcv", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Api_serviceDesc.Streams[0], "/im.Api/IMMessageRcv", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -351,8 +409,8 @@ func (x *apiIMMessageRcvClient) Recv() (*Message, error) {
 // All implementations must embed UnimplementedApiServer
 // for forward compatibility
 type ApiServer interface {
-	SignUpUserCode(context.Context, *SignUpRequest) (*SignUpReply, error)
-	SignUpPhone(context.Context, *SignUpRequest) (*SignUpReply, error)
+	SignUpUserCode(context.Context, *SignUpRequest) (*CreateReply, error)
+	SignUpPhone(context.Context, *SignUpRequest) (*CreateReply, error)
 	SignInUserCode(context.Context, *SignInPasswordRequest) (*TokenParam, error)
 	SignInWithPhonePassword(context.Context, *SignInPasswordRequest) (*TokenParam, error)
 	// 检查token有效性
@@ -387,10 +445,24 @@ type ApiServer interface {
 	ServiceList(context.Context, *ServiceListRequest) (*ServiceListReply, error)
 	// 移除service
 	ServiceRemoveList(context.Context, *ServiceRemoveRequest) (*DefaultReply, error)
+	// 创建商户
 	ShopCreate(context.Context, *CreateShopRequest) (*CreateReply, error)
+	// 商户列表
 	ShopList(context.Context, *ShopListRequest) (*ShopListReply, error)
+	// 商户添加用户
+	ShopAddUser(context.Context, *ShopAddUserRequest) (*DefaultReply, error)
+	// 商户添加许可证
+	ShopAddLicense(context.Context, *ShopAddLicenseRequest) (*DefaultReply, error)
+	// 系统添加商户
 	SystemAddShop(context.Context, *SystemAddShopRequest) (*DefaultReply, error)
+	// 系统添加用户
 	SystemAddUser(context.Context, *SystemAddUserRequest) (*DefaultReply, error)
+	// 创建栏目
+	ColumnCreate(context.Context, *ColumnCreateRequest) (*CreateReply, error)
+	// 创建许可
+	LicenseCreate(context.Context, *LicenseCreateRequest) (*CreateReply, error)
+	// 许可证批量绑定栏目(之前绑定的会全部取消)
+	LicenseBindColumns(context.Context, *LicenseBindColumnsRequest) (*DefaultReply, error)
 	IMSystemCreate(context.Context, *CreateSystemRequest) (*TokenParam, error)
 	IMSignOut(context.Context, *DefaultRequest) (*DefaultReply, error)
 	IMSelfInfo(context.Context, *DefaultRequest) (*UserInfo, error)
@@ -402,10 +474,10 @@ type ApiServer interface {
 type UnimplementedApiServer struct {
 }
 
-func (UnimplementedApiServer) SignUpUserCode(context.Context, *SignUpRequest) (*SignUpReply, error) {
+func (UnimplementedApiServer) SignUpUserCode(context.Context, *SignUpRequest) (*CreateReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignUpUserCode not implemented")
 }
-func (UnimplementedApiServer) SignUpPhone(context.Context, *SignUpRequest) (*SignUpReply, error) {
+func (UnimplementedApiServer) SignUpPhone(context.Context, *SignUpRequest) (*CreateReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignUpPhone not implemented")
 }
 func (UnimplementedApiServer) SignInUserCode(context.Context, *SignInPasswordRequest) (*TokenParam, error) {
@@ -468,12 +540,27 @@ func (UnimplementedApiServer) ShopCreate(context.Context, *CreateShopRequest) (*
 func (UnimplementedApiServer) ShopList(context.Context, *ShopListRequest) (*ShopListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ShopList not implemented")
 }
+func (UnimplementedApiServer) ShopAddUser(context.Context, *ShopAddUserRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ShopAddUser not implemented")
+}
+func (UnimplementedApiServer) ShopAddLicense(context.Context, *ShopAddLicenseRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ShopAddLicense not implemented")
+}
 func (UnimplementedApiServer) SystemAddShop(context.Context, *SystemAddShopRequest) (*DefaultReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SystemAddShop not implemented")
 }
 func (UnimplementedApiServer) SystemAddUser(context.Context, *SystemAddUserRequest) (*DefaultReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SystemAddUser not implemented")
 }
+func (UnimplementedApiServer) ColumnCreate(context.Context, *ColumnCreateRequest) (*CreateReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ColumnCreate not implemented")
+}
+func (UnimplementedApiServer) LicenseCreate(context.Context, *LicenseCreateRequest) (*CreateReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method LicenseCreate not implemented")
+}
+func (UnimplementedApiServer) LicenseBindColumns(context.Context, *LicenseBindColumnsRequest) (*DefaultReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method LicenseBindColumns not implemented")
+}
 func (UnimplementedApiServer) IMSystemCreate(context.Context, *CreateSystemRequest) (*TokenParam, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method IMSystemCreate not implemented")
 }
@@ -496,7 +583,7 @@ type UnsafeApiServer interface {
 }
 
 func RegisterApiServer(s grpc.ServiceRegistrar, srv ApiServer) {
-	s.RegisterService(&Api_ServiceDesc, srv)
+	s.RegisterService(&_Api_serviceDesc, srv)
 }
 
 func _Api_SignUpUserCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -895,6 +982,42 @@ func _Api_ShopList_Handler(srv interface{}, ctx context.Context, dec func(interf
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Api_ShopAddUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ShopAddUserRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).ShopAddUser(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/ShopAddUser",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).ShopAddUser(ctx, req.(*ShopAddUserRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_ShopAddLicense_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ShopAddLicenseRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).ShopAddLicense(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/ShopAddLicense",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).ShopAddLicense(ctx, req.(*ShopAddLicenseRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Api_SystemAddShop_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(SystemAddShopRequest)
 	if err := dec(in); err != nil {
@@ -931,6 +1054,60 @@ func _Api_SystemAddUser_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Api_ColumnCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ColumnCreateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).ColumnCreate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/ColumnCreate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).ColumnCreate(ctx, req.(*ColumnCreateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_LicenseCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(LicenseCreateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).LicenseCreate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/LicenseCreate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).LicenseCreate(ctx, req.(*LicenseCreateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Api_LicenseBindColumns_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(LicenseBindColumnsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ApiServer).LicenseBindColumns(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/im.Api/LicenseBindColumns",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ApiServer).LicenseBindColumns(ctx, req.(*LicenseBindColumnsRequest))
+	}
+	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 {
@@ -1006,10 +1183,7 @@ func (x *apiIMMessageRcvServer) Send(m *Message) error {
 	return x.ServerStream.SendMsg(m)
 }
 
-// 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)
-var Api_ServiceDesc = grpc.ServiceDesc{
+var _Api_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "im.Api",
 	HandlerType: (*ApiServer)(nil),
 	Methods: []grpc.MethodDesc{
@@ -1101,6 +1275,14 @@ var Api_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ShopList",
 			Handler:    _Api_ShopList_Handler,
 		},
+		{
+			MethodName: "ShopAddUser",
+			Handler:    _Api_ShopAddUser_Handler,
+		},
+		{
+			MethodName: "ShopAddLicense",
+			Handler:    _Api_ShopAddLicense_Handler,
+		},
 		{
 			MethodName: "SystemAddShop",
 			Handler:    _Api_SystemAddShop_Handler,
@@ -1109,6 +1291,18 @@ var Api_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SystemAddUser",
 			Handler:    _Api_SystemAddUser_Handler,
 		},
+		{
+			MethodName: "ColumnCreate",
+			Handler:    _Api_ColumnCreate_Handler,
+		},
+		{
+			MethodName: "LicenseCreate",
+			Handler:    _Api_LicenseCreate_Handler,
+		},
+		{
+			MethodName: "LicenseBindColumns",
+			Handler:    _Api_LicenseBindColumns_Handler,
+		},
 		{
 			MethodName: "IMSystemCreate",
 			Handler:    _Api_IMSystemCreate_Handler,