默认值新增

jyBXSubscribe/api/bxsubscribe.api

@@ -51,6 +51,7 @@ type (
 		Err_code int64       `json:"error_code"`
 		Err_msg  string      `json:"error_msg"`
 		Data     interface{} `json:"data"`
+		TimeData interface{} `json:"timeData"`
 	}
 	//
 	subscribeUpdateReq {
@@ -178,7 +179,7 @@ service bxsubscribe-api {
 	@handler setUser  //设置用户信息
 	post /jybx/subscribe/setUser (SetUserReq) returns (commonResp)
 	@handler getPushSet  //推送设置查询
-	post /jybx/subscribe/getPushSet (SetPushSetReq) returns (commonResp)
+	post /jybx/subscribe/getPushSet (GetUserReq) returns (commonResp)
 	@handler setPushSet  //推送设置修改
-	post /jybx/subscribe/setPushSet (GetUserReq) returns (commonResp)
+	post /jybx/subscribe/setPushSet (SetPushSetReq) returns (commonResp)
 }

jyBXSubscribe/api/internal/logic/getPushSetLogic.go

@@ -46,5 +46,6 @@ func (l *GetPushSetLogic) GetPushSet(req *types.GetUserReq) (*types.CommonResp,
 		Err_code: res.ErrorCode,
 		Err_msg:  res.ErrorMsg,
 		Data:     res.Data,
+		TimeData: res.TimeData,
 	}, nil
 }

jyBXSubscribe/api/internal/types/types.go

