wfz 3 жил өмнө
parent
commit
84880587c3

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 202 - 100
api/common/common.pb.go


+ 9 - 0
api/common/common.proto

@@ -228,6 +228,15 @@ message CheckPhoneCodeRequest {
   string code = 2;
   string code = 2;
 }
 }
 
 
+message ManagerLoginRequest{
+  string account = 1;// 账号
+  string password = 2;// 密码
+}
+
+message LoginToken{
+   string token = 1;
+}
+
 message UploadMaterialResponse{
 message UploadMaterialResponse{
   string link = 1;
   string link = 1;
 }
 }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 628 - 618
api/partner/partner.pb.go


+ 8 - 1
api/partner/partner.proto

@@ -8,6 +8,7 @@ import "google/protobuf/empty.proto";
 import "api/common/common.proto";
 import "api/common/common.proto";
 import "api/statistics/statistics.proto";
 import "api/statistics/statistics.proto";
 import "api/chat/chat.proto";
 import "api/chat/chat.proto";
+import "api/account/account.proto";
 
 
 option go_package = "git.ikuban.com/server/pw-protobuf/api/partner;partner";
 option go_package = "git.ikuban.com/server/pw-protobuf/api/partner;partner";
 option java_multiple_files = true;
 option java_multiple_files = true;
@@ -410,7 +411,13 @@ service Partner {
       body:"*"
       body:"*"
     };
     };
   };
   };
-
+  // 管理员登录
+  rpc ManagerLogin (common.ManagerLoginRequest) returns (common.LoginToken){
+    option (google.api.http) = {
+      post: "/api/partner/register/examine",
+      body:"*"
+    };
+  };
 
 
   // ---rpc---
   // ---rpc---
   // 1、获取用户详情
   // 1、获取用户详情

+ 38 - 0
api/partner/partner_grpc.pb.go

@@ -133,6 +133,8 @@ type PartnerClient interface {
 	FindExamineList(ctx context.Context, in *common.ListPage2Request, opts ...grpc.CallOption) (*FindExamineListReply, error)
 	FindExamineList(ctx context.Context, in *common.ListPage2Request, opts ...grpc.CallOption) (*FindExamineListReply, error)
 	// 接待员审核
 	// 接待员审核
 	ExaminePartner(ctx context.Context, in *ExaminePartnerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	ExaminePartner(ctx context.Context, in *ExaminePartnerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 管理员登录
+	ManagerLogin(ctx context.Context, in *common.ManagerLoginRequest, opts ...grpc.CallOption) (*common.LoginToken, error)
 	// ---rpc---
 	// ---rpc---
 	// 1、获取用户详情
 	// 1、获取用户详情
 	GetPartnerDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error)
 	GetPartnerDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error)
@@ -655,6 +657,15 @@ func (c *partnerClient) ExaminePartner(ctx context.Context, in *ExaminePartnerRe
 	return out, nil
 	return out, nil
 }
 }
 
 
+func (c *partnerClient) ManagerLogin(ctx context.Context, in *common.ManagerLoginRequest, opts ...grpc.CallOption) (*common.LoginToken, error) {
+	out := new(common.LoginToken)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/ManagerLogin", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *partnerClient) GetPartnerDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error) {
 func (c *partnerClient) GetPartnerDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error) {
 	out := new(common.PersonMsg)
 	out := new(common.PersonMsg)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/GetPartnerDBMsg", in, out, opts...)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/GetPartnerDBMsg", in, out, opts...)
@@ -842,6 +853,8 @@ type PartnerServer interface {
 	FindExamineList(context.Context, *common.ListPage2Request) (*FindExamineListReply, error)
 	FindExamineList(context.Context, *common.ListPage2Request) (*FindExamineListReply, error)
 	// 接待员审核
 	// 接待员审核
 	ExaminePartner(context.Context, *ExaminePartnerRequest) (*emptypb.Empty, error)
 	ExaminePartner(context.Context, *ExaminePartnerRequest) (*emptypb.Empty, error)
+	// 管理员登录
+	ManagerLogin(context.Context, *common.ManagerLoginRequest) (*common.LoginToken, error)
 	// ---rpc---
 	// ---rpc---
 	// 1、获取用户详情
 	// 1、获取用户详情
 	GetPartnerDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error)
 	GetPartnerDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error)
