feat:常用功能接口

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/userCenter.iml" filepath="$PROJECT_DIR$/.idea/userCenter.iml" />
+    </modules>
+  </component>
+</project>

.idea/userCenter.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

api/internal/handler/routes.go

@@ -59,8 +59,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/userCenter/workDesktop/menu",
-				Handler: WorkDesktopMenuHandler(serverCtx),
+				Path:    "/userCenter/workDesktop/menuInfo",
+				Handler: WorkDesktopMenuInfoHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/userCenter/workDesktop/renew/:actionMode",
+				Handler: WorkDesktopComprehensiveHandler(serverCtx),
 			},
 		},
 	)

api/internal/handler/workdesktopcomprehensivehandler.go

@@ -0,0 +1,28 @@
+package handler
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"userCenter/api/internal/logic"
+	"userCenter/api/internal/svc"
+	"userCenter/api/internal/types"
+)
+
+func WorkDesktopComprehensiveHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.WorkDesktopComprehensiveReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := logic.NewWorkDesktopComprehensiveLogic(r.Context(), svcCtx, r)
+		resp, err := l.WorkDesktopComprehensive(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

api/internal/handler/workdesktopmenuhandler.go → api/internal/handler/workdesktopmenuinfohandler.go

@@ -3,22 +3,22 @@ package handler
 import (
 	"net/http"
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	"userCenter/api/internal/logic"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
-func WorkDesktopMenuHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func WorkDesktopMenuInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.WorkDesktopMenuReq
+		var req types.WorkDesktopMenuInfoReq
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.Error(w, err)
 			return
 		}
 
-		l := logic.NewWorkDesktopMenuLogic(r.Context(), svcCtx, r)
-		resp, err := l.WorkDesktopMenu(&req)
+		l := logic.NewWorkDesktopMenuInfoLogic(r.Context(), svcCtx, r)
+		resp, err := l.WorkDesktopMenuInfo(&req)
 		if err != nil {
 			httpx.Error(w, err)
 		} else {

api/internal/logic/workdesktopcomprehensivelogic.go

@@ -0,0 +1,46 @@
+package logic
+
+import (
+	"context"
+	"net/http"
+	"userCenter/entity"
+	"userCenter/rpc/pb"
+
+	"userCenter/api/internal/svc"
+	"userCenter/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type WorkDesktopComprehensiveLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	r      *http.Request
+}
+
+func NewWorkDesktopComprehensiveLogic(ctx context.Context, svcCtx *svc.ServiceContext, r *http.Request) *WorkDesktopComprehensiveLogic {
+	return &WorkDesktopComprehensiveLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		r:      r,
+	}
+}
+
+func (l *WorkDesktopComprehensiveLogic) WorkDesktopComprehensive(req *types.WorkDesktopComprehensiveReq) (resp *types.CommonResp, err error) {
+	res, err := entity.UserCenterRpc.WorkDesktopComprehensive(l.ctx, &pb.WorkDesktopComprehensiveReq{
+		AppId:      req.AppId,
+		UserId:     req.UserId,
+		Phone:      req.Phone,
+		Platform:   req.Platform,
+		MenuIds:    req.MenuIds,
+		MenuMode:   req.MenuMode,
+		ActionMode: req.ActionMode,
+	})
+	logx.Info(res.ErrorMsg, "--------------------------", res.ErrorCode)
+	return &types.CommonResp{
+		Error_code: res.ErrorCode,
+		Error_msg:  res.ErrorMsg,
+	}, err
+}

api/internal/logic/workdesktopmenulogic.go → api/internal/logic/workdesktopmenuinfologic.go

@@ -4,23 +4,23 @@ import (
 	"context"
 	"net/http"
 	"userCenter/entity"
+	"userCenter/rpc/pb"
 
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	. "userCenter/rpc/usercenter"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type WorkDesktopMenuLogic struct {
+type WorkDesktopMenuInfoLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 	r      *http.Request
 }
 
-func NewWorkDesktopMenuLogic(ctx context.Context, svcCtx *svc.ServiceContext, r *http.Request) *WorkDesktopMenuLogic {
-	return &WorkDesktopMenuLogic{
+func NewWorkDesktopMenuInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext, r *http.Request) *WorkDesktopMenuInfoLogic {
+	return &WorkDesktopMenuInfoLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
@@ -28,14 +28,14 @@ func NewWorkDesktopMenuLogic(ctx context.Context, svcCtx *svc.ServiceContext, r
 	}
 }
 
-func (l *WorkDesktopMenuLogic) WorkDesktopMenu(req *types.WorkDesktopMenuReq) (resp *types.Resp, err error) {
-	res, err := entity.UserCenterRpc.WorkDesktopMenu(l.ctx, &WorkDesktopMenuReq{
+func (l *WorkDesktopMenuInfoLogic) WorkDesktopMenuInfo(req *types.WorkDesktopMenuInfoReq) (resp *types.CommonResp, err error) {
+	res, err := entity.UserCenterRpc.WorkDesktopMenuInfo(l.ctx, &pb.WorkDesktopMenuInfoReq{
 		AppId:    req.AppId,
 		UserId:   req.UserId,
 		Phone:    req.Phone,
 		Platform: req.Platform,
 	})
-	return &types.Resp{
+	return &types.CommonResp{
 		Error_code: res.ErrorCode,
 		Error_msg:  res.ErrorMsg,
 		Data:       res.Data,

api/internal/types/types.go

@@ -220,13 +220,23 @@ type UserDelReq struct {
 	Id            int64  `json:"id"`
 }
 
-type WorkDesktopMenuReq struct {
+type WorkDesktopMenuInfoReq struct {
 	Platform string `json:"platform,optional"`
 	UserId   string `header:"userId,optional"`
 	AppId    string `header:"appId,optional"`
 	Phone    string `header:"phone,optional"`
 }
 
+type WorkDesktopComprehensiveReq struct {
+	Platform   string `json:"platform,optional"`
+	UserId     string `header:"userId,optional"`
+	AppId      string `header:"appId,optional"`
+	Phone      string `header:"phone,optional"`
+	MenuMode   string `json:"menuMode,optional"`
+	MenuIds    string `json:"menuIds,optional"`
+	ActionMode string `path:"actionMode,options=commonly|menuMode"`
+}
+
 type CommonResp struct {
 	Error_code int64       `json:"error_code"`
 	Error_msg  string      `json:"error_msg"`

api/userCenter.api

@@ -234,12 +234,23 @@ type (
 	}
 
 	//工作桌面 -- 菜单
-	WorkDesktopMenuReq {
+	WorkDesktopMenuInfoReq {
 		Platform string `json:"platform,optional"`
 		UserId   string `header:"userId,optional"`
 		AppId    string `header:"appId,optional"`
 		Phone    string `header:"phone,optional"`
 	}
+	//工作桌面-- 菜单模式：全部/可用选择记录
+	//工作桌面--常用功能更新
+	WorkDesktopComprehensiveReq {
+		Platform   string `json:"platform,optional"`
+		UserId     string `header:"userId,optional"`
+		AppId      string `header:"appId,optional"`
+		Phone      string `header:"phone,optional"`
+		MenuMode   string `json:"menuMode,optional"`
+		MenuIds    string `json:"menuIds,optional"`
+		ActionMode string `path:"actionMode,options=commonly|menuMode"`
+	}
 	//
 	CommonResp {
 		Error_code int64       `json:"error_code"`
@@ -268,8 +279,10 @@ service userCenter-api {
 	@handler GetStatusByCode
 	post /userCenter/ent/getStatusByCode (GetStatusByCodeReq) returns (GetStatusByCodeResp)
 	
-	@handler WorkDesktopMenu
-	post /userCenter/workDesktop/menu (WorkDesktopMenuReq) returns (CommonResp)
+	@handler WorkDesktopMenuInfo
+	post /userCenter/workDesktop/menuInfo (WorkDesktopMenuInfoReq) returns (CommonResp)
+	@handler WorkDesktopComprehensive
+	post /userCenter/workDesktop/renew/:actionMode (WorkDesktopComprehensiveReq) returns (CommonResp)
 }
 
 @server(

entity/workDesktop.go

@@ -2,6 +2,8 @@ package entity
 
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
+	"database/sql"
+	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
 	"sort"
 	"strings"
@@ -204,3 +206,73 @@ func (m *WorkDesktopMenu) VerifyPermissions(powerIds string) (b bool) {
 	}
 	return
 }
+
+//常用功能
+const (
+	WorkCommonly = "work_commonly"
+	WorkMenu     = "work_menu"
+)
+
+var (
+	InsertCollKey = []string{"appid", "userid", "platform", "field", "value", "ischeck"}
+)
+
+//更新常用功能
+func CommonlyUpdate(in *pb.WorkDesktopComprehensiveReq) (B bool, M string) {
+	//事务  1：查； 2： 存；3： 删；
+	//此功能是否需要验证权限
+	var parametersSelect []string
+	var idsSelect []interface{}
+	for _, mid := range strings.Split(in.MenuIds, ",") {
+		parametersSelect = append(parametersSelect, "?")
+		idsSelect = append(idsSelect, mid)
+	}
+	menuSelectData := BaseMysql.SelectBySql(fmt.Sprintf(`SELECT id,powerids from %s WHERE  id IN (%s) AND status = 0`, WorkMenu, strings.Join(parametersSelect, ",")), idsSelect...)
+	if menuSelectData != nil && len(*menuSelectData) > 0 {
+		var powerIdsMap = map[int]int{} //2:需要权限；1：不需要权限
+		for _, mv := range *menuSelectData {
+			if MC.IntAll(mv["id"]) == 0 {
+				continue
+			}
+			powerIdsMap[MC.IntAll(mv["id"])] = MC.If(MC.ObjToString(mv["powerids"]) != "", 2, 1).(int)
+		}
+		if powerIdsMap != nil {
+			//此处需要事务
+			if B = BaseMysql.ExecTx("常用功能批量更新", func(tx *sql.Tx) bool {
+				//查
+				var delId = 0
+				existingData := BaseMysql.SelectBySql(`SELECT id,value  FROM `+WorkCommonly+` WHERE userid = ? AND appid = ? AND field = ? AND platform = ?  ORDER BY id DESC `, in.UserId, in.AppId, in.ActionMode, in.Platform)
+				if existingData != nil && len(*existingData) > 0 {
+					delId = MC.IntAll((*existingData)[0]["id"])
+				}
+				//先保存
+				var insertValue []interface{}
+				for id, checkCode := range powerIdsMap {
+					insertValue = append(insertValue, in.AppId, in.UserId, in.Platform, in.ActionMode, fmt.Sprint(id), checkCode > 1)
+				}
+				if len(insertValue)/len(InsertCollKey) > 0 {
+					x, _ := BaseMysql.InsertBatchByTx(tx, WorkCommonly, InsertCollKey, insertValue)
+					if x < 0 {
+						logx.Info("常用功能更新数据处理异常")
+						return false
+					}
+				}
+				//再删除
+				if delId > 0 {
+					if BaseMysql.UpdateOrDeleteBySqlByTx(tx, `DELETE  FROM `+WorkCommonly+` WHERE userid = ? AND field = ? AND id <= ? AND platform = ? `, in.UserId, in.ActionMode, delId, in.Platform) < 0 {
+						logx.Info("常用功能删除数据处理异常")
+						return false
+					}
+				}
+				return true
+			}); !B {
+				M = "常用功能批量更新数据失败"
+			}
+		} else {
+			M = "暂无此常用功能"
+		}
+	} else {
+		M = "常用功能查询异常"
+	}
+	return
+}

rpc/internal/logic/workdesktopcomprehensivelogic.go

@@ -0,0 +1,29 @@
+package logic
+
+import (
+	"context"
+	"github.com/zeromicro/go-zero/core/logx"
+	"userCenter/rpc/internal/svc"
+	"userCenter/rpc/pb"
+	"userCenter/service"
+)
+
+type WorkDesktopComprehensiveLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewWorkDesktopComprehensiveLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkDesktopComprehensiveLogic {
+	return &WorkDesktopComprehensiveLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 菜单选择模式
+func (l *WorkDesktopComprehensiveLogic) WorkDesktopComprehensive(in *pb.WorkDesktopComprehensiveReq) (*pb.WorkDesktopComprehensiveResp, error) {
+
+	return service.RenewWorkDesktopMenuModeOrCommonly(in), nil
+}

rpc/internal/logic/workdesktopmenulogic.go → rpc/internal/logic/workdesktopmenuinfologic.go

@@ -5,21 +5,22 @@ import (
 	"log"
 	"userCenter/entity"
 	"userCenter/rpc/internal/config"
+	"userCenter/service"
+
 	"userCenter/rpc/internal/svc"
 	"userCenter/rpc/pb"
-	"userCenter/service"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type WorkDesktopMenuLogic struct {
+type WorkDesktopMenuInfoLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 	logx.Logger
 }
 
-func NewWorkDesktopMenuLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkDesktopMenuLogic {
-	return &WorkDesktopMenuLogic{
+func NewWorkDesktopMenuInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkDesktopMenuInfoLogic {
+	return &WorkDesktopMenuInfoLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
 		Logger: logx.WithContext(ctx),
@@ -29,9 +30,9 @@ func NewWorkDesktopMenuLogic(ctx context.Context, svcCtx *svc.ServiceContext) *W
 var clearUserPowerSwitch = true
 
 // 获取菜单树
-func (l *WorkDesktopMenuLogic) WorkDesktopMenu(in *pb.WorkDesktopMenuReq) (*pb.WorkDesktopMenuResp, error) {
+func (l *WorkDesktopMenuInfoLogic) WorkDesktopMenuInfo(in *pb.WorkDesktopMenuInfoReq) (*pb.WorkDesktopMenuInfoResp, error) {
 	if in.UserId == "" {
-		return &pb.WorkDesktopMenuResp{
+		return &pb.WorkDesktopMenuInfoResp{
 			ErrorCode: -1,
 			ErrorMsg:  "用户信息有误",
 			Data:      nil,
@@ -59,7 +60,7 @@ func (l *WorkDesktopMenuLogic) WorkDesktopMenu(in *pb.WorkDesktopMenuReq) (*pb.W
 		errorCode = -1
 		errorMsg = err.Error()
 	}
-	return &pb.WorkDesktopMenuResp{
+	return &pb.WorkDesktopMenuInfoResp{
 		ErrorCode: errorCode,
 		ErrorMsg:  errorMsg,
 		Data: &pb.MenuData{

rpc/internal/server/usercenterserver.go

@@ -95,7 +95,13 @@ func (s *UserCenterServer) UserDel(ctx context.Context, in *pb.UserIdReq) (*pb.E
 }
 
 // 获取菜单树
-func (s *UserCenterServer) WorkDesktopMenu(ctx context.Context, in *pb.WorkDesktopMenuReq) (*pb.WorkDesktopMenuResp, error) {
-	l := logic.NewWorkDesktopMenuLogic(ctx, s.svcCtx)
-	return l.WorkDesktopMenu(in)
+func (s *UserCenterServer) WorkDesktopMenuInfo(ctx context.Context, in *pb.WorkDesktopMenuInfoReq) (*pb.WorkDesktopMenuInfoResp, error) {
+	l := logic.NewWorkDesktopMenuInfoLogic(ctx, s.svcCtx)
+	return l.WorkDesktopMenuInfo(in)
+}
+
+// 菜单选择模式
+func (s *UserCenterServer) WorkDesktopComprehensive(ctx context.Context, in *pb.WorkDesktopComprehensiveReq) (*pb.WorkDesktopComprehensiveResp, error) {
+	l := logic.NewWorkDesktopComprehensiveLogic(ctx, s.svcCtx)
+	return l.WorkDesktopComprehensive(in)
 }

rpc/pb/userCenter.pb.go

@@ -2253,7 +2253,7 @@ func (x *UserIdReq) GetUnionid() string {
 }
 
 //工作桌面
-type WorkDesktopMenuReq struct {
+type WorkDesktopMenuInfoReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -2264,8 +2264,8 @@ type WorkDesktopMenuReq struct {
 	Phone    string `protobuf:"bytes,4,opt,name=phone,proto3" json:"phone,omitempty"`
 }
 
-func (x *WorkDesktopMenuReq) Reset() {
-	*x = WorkDesktopMenuReq{}
+func (x *WorkDesktopMenuInfoReq) Reset() {
+	*x = WorkDesktopMenuInfoReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_userCenter_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2273,13 +2273,13 @@ func (x *WorkDesktopMenuReq) Reset() {
 	}
 }
 
-func (x *WorkDesktopMenuReq) String() string {
+func (x *WorkDesktopMenuInfoReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WorkDesktopMenuReq) ProtoMessage() {}
+func (*WorkDesktopMenuInfoReq) ProtoMessage() {}
 
-func (x *WorkDesktopMenuReq) ProtoReflect() protoreflect.Message {
+func (x *WorkDesktopMenuInfoReq) ProtoReflect() protoreflect.Message {
 	mi := &file_userCenter_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2291,33 +2291,33 @@ func (x *WorkDesktopMenuReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WorkDesktopMenuReq.ProtoReflect.Descriptor instead.
-func (*WorkDesktopMenuReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use WorkDesktopMenuInfoReq.ProtoReflect.Descriptor instead.
+func (*WorkDesktopMenuInfoReq) Descriptor() ([]byte, []int) {
 	return file_userCenter_proto_rawDescGZIP(), []int{28}
 }
 
-func (x *WorkDesktopMenuReq) GetUserId() string {
+func (x *WorkDesktopMenuInfoReq) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
 	return ""
 }
 
-func (x *WorkDesktopMenuReq) GetAppId() string {
+func (x *WorkDesktopMenuInfoReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
 	return ""
 }
 
-func (x *WorkDesktopMenuReq) GetPlatform() string {
+func (x *WorkDesktopMenuInfoReq) GetPlatform() string {
 	if x != nil {
 		return x.Platform
 	}
 	return ""
 }
 
-func (x *WorkDesktopMenuReq) GetPhone() string {
+func (x *WorkDesktopMenuInfoReq) GetPhone() string {
 	if x != nil {
 		return x.Phone
 	}
@@ -2325,7 +2325,7 @@ func (x *WorkDesktopMenuReq) GetPhone() string {
 }
 
 //工作桌面-返回数据
-type WorkDesktopMenuResp struct {
+type WorkDesktopMenuInfoResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -2335,8 +2335,8 @@ type WorkDesktopMenuResp struct {
 	Data      *MenuData `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
 }
 
-func (x *WorkDesktopMenuResp) Reset() {
-	*x = WorkDesktopMenuResp{}
+func (x *WorkDesktopMenuInfoResp) Reset() {
+	*x = WorkDesktopMenuInfoResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_userCenter_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2344,13 +2344,13 @@ func (x *WorkDesktopMenuResp) Reset() {
 	}
 }
 
-func (x *WorkDesktopMenuResp) String() string {
+func (x *WorkDesktopMenuInfoResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WorkDesktopMenuResp) ProtoMessage() {}
+func (*WorkDesktopMenuInfoResp) ProtoMessage() {}
 
-func (x *WorkDesktopMenuResp) ProtoReflect() protoreflect.Message {
+func (x *WorkDesktopMenuInfoResp) ProtoReflect() protoreflect.Message {
 	mi := &file_userCenter_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2362,26 +2362,26 @@ func (x *WorkDesktopMenuResp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WorkDesktopMenuResp.ProtoReflect.Descriptor instead.
-func (*WorkDesktopMenuResp) Descriptor() ([]byte, []int) {
+// Deprecated: Use WorkDesktopMenuInfoResp.ProtoReflect.Descriptor instead.
+func (*WorkDesktopMenuInfoResp) Descriptor() ([]byte, []int) {
 	return file_userCenter_proto_rawDescGZIP(), []int{29}
 }
 
-func (x *WorkDesktopMenuResp) GetErrorCode() int64 {
+func (x *WorkDesktopMenuInfoResp) GetErrorCode() int64 {
 	if x != nil {
 		return x.ErrorCode
 	}
 	return 0
 }
 
-func (x *WorkDesktopMenuResp) GetErrorMsg() string {
+func (x *WorkDesktopMenuInfoResp) GetErrorMsg() string {
 	if x != nil {
 		return x.ErrorMsg
 	}
 	return ""
 }
 
-func (x *WorkDesktopMenuResp) GetData() *MenuData {
+func (x *WorkDesktopMenuInfoResp) GetData() *MenuData {
 	if x != nil {
 		return x.Data
 	}
@@ -2783,6 +2783,159 @@ func (x *TipInfo) GetIsShowCancel() bool {
 	return false
 }
 
+//工作桌面 菜单选择类型 全部/可用
+//工作桌面 常用功能更新
+type WorkDesktopComprehensiveReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserId     string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
+	AppId      string `protobuf:"bytes,2,opt,name=appId,proto3" json:"appId,omitempty"`
+	Platform   string `protobuf:"bytes,3,opt,name=platform,proto3" json:"platform,omitempty"`
+	Phone      string `protobuf:"bytes,4,opt,name=phone,proto3" json:"phone,omitempty"`
+	ActionMode string `protobuf:"bytes,5,opt,name=actionMode,proto3" json:"actionMode,omitempty"`
+	MenuMode   string `protobuf:"bytes,6,opt,name=menuMode,proto3" json:"menuMode,omitempty"`
+	MenuIds    string `protobuf:"bytes,7,opt,name=menuIds,proto3" json:"menuIds,omitempty"`
+}
+
+func (x *WorkDesktopComprehensiveReq) Reset() {
+	*x = WorkDesktopComprehensiveReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_userCenter_proto_msgTypes[35]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *WorkDesktopComprehensiveReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WorkDesktopComprehensiveReq) ProtoMessage() {}
+
+func (x *WorkDesktopComprehensiveReq) ProtoReflect() protoreflect.Message {
+	mi := &file_userCenter_proto_msgTypes[35]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use WorkDesktopComprehensiveReq.ProtoReflect.Descriptor instead.
+func (*WorkDesktopComprehensiveReq) Descriptor() ([]byte, []int) {
+	return file_userCenter_proto_rawDescGZIP(), []int{35}
+}
+
+func (x *WorkDesktopComprehensiveReq) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *WorkDesktopComprehensiveReq) GetAppId() string {
+	if x != nil {
+		return x.AppId
+	}
+	return ""
+}
+
+func (x *WorkDesktopComprehensiveReq) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *WorkDesktopComprehensiveReq) GetPhone() string {
+	if x != nil {
+		return x.Phone
+	}
+	return ""
+}
+
+func (x *WorkDesktopComprehensiveReq) GetActionMode() string {
+	if x != nil {
+		return x.ActionMode
+	}
+	return ""
+}
+
+func (x *WorkDesktopComprehensiveReq) GetMenuMode() string {
+	if x != nil {
+		return x.MenuMode
+	}
+	return ""
+}
+
+func (x *WorkDesktopComprehensiveReq) GetMenuIds() string {
+	if x != nil {
+		return x.MenuIds
+	}
+	return ""
+}
+
+//工作桌面 综合功能-返回数据
+type WorkDesktopComprehensiveResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ErrorCode int64  `protobuf:"varint,1,opt,name=error_code,json=errorCode,proto3" json:"error_code,omitempty"`
+	ErrorMsg  string `protobuf:"bytes,2,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"`
+}
+
+func (x *WorkDesktopComprehensiveResp) Reset() {
+	*x = WorkDesktopComprehensiveResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_userCenter_proto_msgTypes[36]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *WorkDesktopComprehensiveResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WorkDesktopComprehensiveResp) ProtoMessage() {}
+
+func (x *WorkDesktopComprehensiveResp) ProtoReflect() protoreflect.Message {
+	mi := &file_userCenter_proto_msgTypes[36]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use WorkDesktopComprehensiveResp.ProtoReflect.Descriptor instead.
+func (*WorkDesktopComprehensiveResp) Descriptor() ([]byte, []int) {
+	return file_userCenter_proto_rawDescGZIP(), []int{36}
+}
+
+func (x *WorkDesktopComprehensiveResp) GetErrorCode() int64 {
+	if x != nil {
+		return x.ErrorCode
+	}
+	return 0
+}
+
+func (x *WorkDesktopComprehensiveResp) GetErrorMsg() string {
+	if x != nil {
+		return x.ErrorMsg
+	}
+	return ""
+}
+
 var File_userCenter_proto protoreflect.FileDescriptor
 
 var file_userCenter_proto_rawDesc = []byte{
@@ -3072,105 +3225,131 @@ var file_userCenter_proto_rawDesc = []byte{
 	0x12, 0x19, 0x0a, 0x08, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x07, 0x61, 0x4f, 0x70, 0x65, 0x6e, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75,
 	0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e,
-	0x69, 0x6f, 0x6e, 0x69, 0x64, 0x22, 0x74, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73,
-	0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
-	0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61,
-	0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61,
-	0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x22, 0x70, 0x0a, 0x13, 0x57,
-	0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64,
-	0x65, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1d,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4d,
-	0x65, 0x6e, 0x75, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x4d, 0x0a,
-	0x08, 0x4d, 0x65, 0x6e, 0x75, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x6e,
-	0x75, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x65, 0x6e,
-	0x75, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x08, 0x6d, 0x65, 0x6e, 0x75, 0x4c, 0x69, 0x73,
-	0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x4c, 0x69,
-	0x73, 0x74, 0x52, 0x08, 0x6d, 0x65, 0x6e, 0x75, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x84, 0x01, 0x0a,
-	0x08, 0x4d, 0x65, 0x6e, 0x75, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f,
-	0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x75, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x26, 0x0a, 0x05, 0x63,
-	0x68, 0x69, 0x6c, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x65, 0x63,
-	0x6f, 0x6e, 0x64, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x05, 0x63, 0x68,
-	0x69, 0x6c, 0x64, 0x22, 0x8a, 0x01, 0x0a, 0x0f, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x4c, 0x65,
-	0x76, 0x65, 0x6c, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69,
-	0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12,
-	0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72,
-	0x6c, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x06, 0x75, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x63, 0x68, 0x69,
-	0x6c, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x54, 0x68, 0x72, 0x65, 0x65,
-	0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64,
-	0x22, 0xd6, 0x01, 0x0a, 0x0e, 0x54, 0x68, 0x72, 0x65, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4d,
-	0x65, 0x6e, 0x75, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x16, 0x0a,
-	0x06, 0x75, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x75,
-	0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x70, 0x70, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x69,
-	0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x22, 0x0a, 0x07, 0x74, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x54, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f,
-	0x52, 0x07, 0x74, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x9f, 0x01, 0x0a, 0x07, 0x54, 0x69,
-	0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d,
-	0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x72, 0x6d, 0x55, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d,
-	0x54, 0x65, 0x78, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x72, 0x6d, 0x54, 0x65, 0x78, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x73, 0x53, 0x68, 0x6f,
-	0x77, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69,
-	0x73, 0x53, 0x68, 0x6f, 0x77, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x32, 0xcb, 0x04, 0x0a, 0x0a,
-	0x55, 0x73, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x07, 0x45, 0x6e,
-	0x74, 0x41, 0x75, 0x74, 0x68, 0x12, 0x0b, 0x2e, 0x45, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x52,
-	0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x27, 0x0a, 0x0a, 0x45, 0x6e, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x12, 0x0b,
-	0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x78,
-	0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x07, 0x45, 0x6e, 0x74,
-	0x4c, 0x69, 0x73, 0x74, 0x12, 0x0b, 0x2e, 0x45, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x30, 0x0a, 0x0b, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0f,
-	0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a,
-	0x10, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x27, 0x0a, 0x08, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x12, 0x0c, 0x2e,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0d, 0x2e, 0x43, 0x68,
-	0x65, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x45, 0x6e,
-	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0c, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x74,
-	0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x6e, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x0d,
-	0x2e, 0x45, 0x6e, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e,
-	0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x0b, 0x45,
-	0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x2e, 0x43, 0x68, 0x65,
-	0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45,
-	0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3c, 0x0a, 0x0f, 0x47, 0x65,
-	0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x13, 0x2e,
-	0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x52,
-	0x65, 0x71, 0x1a, 0x14, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x79,
-	0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72,
-	0x41, 0x64, 0x64, 0x12, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71,
-	0x1a, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26,
-	0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x0a, 0x2e, 0x55,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69,
-	0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65,
-	0x6c, 0x12, 0x0a, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e,
-	0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3c, 0x0a, 0x0f, 0x57,
-	0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x13,
-	0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75,
-	0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f,
-	0x70, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6f, 0x6e, 0x69, 0x64, 0x22, 0x78, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73,
+	0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12,
+	0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a,
+	0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f,
+	0x6e, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x22,
+	0x74, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65,
+	0x6e, 0x75, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72,
+	0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72,
+	0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x4d, 0x0a, 0x08, 0x4d, 0x65, 0x6e, 0x75, 0x44, 0x61, 0x74,
+	0x61, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x6e, 0x75, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x65, 0x6e, 0x75, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a,
+	0x08, 0x6d, 0x65, 0x6e, 0x75, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x09, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x08, 0x6d, 0x65, 0x6e, 0x75,
+	0x4c, 0x69, 0x73, 0x74, 0x22, 0x84, 0x01, 0x0a, 0x08, 0x4d, 0x65, 0x6e, 0x75, 0x4c, 0x69, 0x73,
+	0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x75,
+	0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x75, 0x73, 0x61,
+	0x62, 0x6c, 0x65, 0x12, 0x26, 0x0a, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x4c, 0x65, 0x76, 0x65, 0x6c,
+	0x4d, 0x65, 0x6e, 0x75, 0x52, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x22, 0x8a, 0x01, 0x0a, 0x0f,
+	0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4d, 0x65, 0x6e, 0x75, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x61,
+	0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x75, 0x73, 0x61, 0x62, 0x6c,
+	0x65, 0x12, 0x25, 0x0a, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0f, 0x2e, 0x54, 0x68, 0x72, 0x65, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4d, 0x65, 0x6e,
+	0x75, 0x52, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x22, 0xd6, 0x01, 0x0a, 0x0e, 0x54, 0x68, 0x72,
+	0x65, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69,
+	0x63, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x75, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x18, 0x0a,
+	0x07, 0x61, 0x70, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x61, 0x70, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x22, 0x0a,
+	0x07, 0x74, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
+	0x2e, 0x54, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x74, 0x69, 0x70, 0x49, 0x6e, 0x66,
+	0x6f, 0x22, 0x9f, 0x01, 0x0a, 0x07, 0x54, 0x69, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a,
+	0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69,
+	0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a,
+	0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x55, 0x72, 0x6c, 0x12, 0x20, 0x0a,
+	0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x54, 0x65, 0x78, 0x74, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x54, 0x65, 0x78, 0x74, 0x12,
+	0x22, 0x0a, 0x0c, 0x69, 0x73, 0x53, 0x68, 0x6f, 0x77, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x73, 0x53, 0x68, 0x6f, 0x77, 0x43, 0x61, 0x6e,
+	0x63, 0x65, 0x6c, 0x22, 0xd3, 0x01, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b,
+	0x74, 0x6f, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x68, 0x65, 0x6e, 0x73, 0x69, 0x76, 0x65,
+	0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61,
+	0x70, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49,
+	0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x14, 0x0a,
+	0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68,
+	0x6f, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
+	0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x6e, 0x75, 0x4d, 0x6f, 0x64, 0x65, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x65, 0x6e, 0x75, 0x4d, 0x6f, 0x64, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x6d, 0x65, 0x6e, 0x75, 0x49, 0x64, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x6d, 0x65, 0x6e, 0x75, 0x49, 0x64, 0x73, 0x22, 0x5a, 0x0a, 0x1c, 0x57, 0x6f, 0x72,
+	0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x68, 0x65,
+	0x6e, 0x73, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65,
+	0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x4d, 0x73, 0x67, 0x32, 0xb0, 0x05, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x43, 0x65,
+	0x6e, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x07, 0x45, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x12,
+	0x0b, 0x2e, 0x45, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45,
+	0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x0a, 0x45, 0x6e,
+	0x74, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x12, 0x0b, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69,
+	0x6e, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x07, 0x45, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0b,
+	0x2e, 0x45, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x6e,
+	0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0b, 0x45, 0x78, 0x61,
+	0x6d, 0x69, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0f, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69,
+	0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x45, 0x78, 0x61, 0x6d,
+	0x69, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x08, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x12, 0x0c, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45,
+	0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0d, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x74,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x45, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x0c, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e,
+	0x45, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x09, 0x45,
+	0x6e, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x2e, 0x45, 0x6e, 0x74, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x0b, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d,
+	0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x3c, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x42, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x13, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x42, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x47,
+	0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x24, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x12, 0x0b, 0x2e,
+	0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x0a, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x52,
+	0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x23, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x12, 0x0a, 0x2e, 0x55, 0x73,
+	0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x48, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73,
+	0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x17, 0x2e, 0x57,
+	0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b,
+	0x74, 0x6f, 0x70, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x57, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x43, 0x6f,
+	0x6d, 0x70, 0x72, 0x65, 0x68, 0x65, 0x6e, 0x73, 0x69, 0x76, 0x65, 0x12, 0x1c, 0x2e, 0x57, 0x6f,
+	0x72, 0x6b, 0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x68,
+	0x65, 0x6e, 0x73, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x57, 0x6f, 0x72, 0x6b,
+	0x44, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x68, 0x65, 0x6e,
+	0x73, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3185,43 +3364,45 @@ func file_userCenter_proto_rawDescGZIP() []byte {
 	return file_userCenter_proto_rawDescData
 }
 
-var file_userCenter_proto_msgTypes = make([]protoimpl.MessageInfo, 35)
+var file_userCenter_proto_msgTypes = make([]protoimpl.MessageInfo, 37)
 var file_userCenter_proto_goTypes = []interface{}{
-	(*EntAuthReq)(nil),          // 0: EntAuthReq
-	(*EntAuthResp)(nil),         // 1: EntAuthResp
-	(*EntAuthData)(nil),         // 2: EntAuthData
-	(*ExamineReq)(nil),          // 3: ExamineReq
-	(*ExamineResp)(nil),         // 4: ExamineResp
-	(*ExamineData)(nil),         // 5: ExamineData
-	(*EntListReq)(nil),          // 6: EntListReq
-	(*EntListResp)(nil),         // 7: EntListResp
-	(*EntData)(nil),             // 8: EntData
-	(*EntList)(nil),             // 9: EntList
-	(*ExamineListReq)(nil),      // 10: ExamineListReq
-	(*ExamineListResp)(nil),     // 11: ExamineListResp
-	(*ExamineListData)(nil),     // 12: ExamineListData
-	(*ExamineList)(nil),         // 13: ExamineList
-	(*CheckEntReq)(nil),         // 14: CheckEntReq
-	(*CheckEntResp)(nil),        // 15: CheckEntResp
-	(*CheckData)(nil),           // 16: checkData
-	(*EntInfoResp)(nil),         // 17: EntInfoResp
-	(*EntInfoData)(nil),         // 18: EntInfoData
-	(*EntUpdateReq)(nil),        // 19: EntUpdateReq
-	(*CheckExamineReq)(nil),     // 20: CheckExamineReq
-	(*GetStatusByCodeReq)(nil),  // 21: GetStatusByCodeReq
-	(*GetStatusByCodeResp)(nil), // 22: GetStatusByCodeResp
-	(*GetStatusByCode)(nil),     // 23: GetStatusByCode
-	(*UserAddReq)(nil),          // 24: UserAddReq
-	(*UserAddResp)(nil),         // 25: UserAddResp
-	(*UserAdds)(nil),            // 26: UserAdds
-	(*UserIdReq)(nil),           // 27: UserIdReq
-	(*WorkDesktopMenuReq)(nil),  // 28: WorkDesktopMenuReq
-	(*WorkDesktopMenuResp)(nil), // 29: WorkDesktopMenuResp
-	(*MenuData)(nil),            // 30: MenuData
-	(*MenuList)(nil),            // 31: MenuList
-	(*SecondLevelMenu)(nil),     // 32: SecondLevelMenu
-	(*ThreeLevelMenu)(nil),      // 33: ThreeLevelMenu
-	(*TipInfo)(nil),             // 34: TipInfo
+	(*EntAuthReq)(nil),                   // 0: EntAuthReq
+	(*EntAuthResp)(nil),                  // 1: EntAuthResp
+	(*EntAuthData)(nil),                  // 2: EntAuthData
+	(*ExamineReq)(nil),                   // 3: ExamineReq
+	(*ExamineResp)(nil),                  // 4: ExamineResp
+	(*ExamineData)(nil),                  // 5: ExamineData
+	(*EntListReq)(nil),                   // 6: EntListReq
+	(*EntListResp)(nil),                  // 7: EntListResp
+	(*EntData)(nil),                      // 8: EntData
+	(*EntList)(nil),                      // 9: EntList
+	(*ExamineListReq)(nil),               // 10: ExamineListReq
+	(*ExamineListResp)(nil),              // 11: ExamineListResp
+	(*ExamineListData)(nil),              // 12: ExamineListData
+	(*ExamineList)(nil),                  // 13: ExamineList
+	(*CheckEntReq)(nil),                  // 14: CheckEntReq
+	(*CheckEntResp)(nil),                 // 15: CheckEntResp
+	(*CheckData)(nil),                    // 16: checkData
+	(*EntInfoResp)(nil),                  // 17: EntInfoResp
+	(*EntInfoData)(nil),                  // 18: EntInfoData
+	(*EntUpdateReq)(nil),                 // 19: EntUpdateReq
+	(*CheckExamineReq)(nil),              // 20: CheckExamineReq
+	(*GetStatusByCodeReq)(nil),           // 21: GetStatusByCodeReq
+	(*GetStatusByCodeResp)(nil),          // 22: GetStatusByCodeResp
+	(*GetStatusByCode)(nil),              // 23: GetStatusByCode
+	(*UserAddReq)(nil),                   // 24: UserAddReq
+	(*UserAddResp)(nil),                  // 25: UserAddResp
+	(*UserAdds)(nil),                     // 26: UserAdds
+	(*UserIdReq)(nil),                    // 27: UserIdReq
+	(*WorkDesktopMenuInfoReq)(nil),       // 28: WorkDesktopMenuInfoReq
+	(*WorkDesktopMenuInfoResp)(nil),      // 29: WorkDesktopMenuInfoResp
+	(*MenuData)(nil),                     // 30: MenuData
+	(*MenuList)(nil),                     // 31: MenuList
+	(*SecondLevelMenu)(nil),              // 32: SecondLevelMenu
+	(*ThreeLevelMenu)(nil),               // 33: ThreeLevelMenu
+	(*TipInfo)(nil),                      // 34: TipInfo
+	(*WorkDesktopComprehensiveReq)(nil),  // 35: WorkDesktopComprehensiveReq
+	(*WorkDesktopComprehensiveResp)(nil), // 36: WorkDesktopComprehensiveResp
 }
 var file_userCenter_proto_depIdxs = []int32{
 	2,  // 0: EntAuthResp.data:type_name -> EntAuthData
@@ -3234,7 +3415,7 @@ var file_userCenter_proto_depIdxs = []int32{
 	18, // 7: EntInfoResp.data:type_name -> EntInfoData
 	23, // 8: GetStatusByCodeResp.data:type_name -> GetStatusByCode
 	26, // 9: UserAddResp.data:type_name -> UserAdds
-	30, // 10: WorkDesktopMenuResp.data:type_name -> MenuData
+	30, // 10: WorkDesktopMenuInfoResp.data:type_name -> MenuData
 	31, // 11: MenuData.menuList:type_name -> MenuList
 	32, // 12: MenuList.child:type_name -> SecondLevelMenu
 	33, // 13: SecondLevelMenu.child:type_name -> ThreeLevelMenu
@@ -3251,22 +3432,24 @@ var file_userCenter_proto_depIdxs = []int32{
 	24, // 24: UserCenter.UserAdd:input_type -> UserAddReq
 	27, // 25: UserCenter.UserUpdate:input_type -> UserIdReq
 	27, // 26: UserCenter.UserDel:input_type -> UserIdReq
-	28, // 27: UserCenter.WorkDesktopMenu:input_type -> WorkDesktopMenuReq
-	1,  // 28: UserCenter.EntAuth:output_type -> EntAuthResp
-	4,  // 29: UserCenter.EntExamine:output_type -> ExamineResp
-	7,  // 30: UserCenter.EntList:output_type -> EntListResp
-	11, // 31: UserCenter.ExamineList:output_type -> ExamineListResp
-	15, // 32: UserCenter.CheckEnt:output_type -> CheckEntResp
-	17, // 33: UserCenter.EntInfo:output_type -> EntInfoResp
-	4,  // 34: UserCenter.EntUpdate:output_type -> ExamineResp
-	17, // 35: UserCenter.ExamineInfo:output_type -> EntInfoResp
-	22, // 36: UserCenter.GetStatusByCode:output_type -> GetStatusByCodeResp
-	25, // 37: UserCenter.UserAdd:output_type -> UserAddResp
-	4,  // 38: UserCenter.UserUpdate:output_type -> ExamineResp
-	4,  // 39: UserCenter.UserDel:output_type -> ExamineResp
-	29, // 40: UserCenter.WorkDesktopMenu:output_type -> WorkDesktopMenuResp
-	28, // [28:41] is the sub-list for method output_type
-	15, // [15:28] is the sub-list for method input_type
+	28, // 27: UserCenter.WorkDesktopMenuInfo:input_type -> WorkDesktopMenuInfoReq
+	35, // 28: UserCenter.WorkDesktopComprehensive:input_type -> WorkDesktopComprehensiveReq
+	1,  // 29: UserCenter.EntAuth:output_type -> EntAuthResp
+	4,  // 30: UserCenter.EntExamine:output_type -> ExamineResp
+	7,  // 31: UserCenter.EntList:output_type -> EntListResp
+	11, // 32: UserCenter.ExamineList:output_type -> ExamineListResp
+	15, // 33: UserCenter.CheckEnt:output_type -> CheckEntResp
+	17, // 34: UserCenter.EntInfo:output_type -> EntInfoResp
+	4,  // 35: UserCenter.EntUpdate:output_type -> ExamineResp
+	17, // 36: UserCenter.ExamineInfo:output_type -> EntInfoResp
+	22, // 37: UserCenter.GetStatusByCode:output_type -> GetStatusByCodeResp
+	25, // 38: UserCenter.UserAdd:output_type -> UserAddResp
+	4,  // 39: UserCenter.UserUpdate:output_type -> ExamineResp
+	4,  // 40: UserCenter.UserDel:output_type -> ExamineResp
+	29, // 41: UserCenter.WorkDesktopMenuInfo:output_type -> WorkDesktopMenuInfoResp
+	36, // 42: UserCenter.WorkDesktopComprehensive:output_type -> WorkDesktopComprehensiveResp
+	29, // [29:43] is the sub-list for method output_type
+	15, // [15:29] is the sub-list for method input_type
 	15, // [15:15] is the sub-list for extension type_name
 	15, // [15:15] is the sub-list for extension extendee
 	0,  // [0:15] is the sub-list for field type_name
@@ -3615,7 +3798,7 @@ func file_userCenter_proto_init() {
 			}
 		}
 		file_userCenter_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WorkDesktopMenuReq); i {
+			switch v := v.(*WorkDesktopMenuInfoReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3627,7 +3810,7 @@ func file_userCenter_proto_init() {
 			}
 		}
 		file_userCenter_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WorkDesktopMenuResp); i {
+			switch v := v.(*WorkDesktopMenuInfoResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3698,6 +3881,30 @@ func file_userCenter_proto_init() {
 				return nil
 			}
 		}
+		file_userCenter_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WorkDesktopComprehensiveReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_userCenter_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WorkDesktopComprehensiveResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -3705,7 +3912,7 @@ func file_userCenter_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_userCenter_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   35,
+			NumMessages:   37,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

rpc/pb/userCenter_grpc.pb.go

@@ -47,7 +47,9 @@ type UserCenterClient interface {
 	//删除用户
 	UserDel(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error)
 	//获取菜单树
-	WorkDesktopMenu(ctx context.Context, in *WorkDesktopMenuReq, opts ...grpc.CallOption) (*WorkDesktopMenuResp, error)
+	WorkDesktopMenuInfo(ctx context.Context, in *WorkDesktopMenuInfoReq, opts ...grpc.CallOption) (*WorkDesktopMenuInfoResp, error)
+	//菜单选择模式
+	WorkDesktopComprehensive(ctx context.Context, in *WorkDesktopComprehensiveReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error)
 }
 
 type userCenterClient struct {
@@ -166,9 +168,18 @@ func (c *userCenterClient) UserDel(ctx context.Context, in *UserIdReq, opts ...g
 	return out, nil
 }
 
-func (c *userCenterClient) WorkDesktopMenu(ctx context.Context, in *WorkDesktopMenuReq, opts ...grpc.CallOption) (*WorkDesktopMenuResp, error) {
-	out := new(WorkDesktopMenuResp)
-	err := c.cc.Invoke(ctx, "/UserCenter/WorkDesktopMenu", in, out, opts...)
+func (c *userCenterClient) WorkDesktopMenuInfo(ctx context.Context, in *WorkDesktopMenuInfoReq, opts ...grpc.CallOption) (*WorkDesktopMenuInfoResp, error) {
+	out := new(WorkDesktopMenuInfoResp)
+	err := c.cc.Invoke(ctx, "/UserCenter/WorkDesktopMenuInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userCenterClient) WorkDesktopComprehensive(ctx context.Context, in *WorkDesktopComprehensiveReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error) {
+	out := new(WorkDesktopComprehensiveResp)
+	err := c.cc.Invoke(ctx, "/UserCenter/WorkDesktopComprehensive", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -204,7 +215,9 @@ type UserCenterServer interface {
 	//删除用户
 	UserDel(context.Context, *UserIdReq) (*ExamineResp, error)
 	//获取菜单树
-	WorkDesktopMenu(context.Context, *WorkDesktopMenuReq) (*WorkDesktopMenuResp, error)
+	WorkDesktopMenuInfo(context.Context, *WorkDesktopMenuInfoReq) (*WorkDesktopMenuInfoResp, error)
+	//菜单选择模式
+	WorkDesktopComprehensive(context.Context, *WorkDesktopComprehensiveReq) (*WorkDesktopComprehensiveResp, error)
 	mustEmbedUnimplementedUserCenterServer()
 }
 
@@ -248,8 +261,11 @@ func (UnimplementedUserCenterServer) UserUpdate(context.Context, *UserIdReq) (*E
 func (UnimplementedUserCenterServer) UserDel(context.Context, *UserIdReq) (*ExamineResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserDel not implemented")
 }
-func (UnimplementedUserCenterServer) WorkDesktopMenu(context.Context, *WorkDesktopMenuReq) (*WorkDesktopMenuResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method WorkDesktopMenu not implemented")
+func (UnimplementedUserCenterServer) WorkDesktopMenuInfo(context.Context, *WorkDesktopMenuInfoReq) (*WorkDesktopMenuInfoResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method WorkDesktopMenuInfo not implemented")
+}
+func (UnimplementedUserCenterServer) WorkDesktopComprehensive(context.Context, *WorkDesktopComprehensiveReq) (*WorkDesktopComprehensiveResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method WorkDesktopComprehensive not implemented")
 }
 func (UnimplementedUserCenterServer) mustEmbedUnimplementedUserCenterServer() {}
 
@@ -480,20 +496,38 @@ func _UserCenter_UserDel_Handler(srv interface{}, ctx context.Context, dec func(
 	return interceptor(ctx, in, info, handler)
 }
 
-func _UserCenter_WorkDesktopMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WorkDesktopMenuReq)
+func _UserCenter_WorkDesktopMenuInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(WorkDesktopMenuInfoReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserCenterServer).WorkDesktopMenuInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/UserCenter/WorkDesktopMenuInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserCenterServer).WorkDesktopMenuInfo(ctx, req.(*WorkDesktopMenuInfoReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _UserCenter_WorkDesktopComprehensive_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(WorkDesktopComprehensiveReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(UserCenterServer).WorkDesktopMenu(ctx, in)
+		return srv.(UserCenterServer).WorkDesktopComprehensive(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/WorkDesktopMenu",
+		FullMethod: "/UserCenter/WorkDesktopComprehensive",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).WorkDesktopMenu(ctx, req.(*WorkDesktopMenuReq))
+		return srv.(UserCenterServer).WorkDesktopComprehensive(ctx, req.(*WorkDesktopComprehensiveReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -554,8 +588,12 @@ var UserCenter_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _UserCenter_UserDel_Handler,
 		},
 		{
-			MethodName: "WorkDesktopMenu",
-			Handler:    _UserCenter_WorkDesktopMenu_Handler,
+			MethodName: "WorkDesktopMenuInfo",
+			Handler:    _UserCenter_WorkDesktopMenuInfo_Handler,
+		},
+		{
+			MethodName: "WorkDesktopComprehensive",
+			Handler:    _UserCenter_WorkDesktopComprehensive_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},

rpc/userCenter.proto

@@ -241,7 +241,7 @@ message UserIdReq {
 }
 
 //工作桌面
-message WorkDesktopMenuReq{
+message WorkDesktopMenuInfoReq{
   string userId = 1;
   string appId = 2;
   string platform = 3;
@@ -249,7 +249,7 @@ message WorkDesktopMenuReq{
 }
 
 //工作桌面-返回数据
-message WorkDesktopMenuResp{
+message WorkDesktopMenuInfoResp{
   int64   error_code = 1;
   string  error_msg = 2;
   MenuData data = 3;
@@ -283,8 +283,7 @@ message  ThreeLevelMenu{
   bool usable = 4;
   string appType = 5;
   string openType = 6;
-  bool isCheck = 7;
-  TipInfo tipInfo = 8;
+  TipInfo tipInfo = 7;
 }
 
 message TipInfo {
@@ -295,6 +294,23 @@ message TipInfo {
   bool isShowCancel = 5;
 }
 
+//工作桌面 菜单选择类型 全部/可用
+//工作桌面 常用功能更新
+message WorkDesktopComprehensiveReq{
+  string userId = 1;
+  string appId = 2;
+  string platform = 3;
+  string phone = 4;
+  string actionMode = 5;
+  string menuMode = 6;
+  string menuIds = 7;
+}
+//工作桌面 综合功能-返回数据
+message WorkDesktopComprehensiveResp{
+  int64   error_code = 1;
+  string  error_msg = 2;
+}
+
 service UserCenter {
   //企业认证
   rpc EntAuth (EntAuthReq) returns (EntAuthResp);
@@ -322,5 +338,7 @@ service UserCenter {
   rpc UserDel (UserIdReq) returns (ExamineResp);
 
   //获取菜单树
-  rpc WorkDesktopMenu (WorkDesktopMenuReq) returns (WorkDesktopMenuResp);
+  rpc WorkDesktopMenuInfo (WorkDesktopMenuInfoReq) returns (WorkDesktopMenuInfoResp);
+  //菜单选择模式
+  rpc WorkDesktopComprehensive (WorkDesktopComprehensiveReq) returns (WorkDesktopComprehensiveResp);
 }

rpc/usercenter/usercenter.go

@@ -13,41 +13,43 @@ import (
 )
 
 type (
-	CheckData           = pb.CheckData
-	CheckEntReq         = pb.CheckEntReq
-	CheckEntResp        = pb.CheckEntResp
-	CheckExamineReq     = pb.CheckExamineReq
-	EntAuthData         = pb.EntAuthData
-	EntAuthReq          = pb.EntAuthReq
-	EntAuthResp         = pb.EntAuthResp
-	EntData             = pb.EntData
-	EntInfoData         = pb.EntInfoData
-	EntInfoResp         = pb.EntInfoResp
-	EntList             = pb.EntList
-	EntListReq          = pb.EntListReq
-	EntListResp         = pb.EntListResp
-	EntUpdateReq        = pb.EntUpdateReq
-	ExamineData         = pb.ExamineData
-	ExamineList         = pb.ExamineList
-	ExamineListData     = pb.ExamineListData
-	ExamineListReq      = pb.ExamineListReq
-	ExamineListResp     = pb.ExamineListResp
-	ExamineReq          = pb.ExamineReq
-	ExamineResp         = pb.ExamineResp
-	GetStatusByCode     = pb.GetStatusByCode
-	GetStatusByCodeReq  = pb.GetStatusByCodeReq
-	GetStatusByCodeResp = pb.GetStatusByCodeResp
-	MenuData            = pb.MenuData
-	MenuList            = pb.MenuList
-	SecondLevelMenu     = pb.SecondLevelMenu
-	ThreeLevelMenu      = pb.ThreeLevelMenu
-	TipInfo             = pb.TipInfo
-	UserAddReq          = pb.UserAddReq
-	UserAddResp         = pb.UserAddResp
-	UserAdds            = pb.UserAdds
-	UserIdReq           = pb.UserIdReq
-	WorkDesktopMenuReq  = pb.WorkDesktopMenuReq
-	WorkDesktopMenuResp = pb.WorkDesktopMenuResp
+	CheckData                    = pb.CheckData
+	CheckEntReq                  = pb.CheckEntReq
+	CheckEntResp                 = pb.CheckEntResp
+	CheckExamineReq              = pb.CheckExamineReq
+	EntAuthData                  = pb.EntAuthData
+	EntAuthReq                   = pb.EntAuthReq
+	EntAuthResp                  = pb.EntAuthResp
+	EntData                      = pb.EntData
+	EntInfoData                  = pb.EntInfoData
+	EntInfoResp                  = pb.EntInfoResp
+	EntList                      = pb.EntList
+	EntListReq                   = pb.EntListReq
+	EntListResp                  = pb.EntListResp
+	EntUpdateReq                 = pb.EntUpdateReq
+	ExamineData                  = pb.ExamineData
+	ExamineList                  = pb.ExamineList
+	ExamineListData              = pb.ExamineListData
+	ExamineListReq               = pb.ExamineListReq
+	ExamineListResp              = pb.ExamineListResp
+	ExamineReq                   = pb.ExamineReq
+	ExamineResp                  = pb.ExamineResp
+	GetStatusByCode              = pb.GetStatusByCode
+	GetStatusByCodeReq           = pb.GetStatusByCodeReq
+	GetStatusByCodeResp          = pb.GetStatusByCodeResp
+	MenuData                     = pb.MenuData
+	MenuList                     = pb.MenuList
+	SecondLevelMenu              = pb.SecondLevelMenu
+	ThreeLevelMenu               = pb.ThreeLevelMenu
+	TipInfo                      = pb.TipInfo
+	UserAddReq                   = pb.UserAddReq
+	UserAddResp                  = pb.UserAddResp
+	UserAdds                     = pb.UserAdds
+	UserIdReq                    = pb.UserIdReq
+	WorkDesktopComprehensiveReq  = pb.WorkDesktopComprehensiveReq
+	WorkDesktopComprehensiveResp = pb.WorkDesktopComprehensiveResp
+	WorkDesktopMenuInfoReq       = pb.WorkDesktopMenuInfoReq
+	WorkDesktopMenuInfoResp      = pb.WorkDesktopMenuInfoResp
 
 	UserCenter interface {
 		// 企业认证
@@ -75,7 +77,9 @@ type (
 		// 删除用户
 		UserDel(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error)
 		// 获取菜单树
-		WorkDesktopMenu(ctx context.Context, in *WorkDesktopMenuReq, opts ...grpc.CallOption) (*WorkDesktopMenuResp, error)
+		WorkDesktopMenuInfo(ctx context.Context, in *WorkDesktopMenuInfoReq, opts ...grpc.CallOption) (*WorkDesktopMenuInfoResp, error)
+		// 菜单选择模式
+		WorkDesktopComprehensive(ctx context.Context, in *WorkDesktopComprehensiveReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error)
 	}
 
 	defaultUserCenter struct {
@@ -162,7 +166,13 @@ func (m *defaultUserCenter) UserDel(ctx context.Context, in *UserIdReq, opts ...
 }
 
 // 获取菜单树
-func (m *defaultUserCenter) WorkDesktopMenu(ctx context.Context, in *WorkDesktopMenuReq, opts ...grpc.CallOption) (*WorkDesktopMenuResp, error) {
+func (m *defaultUserCenter) WorkDesktopMenuInfo(ctx context.Context, in *WorkDesktopMenuInfoReq, opts ...grpc.CallOption) (*WorkDesktopMenuInfoResp, error) {
 	client := pb.NewUserCenterClient(m.cli.Conn())
-	return client.WorkDesktopMenu(ctx, in, opts...)
+	return client.WorkDesktopMenuInfo(ctx, in, opts...)
+}
+
+// 菜单选择模式
+func (m *defaultUserCenter) WorkDesktopComprehensive(ctx context.Context, in *WorkDesktopComprehensiveReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error) {
+	client := pb.NewUserCenterClient(m.cli.Conn())
+	return client.WorkDesktopComprehensive(ctx, in, opts...)
 }

service/workDesktop.go

@@ -13,20 +13,54 @@ import (
 	. "userCenter/rpc/usercenter"
 )
 
-//获取工作桌面菜单当前选择模式--全部/可用
-func GetWorkDesktopMenuMode(in *WorkDesktopMenuReq) string {
-	logx.Info("_______________________")
-	menuModes := entity.BaseMysql.SelectBySql(`SELECT value FROM work_commonly WHERE appid=? AND userid=? AND field = 'navigation' LIMIT 1`, in.AppId, in.UserId)
-	logx.Info("_______________________")
-	if menuModes != nil && len(*menuModes) > 0 {
-		menuMode := (*menuModes)[0]
-		return MC.ObjToString(menuMode["value"])
+//工作桌面--菜单当前选择模式--全部:all/可用:usable
+//工作桌面--常用功能更新
+func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *WorkDesktopComprehensiveResp) {
+	//
+	r = &WorkDesktopComprehensiveResp{}
+	switch in.ActionMode {
+	case "commonly": //常用功能更新
+		//in.MenuIds  为空；删除
+		if in.MenuIds == "" {
+			if !func() bool {
+				if entity.BaseMysql.CountBySql(`SELECT COUNT(id)  FROM `+entity.WorkCommonly+` WHERE userid = '?' AND appid = ? AND platform = '?' AND field = ?`, in.UserId, in.AppId, in.Platform, in.ActionMode) > 0 {
+					return entity.BaseMysql.UpdateOrDeleteBySql(`DELETE  FROM `+entity.WorkCommonly+` WHERE userid = '?' AND appid = ? AND platform = '?' AND field = ?`, in.UserId, in.AppId, in.Platform, in.ActionMode) > 0
+				}
+				return true
+			}() {
+				r.ErrorCode = -1
+				r.ErrorMsg = "常用功能-清空常用功能异常"
+			}
+		} else {
+			//in.MenuIds 不为空：更新
+			if b, m := entity.CommonlyUpdate(in); !b {
+				r.ErrorCode = -1
+				r.ErrorMsg = m
+			}
+		}
+
+	case "menuMode": //菜单模式更新
+		if in.MenuMode == "" || (in.MenuMode != "usable" && in.MenuMode != "all") {
+			r.ErrorCode = -1
+			r.ErrorMsg = "菜单模式-参数异常"
+		} else {
+			menuModes := entity.BaseMysql.SelectBySql(`SELECT id,value FROM `+entity.WorkCommonly+` WHERE appid=? AND userid=? AND field = ? AND platform = ? LIMIT 1`, in.AppId, in.UserId, in.ActionMode, in.Platform)
+			if menuModes != nil && len(*menuModes) > 0 {
+				menuMode := (*menuModes)[0]
+				if MC.ObjToString(menuMode["value"]) != in.MenuMode {
+					if entity.BaseMysql.UpdateOrDeleteBySql(`UPDATE `+entity.WorkCommonly+` SET value = ? WHERE id = ?`, in.MenuMode, MC.IntAll(menuMode["id"])) < 0 {
+						r.ErrorCode = -1
+						r.ErrorMsg = "菜单模式-更新异常"
+					}
+				}
+			}
+		}
 	}
-	return "all"
+	return
 }
 
 //获取工作桌面菜单树
-func GetWordDesktopMenuTree(in *WorkDesktopMenuReq, redisOutTime int, bigMemberOff bool) ([]*pb.MenuList, error) {
+func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq, redisOutTime int, bigMemberOff bool) ([]*pb.MenuList, error) {
 	t1 := time.Now()
 	//redis缓存
 	var menuList []*pb.MenuList
@@ -38,7 +72,7 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuReq, redisOutTime int, bigMemberO
 		}
 	}
 	//tidb数据
-	menuData := entity.BaseMysql.SelectBySql(`SELECT * FROM work_menu WHERE status=0 AND appid=? ORDER BY id ASC`, in.AppId)
+	menuData := entity.BaseMysql.SelectBySql(`SELECT * FROM `+entity.WorkCommonly+` WHERE status=0 AND appid=? ORDER BY id ASC`, in.AppId)
 	if menuData == nil || len(*menuData) == 0 {
 		return nil, errors.New("查询数据异常")
 	}