Merge branch 'master' into feature/v1.1.7

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -22,8 +22,8 @@ message SubscribeInfosReq {
   string  entUserId = 16;
   string deptId = 17;
   int64 newUserId = 18;
-  bool IsEnt=19;
-  string SelectIds=20;
+  bool IsEnt = 19;
+  string SelectIds = 20;
 }
 
 message SubscribeInfosResp {
@@ -57,7 +57,7 @@ message subscribeInfo {
   string  buyer = 16;
   string  projectName = 17;
   string winner = 18;
-  string  bidOpenTime = 19;
+  int64  bidOpenTime = 19;
   int64  ca_isvip = 20;
   bool   ca_fileExists = 21;
 }
@@ -89,51 +89,51 @@ message SomeInfo{
 
 //
 message StatusResp{
-	string error_msg =1;
-	int64 error_code=2;
-  	int64 status = 3;
+  string error_msg = 1;
+  int64 error_code = 2;
+  int64 status = 3;
 }
 message ByPushHistoryResp{
-  string error_msg =1;
-  int64 error_code=2;
+  string error_msg = 1;
+  int64 error_code = 2;
   string data = 3;
 }
 
 
 message UpdateSubScribeInfoReq{
-	map<string,CityList> area = 1; //地区
-    repeated string buyerclass=2;//采购单位类型
-    repeated Items items =3;//关键词
-    repeated string infotype=4;//信息类型
-    string matchway =5;//匹配方式 1标题 2正文
-    string projectmatch=6;//项目匹配 1开始 0关闭 
-	string ratemode=7;// 1：实时推送，2：每天9点推送，3：每周推送，4：每月推送 5：每日推送两次
-	string apppush=8;//app推送 1开启 0关闭
-	string mailpush=9;//邮箱推送 1开启 0关闭
-	string mail=10;//邮箱
-	string otherbuyerclass=11;//匹配未分类类型 1匹配 0不匹配
-	string userId=12;//用户id
+  map<string, CityList> area = 1; //地区
+  repeated string buyerclass = 2;//采购单位类型
+  repeated Items items = 3;//关键词
+  repeated string infotype = 4;//信息类型
+  string matchway = 5;//匹配方式 1标题 2正文
+  string projectmatch = 6;//项目匹配 1开始 0关闭
+  string ratemode = 7;// 1：实时推送，2：每天9点推送，3：每周推送，4：每月推送 5：每日推送两次
+  string apppush = 8;//app推送 1开启 0关闭
+  string mailpush = 9;//邮箱推送 1开启 0关闭
+  string mail = 10;//邮箱
+  string otherbuyerclass = 11;//匹配未分类类型 1匹配 0不匹配
+  string userId = 12;//用户id
 }
 
 //城市
 message CityList {
-	repeated string city =1;
+  repeated string city = 1;
 }
 
 //分类
 message Items{
-	string s_item =1;//分类名称
-	int64 updateTime=2;
-	repeated Keys a_key=3;
+  string s_item = 1;//分类名称
+  int64 updateTime = 2;
+  repeated Keys a_key = 3;
 }
 
 //关键词
 message Keys {
-	repeated string key =1;
-	repeated string notkey=2;
-	int64 updateTime=3; 
-	int64 matchway=4;
-	repeated string appendKey=5;
+  repeated string key = 1;
+  repeated string notkey = 2;
+  int64 updateTime = 3;
+  int64 matchway = 4;
+  repeated string appendKey = 5;
 }
 
 

jyBXSubscribe/rpc/model/push.go

@@ -190,7 +190,7 @@ func (s *subscribePush) InfoFormat(p *PushCa, info *map[string]interface{}) *bxs
 		Buyer:        common.InterfaceToStr((*info)["buyer"]),
 		ProjectName:  common.InterfaceToStr((*info)["projectname"]),
 		Winner:       common.InterfaceToStr((*info)["s_winner"]),
-		BidOpenTime:  common.InterfaceToStr((*info)["bidopentime"]),
+		BidOpenTime:  common.Int64All((*info)["bidopentime"]),
 		CaFileExists: p.FileExists,
 	}
 }
@@ -479,7 +479,6 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 	logx.Info(spqp.NewUserId, "subscribePush query sql：", findSql)
 	list := spqp.BaseServiceMysql.SelectBySql(findSql)
 	if list != nil && len(*list) > 0 {
-		logx.Info("数据库数据", list)
 		pushCas := s.GetJyPushs(*list)
 		if !spqp.Export {
 			result = s.GetInfoByIds(spqp.Mgo_bidding, spqp.Bidding, spqp.Bidding_back, pushCas)

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

@@ -368,7 +368,7 @@ type SubscribeInfo struct {
 	Buyer        string   `protobuf:"bytes,16,opt,name=buyer,proto3" json:"buyer,omitempty"`
 	ProjectName  string   `protobuf:"bytes,17,opt,name=projectName,proto3" json:"projectName,omitempty"`
 	Winner       string   `protobuf:"bytes,18,opt,name=winner,proto3" json:"winner,omitempty"`
-	BidOpenTime  string   `protobuf:"bytes,19,opt,name=bidOpenTime,proto3" json:"bidOpenTime,omitempty"`
+	BidOpenTime  int64    `protobuf:"varint,19,opt,name=bidOpenTime,proto3" json:"bidOpenTime,omitempty"`
 	CaIsvip      int64    `protobuf:"varint,20,opt,name=ca_isvip,json=caIsvip,proto3" json:"ca_isvip,omitempty"`
 	CaFileExists bool     `protobuf:"varint,21,opt,name=ca_fileExists,json=caFileExists,proto3" json:"ca_fileExists,omitempty"`
 }
@@ -531,11 +531,11 @@ func (x *SubscribeInfo) GetWinner() string {
 	return ""
 }
 
-func (x *SubscribeInfo) GetBidOpenTime() string {
+func (x *SubscribeInfo) GetBidOpenTime() int64 {
 	if x != nil {
 		return x.BidOpenTime
 	}
-	return ""
+	return 0
 }
 
 func (x *SubscribeInfo) GetCaIsvip() int64 {
@@ -1339,7 +1339,7 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x12,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b,
 	0x62, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x62, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x19,
+	0x03, 0x52, 0x0b, 0x62, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x19,
 	0x0a, 0x08, 0x63, 0x61, 0x5f, 0x69, 0x73, 0x76, 0x69, 0x70, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x07, 0x63, 0x61, 0x49, 0x73, 0x76, 0x69, 0x70, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x61, 0x5f,
 	0x66, 0x69, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08,