@@ -1031,6 +1044,9 @@ func (UnimplementedPartnerServer) FindExamineList(context.Context, *common.ListP
 func (UnimplementedPartnerServer) ExaminePartner(context.Context, *ExaminePartnerRequest) (*emptypb.Empty, error) {
 func (UnimplementedPartnerServer) ExaminePartner(context.Context, *ExaminePartnerRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ExaminePartner not implemented")
 	return nil, status.Errorf(codes.Unimplemented, "method ExaminePartner not implemented")
 }
 }
+func (UnimplementedPartnerServer) ManagerLogin(context.Context, *common.ManagerLoginRequest) (*common.LoginToken, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ManagerLogin not implemented")
+}
 func (UnimplementedPartnerServer) GetPartnerDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error) {
 func (UnimplementedPartnerServer) GetPartnerDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerDBMsg not implemented")
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerDBMsg not implemented")
 }
 }
@@ -2058,6 +2074,24 @@ func _Partner_ExaminePartner_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 	return interceptor(ctx, in, info, handler)
 }
 }
 
 
+func _Partner_ManagerLogin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ManagerLoginRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).ManagerLogin(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/ManagerLogin",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).ManagerLogin(ctx, req.(*common.ManagerLoginRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Partner_GetPartnerDBMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 func _Partner_GetPartnerDBMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.PersonIDParam)
 	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
 	if err := dec(in); err != nil {
@@ -2429,6 +2463,10 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ExaminePartner",
 			MethodName: "ExaminePartner",
 			Handler:    _Partner_ExaminePartner_Handler,
 			Handler:    _Partner_ExaminePartner_Handler,
 		},
 		},
+		{
+			MethodName: "ManagerLogin",
+			Handler:    _Partner_ManagerLogin_Handler,
+		},
 		{
 		{
 			MethodName: "GetPartnerDBMsg",
 			MethodName: "GetPartnerDBMsg",
 			Handler:    _Partner_GetPartnerDBMsg_Handler,
 			Handler:    _Partner_GetPartnerDBMsg_Handler,

+ 43 - 0
api/partner/partner_http.pb.go

@@ -60,6 +60,7 @@ type PartnerHTTPServer interface {
 	GetPartnerIsLike(context.Context, *common.PersonParam) (*common.IsLike, error)
 	GetPartnerIsLike(context.Context, *common.PersonParam) (*common.IsLike, error)
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
 	GetPartnerMessage(context.Context, *emptypb.Empty) (*PartnerMessage, error)
 	GetPartnerMessage(context.Context, *emptypb.Empty) (*PartnerMessage, error)
+	ManagerLogin(context.Context, *common.ManagerLoginRequest) (*common.LoginToken, error)
 	PartnerApplyWithdraw(context.Context, *PartnerApplyWithdrawRequest) (*emptypb.Empty, error)
 	PartnerApplyWithdraw(context.Context, *PartnerApplyWithdrawRequest) (*emptypb.Empty, error)
 	PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error)
 	PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error)
 	PartnerDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
 	PartnerDeleteChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
@@ -144,6 +145,7 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/register", _Partner_PartnerRegister0_HTTP_Handler(srv))
 	r.POST("/api/partner/register", _Partner_PartnerRegister0_HTTP_Handler(srv))
 	r.POST("/api/partner/register/examine/list", _Partner_FindExamineList0_HTTP_Handler(srv))
 	r.POST("/api/partner/register/examine/list", _Partner_FindExamineList0_HTTP_Handler(srv))
 	r.POST("/api/partner/register/examine", _Partner_ExaminePartner0_HTTP_Handler(srv))
 	r.POST("/api/partner/register/examine", _Partner_ExaminePartner0_HTTP_Handler(srv))
+	r.POST("/api/partner/register/examine", _Partner_ManagerLogin0_HTTP_Handler(srv))
 }
 }
 
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -1631,6 +1633,33 @@ func _Partner_ExaminePartner0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.
 	}
 	}
 }
 }
 
 
+func _Partner_ManagerLogin0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ManagerLoginRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/ManagerLogin")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.ManagerLogin(ctx, req.(*common.ManagerLoginRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type PartnerHTTPClient interface {
 type PartnerHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CreateScrip(ctx context.Context, req *CreateScripRequest, opts ...http.CallOption) (rsp *common.ScripID, err error)
 	CreateScrip(ctx context.Context, req *CreateScripRequest, opts ...http.CallOption) (rsp *common.ScripID, err error)
@@ -1662,6 +1691,7 @@ type PartnerHTTPClient interface {
 	GetPartnerIsLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.IsLike, err error)
 	GetPartnerIsLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.IsLike, err error)
 	GetPartnerLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
 	GetPartnerLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
 	GetPartnerMessage(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerMessage, err error)
 	GetPartnerMessage(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerMessage, err error)