@@ -43,6 +43,7 @@ type CommonResp struct {
 	Err_code int64       `json:"error_code"`
 	Err_msg  string      `json:"error_msg"`
 	Data     interface{} `json:"data"`
+	TimeData interface{} `json:"timeData"`
 }
 
 type SubscribeUpdateReq struct {

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -315,8 +315,12 @@ message GetPushSetReq{
 
 message GetPushSetResp{
   map<string, PushSet> data = 1;
-  string error_msg = 2;
-  int64 error_code = 3;
+  map<int64,TimeJson> timeData=3;
+  string error_msg = 4;
+  int64 error_code = 5;
+}
+message  TimeJson{
+  repeated  string a_times = 1;
 }
 message PushSet{
   repeated  string a_times = 1;

jyBXSubscribe/rpc/bxsubscribe/bxsubscribe.go

@@ -44,6 +44,7 @@ type (
 	SubscribeInfo          = bxsubscribe.SubscribeInfo
 	SubscribeInfosReq      = bxsubscribe.SubscribeInfosReq
 	SubscribeInfosResp     = bxsubscribe.SubscribeInfosResp
+	TimeJson               = bxsubscribe.TimeJson
 	UpdateSubScribeInfoReq = bxsubscribe.UpdateSubScribeInfoReq
 	UserReq                = bxsubscribe.UserReq
 	UserResp               = bxsubscribe.UserResp

jyBXSubscribe/rpc/internal/logic/getpushsetlogic.go

@@ -6,6 +6,7 @@ import (
 	"jyBXSubscribe/rpc/internal/svc"
 	"jyBXSubscribe/rpc/model/service"
 	"jyBXSubscribe/rpc/type/bxsubscribe"
+	"jyBXSubscribe/rpc/util"
 )
 
 type GetPushSetLogic struct {
@@ -34,9 +35,14 @@ func (l *GetPushSetLogic) GetPushSet(in *bxsubscribe.GetPushSetReq) (*bxsubscrib
 		BaseUserId:   in.BaseUserId,
 		PositionId:   in.PositionId,
 	}
+	TimeData := map[int64]*bxsubscribe.TimeJson{}
+	for k, v := range util.TimeMap {
+		TimeData[int64(k)] = &bxsubscribe.TimeJson{ATimes: v}
+	}
 	pushSet := subService.Find()
 	return &bxsubscribe.GetPushSetResp{
-		Data: pushSet,
+		Data:     pushSet,
+		TimeData: TimeData,
 	}, nil
 
 }

jyBXSubscribe/rpc/internal/logic/userinfologic.go

@@ -69,7 +69,7 @@ func (l *UserInfoLogic) UserInfo(in *bxsubscribe.GetUserInfoReq) (*bxsubscribe.G
 			Mail:   s_email,
 			ShowWx: ShowWx,
 			ImgUrl: fmt.Sprintf("/publicapply/getERCode/%s", bindKey), //二维码地址
-			AppUrl: fmt.Sprintf(IC.C.AppUrl, "push_set", "pc-pushsettings-app"),
+			AppUrl: fmt.Sprintf(IC.C.AppUrl, "push_set", "pc-pushsettings"),
 		},
 	}, nil
 }

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -112,7 +112,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp) (bool,
 	case "o_subset":
 		if data == nil || len(*data) == 0 {
 			returnData = &bxsubscribe.PushSet{
-				ATimes:    []string{"09:00", "14:00"},
+				ATimes:    util.TimeMap[2],
 				IApppush:  1,
 				IWxpush:   1,
 				IMailpush: 0,
@@ -121,7 +121,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp) (bool,
 			}
 		} else {
 			returnData = &bxsubscribe.PushSet{
-				ATimes:    common.If((*data)["i_ratemode"] == nil, []string{"09:00"}, a_times).([]string),
+				ATimes:    common.If((*data)["i_ratemode"] == nil, util.TimeMap[2], a_times).([]string),
 				IApppush:  common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
 				IWxpush:   common.Int64All(common.If((*data)["i_wxpush"] == nil, 1, (*data)["i_wxpush"])),
 				IMailpush: common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),

jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe.pb.go

@@ -3088,8 +3088,9 @@ type GetPushSetResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	Data      map[string]*PushSet `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	ErrorMsg  string              `protobuf:"bytes,2,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"`
-	ErrorCode int64               `protobuf:"varint,3,opt,name=error_code,json=errorCode,proto3" json:"error_code,omitempty"`
+	TimeData  map[int64]*TimeJson `protobuf:"bytes,3,rep,name=timeData,proto3" json:"timeData,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ErrorMsg  string              `protobuf:"bytes,4,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"`
+	ErrorCode int64               `protobuf:"varint,5,opt,name=error_code,json=errorCode,proto3" json:"error_code,omitempty"`
 }
 
 func (x *GetPushSetResp) Reset() {
@@ -3131,6 +3132,13 @@ func (x *GetPushSetResp) GetData() map[string]*PushSet {
 	return nil
 }
 
+func (x *GetPushSetResp) GetTimeData() map[int64]*TimeJson {
+	if x != nil {
+		return x.TimeData
+	}
+	return nil
+}
+
 func (x *GetPushSetResp) GetErrorMsg() string {
 	if x != nil {
 		return x.ErrorMsg
@@ -3145,6 +3153,53 @@ func (x *GetPushSetResp) GetErrorCode() int64 {
 	return 0
 }
 
+type TimeJson struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ATimes []string `protobuf:"bytes,1,rep,name=a_times,json=aTimes,proto3" json:"a_times,omitempty"`
+}
+
+func (x *TimeJson) Reset() {
+	*x = TimeJson{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bxsubscribe_proto_msgTypes[36]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TimeJson) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TimeJson) ProtoMessage() {}
+
+func (x *TimeJson) ProtoReflect() protoreflect.Message {
+	mi := &file_bxsubscribe_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 TimeJson.ProtoReflect.Descriptor instead.
+func (*TimeJson) Descriptor() ([]byte, []int) {
+	return file_bxsubscribe_proto_rawDescGZIP(), []int{36}
+}
+
+func (x *TimeJson) GetATimes() []string {
+	if x != nil {
+		return x.ATimes
+	}
+	return nil
+}
+
 type PushSet struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3162,7 +3217,7 @@ type PushSet struct {
 func (x *PushSet) Reset() {
 	*x = PushSet{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_bxsubscribe_proto_msgTypes[36]
+		mi := &file_bxsubscribe_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3175,7 +3230,7 @@ func (x *PushSet) String() string {
 func (*PushSet) ProtoMessage() {}
 
 func (x *PushSet) ProtoReflect() protoreflect.Message {
-	mi := &file_bxsubscribe_proto_msgTypes[36]
+	mi := &file_bxsubscribe_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3188,7 +3243,7 @@ func (x *PushSet) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PushSet.ProtoReflect.Descriptor instead.
 func (*PushSet) Descriptor() ([]byte, []int) {
-	return file_bxsubscribe_proto_rawDescGZIP(), []int{36}
+	return file_bxsubscribe_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *PushSet) GetATimes() []string {
@@ -3262,7 +3317,7 @@ type SetPushSetReq struct {
 func (x *SetPushSetReq) Reset() {
 	*x = SetPushSetReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_bxsubscribe_proto_msgTypes[37]
+		mi := &file_bxsubscribe_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3275,7 +3330,7 @@ func (x *SetPushSetReq) String() string {
 func (*SetPushSetReq) ProtoMessage() {}
 
 func (x *SetPushSetReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxsubscribe_proto_msgTypes[37]
+	mi := &file_bxsubscribe_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3288,7 +3343,7 @@ func (x *SetPushSetReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SetPushSetReq.ProtoReflect.Descriptor instead.
 func (*SetPushSetReq) Descriptor() ([]byte, []int) {
-	return file_bxsubscribe_proto_rawDescGZIP(), []int{37}
+	return file_bxsubscribe_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *SetPushSetReq) GetAppId() string {
@@ -3790,20 +3845,32 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
 	0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x62, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
-	0x49, 0x64, 0x22, 0xd6, 0x01, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x73, 0x68, 0x53, 0x65,
+	0x49, 0x64, 0x22, 0xf1, 0x02, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x73, 0x68, 0x53, 0x65,
 	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x39, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
 	0x65, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70,
 	0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	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,
-	0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x1a, 0x4d, 0x0a, 0x09,
-	0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x62, 0x78, 0x73,
-	0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd4, 0x01, 0x0a, 0x07,
+	0x12, 0x45, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+	0x2e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e,
+	0x54, 0x69, 0x6d, 0x65, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x74,
+	0x69, 0x6d, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72,
+	0x5f, 0x6d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x4d, 0x73, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f,
+	0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43,
+	0x6f, 0x64, 0x65, 0x1a, 0x4d, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e,
+	0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x1a, 0x52, 0x0a, 0x0d, 0x54, 0x69, 0x6d, 0x65, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
+	0x62, 0x65, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x4a, 0x73, 0x6f, 0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x23, 0x0a, 0x08, 0x54, 0x69, 0x6d, 0x65, 0x4a, 0x73,
+	0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x06, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x22, 0xd4, 0x01, 0x0a, 0x07,
 	0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x5f, 0x74, 0x69, 0x6d,
 	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x73,
 	0x12, 0x19, 0x0a, 0x08, 0x69, 0x5f, 0x77, 0x78, 0x70, 0x75, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01,
@@ -3918,7 +3985,7 @@ func file_bxsubscribe_proto_rawDescGZIP() []byte {
 	return file_bxsubscribe_proto_rawDescData
 }
 
-var file_bxsubscribe_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
+var file_bxsubscribe_proto_msgTypes = make([]protoimpl.MessageInfo, 42)
 var file_bxsubscribe_proto_goTypes = []interface{}{
 	(*SubscribeInfosReq)(nil),      // 0: bxsubscribe.SubscribeInfosReq
 	(*SubscribeInfosResp)(nil),     // 1: bxsubscribe.SubscribeInfosResp
@@ -3956,10 +4023,12 @@ var file_bxsubscribe_proto_goTypes = []interface{}{
 	(*SetUserInfoReq)(nil),         // 33: bxsubscribe.SetUserInfoReq
 	(*GetPushSetReq)(nil),          // 34: bxsubscribe.GetPushSetReq
 	(*GetPushSetResp)(nil),         // 35: bxsubscribe.GetPushSetResp
-	(*PushSet)(nil),                // 36: bxsubscribe.PushSet
-	(*SetPushSetReq)(nil),          // 37: bxsubscribe.SetPushSetReq
-	nil,                            // 38: bxsubscribe.Subscribe.AreaEntry
-	nil,                            // 39: bxsubscribe.GetPushSetResp.DataEntry
+	(*TimeJson)(nil),               // 36: bxsubscribe.TimeJson
+	(*PushSet)(nil),                // 37: bxsubscribe.PushSet
+	(*SetPushSetReq)(nil),          // 38: bxsubscribe.SetPushSetReq
+	nil,                            // 39: bxsubscribe.Subscribe.AreaEntry
+	nil,                            // 40: bxsubscribe.GetPushSetResp.DataEntry
+	nil,                            // 41: bxsubscribe.GetPushSetResp.TimeDataEntry
 }
 var file_bxsubscribe_proto_depIdxs = []int32{
 	2,  // 0: bxsubscribe.SubscribeInfosResp.data:type_name -> bxsubscribe.subscribeData
@@ -3969,48 +4038,50 @@ var file_bxsubscribe_proto_depIdxs = []int32{
 	13, // 4: bxsubscribe.Items.a_key:type_name -> bxsubscribe.Keys
 	15, // 5: bxsubscribe.KeyItems.a_key:type_name -> bxsubscribe.Key
 	14, // 6: bxsubscribe.KeyResp.items:type_name -> bxsubscribe.KeyItems
-	38, // 7: bxsubscribe.Subscribe.area:type_name -> bxsubscribe.Subscribe.AreaEntry
+	39, // 7: bxsubscribe.Subscribe.area:type_name -> bxsubscribe.Subscribe.AreaEntry
 	12, // 8: bxsubscribe.Subscribe.items:type_name -> bxsubscribe.Items
 	22, // 9: bxsubscribe.UserResq.data:type_name -> bxsubscribe.Subscribe
 	26, // 10: bxsubscribe.DistributorResp.items:type_name -> bxsubscribe.userResp
 	29, // 11: bxsubscribe.ViewStatusResp.items:type_name -> bxsubscribe.UserStatus
 	32, // 12: bxsubscribe.GetUserInfoResq.data:type_name -> bxsubscribe.GetUserInfo
-	39, // 13: bxsubscribe.GetPushSetResp.data:type_name -> bxsubscribe.GetPushSetResp.DataEntry
-	21, // 14: bxsubscribe.Subscribe.AreaEntry.value:type_name -> bxsubscribe.List
-	36, // 15: bxsubscribe.GetPushSetResp.DataEntry.value:type_name -> bxsubscribe.PushSet
-	0,  // 16: bxsubscribe.Bxsubscribe.GetSubList:input_type -> bxsubscribe.SubscribeInfosReq
-	5,  // 17: bxsubscribe.Bxsubscribe.GetSubSomeInfo:input_type -> bxsubscribe.SomeInfoReq
-	10, // 18: bxsubscribe.Bxsubscribe.UpdateSubScribeInfo:input_type -> bxsubscribe.UpdateSubScribeInfoReq
-	0,  // 19: bxsubscribe.Bxsubscribe.ByPushHistory:input_type -> bxsubscribe.SubscribeInfosReq
-	16, // 20: bxsubscribe.Bxsubscribe.SetRead:input_type -> bxsubscribe.SetReadReq
-	17, // 21: bxsubscribe.Bxsubscribe.GetKey:input_type -> bxsubscribe.GetKeyReq
-	23, // 22: bxsubscribe.Bxsubscribe.GetSubScribeInfo:input_type -> bxsubscribe.UserReq
-	19, // 23: bxsubscribe.Bxsubscribe.MsgDistributor:input_type -> bxsubscribe.MsgDistributorReq
-	18, // 24: bxsubscribe.Bxsubscribe.GetDistributor:input_type -> bxsubscribe.GetDistributorReq
-	27, // 25: bxsubscribe.Bxsubscribe.GetViewStatus:input_type -> bxsubscribe.GetViewStatusReq
-	30, // 26: bxsubscribe.Bxsubscribe.userInfo:input_type -> bxsubscribe.GetUserInfoReq
-	33, // 27: bxsubscribe.Bxsubscribe.setUser:input_type -> bxsubscribe.SetUserInfoReq
-	34, // 28: bxsubscribe.Bxsubscribe.getPushSet:input_type -> bxsubscribe.GetPushSetReq
-	37, // 29: bxsubscribe.Bxsubscribe.setPushSet:input_type -> bxsubscribe.SetPushSetReq
-	1,  // 30: bxsubscribe.Bxsubscribe.GetSubList:output_type -> bxsubscribe.SubscribeInfosResp
-	6,  // 31: bxsubscribe.Bxsubscribe.GetSubSomeInfo:output_type -> bxsubscribe.SomeInfoResp
-	8,  // 32: bxsubscribe.Bxsubscribe.UpdateSubScribeInfo:output_type -> bxsubscribe.StatusResp
-	9,  // 33: bxsubscribe.Bxsubscribe.ByPushHistory:output_type -> bxsubscribe.ByPushHistoryResp
-	8,  // 34: bxsubscribe.Bxsubscribe.SetRead:output_type -> bxsubscribe.StatusResp
-	20, // 35: bxsubscribe.Bxsubscribe.GetKey:output_type -> bxsubscribe.KeyResp
-	24, // 36: bxsubscribe.Bxsubscribe.GetSubScribeInfo:output_type -> bxsubscribe.UserResq
-	8,  // 37: bxsubscribe.Bxsubscribe.MsgDistributor:output_type -> bxsubscribe.StatusResp
-	25, // 38: bxsubscribe.Bxsubscribe.GetDistributor:output_type -> bxsubscribe.DistributorResp
-	28, // 39: bxsubscribe.Bxsubscribe.GetViewStatus:output_type -> bxsubscribe.ViewStatusResp
-	31, // 40: bxsubscribe.Bxsubscribe.userInfo:output_type -> bxsubscribe.GetUserInfoResq
-	8,  // 41: bxsubscribe.Bxsubscribe.setUser:output_type -> bxsubscribe.StatusResp
-	35, // 42: bxsubscribe.Bxsubscribe.getPushSet:output_type -> bxsubscribe.GetPushSetResp
-	8,  // 43: bxsubscribe.Bxsubscribe.setPushSet:output_type -> bxsubscribe.StatusResp
-	30, // [30:44] is the sub-list for method output_type
-	16, // [16:30] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
+	40, // 13: bxsubscribe.GetPushSetResp.data:type_name -> bxsubscribe.GetPushSetResp.DataEntry
+	41, // 14: bxsubscribe.GetPushSetResp.timeData:type_name -> bxsubscribe.GetPushSetResp.TimeDataEntry
+	21, // 15: bxsubscribe.Subscribe.AreaEntry.value:type_name -> bxsubscribe.List
+	37, // 16: bxsubscribe.GetPushSetResp.DataEntry.value:type_name -> bxsubscribe.PushSet
+	36, // 17: bxsubscribe.GetPushSetResp.TimeDataEntry.value:type_name -> bxsubscribe.TimeJson
+	0,  // 18: bxsubscribe.Bxsubscribe.GetSubList:input_type -> bxsubscribe.SubscribeInfosReq
+	5,  // 19: bxsubscribe.Bxsubscribe.GetSubSomeInfo:input_type -> bxsubscribe.SomeInfoReq
+	10, // 20: bxsubscribe.Bxsubscribe.UpdateSubScribeInfo:input_type -> bxsubscribe.UpdateSubScribeInfoReq
+	0,  // 21: bxsubscribe.Bxsubscribe.ByPushHistory:input_type -> bxsubscribe.SubscribeInfosReq
+	16, // 22: bxsubscribe.Bxsubscribe.SetRead:input_type -> bxsubscribe.SetReadReq
+	17, // 23: bxsubscribe.Bxsubscribe.GetKey:input_type -> bxsubscribe.GetKeyReq
+	23, // 24: bxsubscribe.Bxsubscribe.GetSubScribeInfo:input_type -> bxsubscribe.UserReq
+	19, // 25: bxsubscribe.Bxsubscribe.MsgDistributor:input_type -> bxsubscribe.MsgDistributorReq
+	18, // 26: bxsubscribe.Bxsubscribe.GetDistributor:input_type -> bxsubscribe.GetDistributorReq
+	27, // 27: bxsubscribe.Bxsubscribe.GetViewStatus:input_type -> bxsubscribe.GetViewStatusReq
+	30, // 28: bxsubscribe.Bxsubscribe.userInfo:input_type -> bxsubscribe.GetUserInfoReq
+	33, // 29: bxsubscribe.Bxsubscribe.setUser:input_type -> bxsubscribe.SetUserInfoReq
+	34, // 30: bxsubscribe.Bxsubscribe.getPushSet:input_type -> bxsubscribe.GetPushSetReq
+	38, // 31: bxsubscribe.Bxsubscribe.setPushSet:input_type -> bxsubscribe.SetPushSetReq
+	1,  // 32: bxsubscribe.Bxsubscribe.GetSubList:output_type -> bxsubscribe.SubscribeInfosResp
+	6,  // 33: bxsubscribe.Bxsubscribe.GetSubSomeInfo:output_type -> bxsubscribe.SomeInfoResp
+	8,  // 34: bxsubscribe.Bxsubscribe.UpdateSubScribeInfo:output_type -> bxsubscribe.StatusResp
+	9,  // 35: bxsubscribe.Bxsubscribe.ByPushHistory:output_type -> bxsubscribe.ByPushHistoryResp
+	8,  // 36: bxsubscribe.Bxsubscribe.SetRead:output_type -> bxsubscribe.StatusResp
+	20, // 37: bxsubscribe.Bxsubscribe.GetKey:output_type -> bxsubscribe.KeyResp
+	24, // 38: bxsubscribe.Bxsubscribe.GetSubScribeInfo:output_type -> bxsubscribe.UserResq
+	8,  // 39: bxsubscribe.Bxsubscribe.MsgDistributor:output_type -> bxsubscribe.StatusResp
+	25, // 40: bxsubscribe.Bxsubscribe.GetDistributor:output_type -> bxsubscribe.DistributorResp
+	28, // 41: bxsubscribe.Bxsubscribe.GetViewStatus:output_type -> bxsubscribe.ViewStatusResp
+	31, // 42: bxsubscribe.Bxsubscribe.userInfo:output_type -> bxsubscribe.GetUserInfoResq
+	8,  // 43: bxsubscribe.Bxsubscribe.setUser:output_type -> bxsubscribe.StatusResp
+	35, // 44: bxsubscribe.Bxsubscribe.getPushSet:output_type -> bxsubscribe.GetPushSetResp
+	8,  // 45: bxsubscribe.Bxsubscribe.setPushSet:output_type -> bxsubscribe.StatusResp
+	32, // [32:46] is the sub-list for method output_type
+	18, // [18:32] is the sub-list for method input_type
+	18, // [18:18] is the sub-list for extension type_name
+	18, // [18:18] is the sub-list for extension extendee
+	0,  // [0:18] is the sub-list for field type_name
 }
 
 func init() { file_bxsubscribe_proto_init() }
@@ -4452,7 +4523,7 @@ func file_bxsubscribe_proto_init() {
 			}
 		}
 		file_bxsubscribe_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PushSet); i {
+			switch v := v.(*TimeJson); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4464,6 +4535,18 @@ func file_bxsubscribe_proto_init() {
 			}
 		}
 		file_bxsubscribe_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PushSet); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_bxsubscribe_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SetPushSetReq); i {
 			case 0:
 				return &v.state
@@ -4482,7 +4565,7 @@ func file_bxsubscribe_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_bxsubscribe_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   40,
+			NumMessages:   42,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

jyBXSubscribe/rpc/util/util.go

@@ -18,6 +18,12 @@ var ServiceMap = map[string]string{
 	"pc":  "84",
 	"wx":  "86",
 }
+var TimeMap = map[int][]string{
+	1: []string{},
+	2: []string{"09:00", "14:00"},
+	3: []string{"09:00"},
+	4: []string{"09:00"},
+}
 
 // 加密
 func EncodeId(sid string) string {