+	ManagerLogin(ctx context.Context, req *common.ManagerLoginRequest, opts ...http.CallOption) (rsp *common.LoginToken, err error)
 	PartnerApplyWithdraw(ctx context.Context, req *PartnerApplyWithdrawRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerApplyWithdraw(ctx context.Context, req *PartnerApplyWithdrawRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerCollect(ctx context.Context, req *PartnerCollectIDsRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerCollect(ctx context.Context, req *PartnerCollectIDsRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerDeleteChat(ctx context.Context, req *common.RoomIDRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerDeleteChat(ctx context.Context, req *common.RoomIDRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -2087,6 +2117,19 @@ func (c *PartnerHTTPClientImpl) GetPartnerMessage(ctx context.Context, in *empty
 	return &out, err
 	return &out, err
 }
 }
 
 
+func (c *PartnerHTTPClientImpl) ManagerLogin(ctx context.Context, in *common.ManagerLoginRequest, opts ...http.CallOption) (*common.LoginToken, error) {
+	var out common.LoginToken
+	pattern := "/api/partner/register/examine"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/ManagerLogin"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *PartnerHTTPClientImpl) PartnerApplyWithdraw(ctx context.Context, in *PartnerApplyWithdrawRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 func (c *PartnerHTTPClientImpl) PartnerApplyWithdraw(ctx context.Context, in *PartnerApplyWithdrawRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	var out emptypb.Empty
 	pattern := "/api/partner/withdraw"
 	pattern := "/api/partner/withdraw"

+ 5 - 0
define/partner.go

@@ -16,3 +16,8 @@ var (
 	PartnerStatusExamineFail    = "examineFail"    // 审核失败
 	PartnerStatusExamineFail    = "examineFail"    // 审核失败
 	PartnerStatusExamineSuccess = "examineSuccess" // 审核成功
 	PartnerStatusExamineSuccess = "examineSuccess" // 审核成功
 )
 )
+
+var (
+	ManagerType = "manager"
+	ManagerPid  = "manager789563"
+)

+ 9 - 0
js/api/common/common_pb.ts

@@ -299,6 +299,15 @@ export interface CheckPhoneCodeRequest{
     phone?:string;
     phone?:string;
     code?:string;
     code?:string;
 }
 }
+export interface ManagerLoginRequest{
+    /**  账号 */
+    account?:string;
+    /**  密码 */
+    password?:string;
+}
+export interface LoginToken{
+    token?:string;
+}
 export interface UploadMaterialResponse{
 export interface UploadMaterialResponse{
     link?:string;
     link?:string;
 }
 }

+ 6 - 1
js/api/partner/partner_http_pb.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 // @ts-ignore
 import request from '@/libs/request';
 import request from '@/libs/request';
 import {PartnerInfo,PartnerBalance,CreateScripRequest,ReplyScripRequest,PartnerCollectIDsRequest,PartnerCollectRequest,PartnerMessage,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest,PartnerApplyWithdrawRequest,PartnerWithdrawTemplateListReply,PartnerWithdrawRecordListReply,PartnerGetRoomBalanceAndTodayBalanceReply,FindExamineListReply,ExaminePartnerRequest,PartnerDBBalance,AddPartnerBalanceRequest} from "./partner_pb";
 import {PartnerInfo,PartnerBalance,CreateScripRequest,ReplyScripRequest,PartnerCollectIDsRequest,PartnerCollectRequest,PartnerMessage,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest,PartnerApplyWithdrawRequest,PartnerWithdrawTemplateListReply,PartnerWithdrawRecordListReply,PartnerGetRoomBalanceAndTodayBalanceReply,FindExamineListReply,ExaminePartnerRequest,PartnerDBBalance,AddPartnerBalanceRequest} from "./partner_pb";
-import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,PartnerChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripIdRequest,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,PartnerIDParam,AddFriendMessageInfo} from "../common/common_pb";
+import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,PartnerChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripIdRequest,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,ManagerLoginRequest,LoginToken,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,PartnerIDParam,AddFriendMessageInfo} from "../common/common_pb";
 import {RoomReply,PartnerFindRoomListReply,FindNotReplyNumReply} from "../chat/chat_pb";
 import {RoomReply,PartnerFindRoomListReply,FindNotReplyNumReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookMessageReply} from "../statistics/statistics_pb";
 import {LookAndLikeListReply,LookMessageReply} from "../statistics/statistics_pb";
 
 
@@ -282,6 +282,11 @@ const PartnerService = {
 	const res = await request.post('/api/partner/register/examine', req);
 	const res = await request.post('/api/partner/register/examine', req);
     return res.data.data;
     return res.data.data;
   },
   },
+  /**  管理员登录 */
+  ManagerLogin: async (req?: ManagerLoginRequest) => {
+	const res = await request.post<{ data: LoginToken, code: string, message: string }>('/api/partner/register/examine', req);
+    return res.data.data;
+  },
 
 
 };
 };
 
 

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно