xmy 3 anni fa
parent
commit
8b139c44ba

+ 18 - 18
api/internal/handler/routes.go

@@ -14,92 +14,92 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/publish/biddingInfo",
+				Path:    "/jyinfo/publish/biddingInfo",
 				Handler: pubInfoHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/publish/supplyInfo",
+				Path:    "/jyinfo/publish/supplyInfo",
 				Handler: pubSupplyInfoHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/supplyInfoDetail",
+				Path:    "/jyinfo/supplyInfoDetail",
 				Handler: supplyInfoDetailHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/supplySearch",
+				Path:    "/jyinfo/supplySearch",
 				Handler: supplySearchHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/publishStatus",
+				Path:    "/jyinfo/publishStatus",
 				Handler: pubInfoCountHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/pushedRelated",
+				Path:    "/jyinfo/pushedRelated",
 				Handler: assProjecctHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/getArea",
+				Path:    "/jyinfo/getArea",
 				Handler: getProvinceHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/getIndustry",
+				Path:    "/jyinfo/getIndustry",
 				Handler: getIndustryHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/myPublishList",
+				Path:    "/jyinfo/myPublishList",
 				Handler: myPublishListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/myPublishDetail",
+				Path:    "/jyinfo/myPublishDetail",
 				Handler: myPublishDetailHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/delMyPublish",
+				Path:    "/jyinfo/delMyPublish",
 				Handler: delMyPublishHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/reviewStatus",
+				Path:    "/jyinfo/reviewStatus",
 				Handler: reviewStatusHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/infoFile/upload",
+				Path:    "/jyinfo/infoFile/upload",
 				Handler: uploadHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/manage/infoList",
+				Path:    "/jyinfo/manage/infoList",
 				Handler: infoListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,
-				Path:    "/app.yhyue.com/moapp/jyInfo/manage/infoDetail",
+				Path:    "/jyinfo/manage/infoDetail",
 				Handler: infoDetailHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/manage/infoDetail",
+				Path:    "/jyinfo/manage/infoDetail",
 				Handler: infoDetailHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/manage/infoExamine",
+				Path:    "/jyinfo/manage/infoExamine",
 				Handler: infoExamineHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/app.yhyue.com/moapp/jyInfo/manage/organFrozen",
+				Path:    "/jyinfo/manage/organFrozen",
 				Handler: organFrozenHandler(serverCtx),
 			},
 		},

+ 1 - 1
api/internal/logic/delmypublishlogic.go

@@ -32,7 +32,7 @@ func (l *DelMyPublishLogic) DelMyPublish(req *types.MyPublishCommonReq) (resp *t
 		MsgId:   req.MsgId,
 		AppId:   req.AppId,
 		Type:    common.Int64All(req.Type),
-		MsgType: common.Int64All(req.MsgType),
+		MsgType: common.InterfaceToStr(req.MsgType),
 	})
 	if err0 != nil {
 		return &types.CommonRes{

+ 2 - 2
api/internal/logic/mypublishdetaillogic.go

@@ -1,8 +1,8 @@
 package logic
 
 import (
-	"context"
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/consumer"
+	"context"
 	"log"
 
 	"app.yhyue.com/moapp/jybase/common"
@@ -32,7 +32,7 @@ func (l *MyPublishDetailLogic) MyPublishDetail(req *types.MyPublishCommonReq) (r
 		UserId:  req.UserId,
 		MsgId:   req.MsgId,
 		Type:    common.Int64All(req.Type),
-		MsgType: common.Int64All(req.MsgType),
+		MsgType: common.InterfaceToStr(req.MsgType),
 		AppId:   req.AppId,
 	})
 	if err0 != nil {

+ 2 - 2
api/internal/logic/mypublishlistlogic.go

@@ -1,8 +1,8 @@
 package logic
 
 import (
-	"context"
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/consumer"
+	"context"
 
 	"app.yhyue.com/moapp/jybase/common"
 
@@ -31,7 +31,7 @@ func (l *MyPublishListLogic) MyPublishList(req *types.MyPublishListReq) (resp *t
 		UserId:       req.UserId,
 		AppId:        req.AppId,
 		Match:        req.Match,
-		MsgType:      common.Int64All(req.MsgType),
+		MsgType:      common.InterfaceToStr(req.MsgType),
 		ReviewStatus: common.Int64All(req.ReviewStatus),
 		PageSize:     common.Int64All(req.PageSize),
 		PageIndex:    common.Int64All(req.PageIndex),

+ 2 - 2
api/internal/logic/pubinfologic.go

@@ -1,8 +1,8 @@
 package logic
 
 import (
-	"context"
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/consumer"
+	"context"
 	"net/http"
 
 	"app.yhyue.com/moapp/jybase/common"
@@ -70,7 +70,7 @@ func (l *PubInfoLogic) PubInfo(req *types.PubInfoReq) (resp *types.CommonRes, er
 		UserId:    req.UserId,
 		EntId:     req.EntId,
 		Title:     req.Title,
-		MsgType:   req.MsgType,
+		MsgType:   common.InterfaceToStr(req.MsgType),
 		RelatedId: req.RelatedId,
 		Code:      req.Code,
 		Province:  req.Province,

+ 2 - 2
api/internal/logic/pubsupplyinfologic.go

@@ -1,8 +1,8 @@
 package logic
 
 import (
-	"context"
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/consumer"
+	"context"
 	"net/http"
 
 	"app.yhyue.com/moapp/jybase/common"
@@ -38,7 +38,7 @@ func (l *PubSupplyInfoLogic) PubSupplyInfo(req *types.PubInfoReq) (resp *types.C
 		UserId:    req.UserId,
 		EntId:     req.EntId,
 		Title:     req.Title,
-		MsgType:   req.MsgType,
+		MsgType:   common.InterfaceToStr(req.MsgType),
 		RelatedId: req.RelatedId,
 		Code:      req.Code,
 		Province:  req.Province,

+ 6 - 6
api/internal/types/types.go

@@ -3,7 +3,7 @@ package types
 
 type PubInfoReq struct {
 	Title        string                 `json:"title"`
-	MsgType      string                 `json:"msgType,options=1|2|3"`
+	MsgType      int64                  `json:"msgType,options=1|2|3"`
 	RelatedId    string                 `json:"relatedId,optional"`
 	Code         string                 `json:"code,optional"`
 	Province     string                 `json:"province,optional"`
@@ -34,7 +34,7 @@ type MyPublishListReq struct {
 	UserId       string `json:"userId"`
 	AppId        string `json:"appId"`
 	Match        string `json:"match,optional"`
-	MsgType      string `json:"msgType,optional"`
+	MsgType      int64  `json:"msgType,optional"`
 	ReviewStatus string `json:"reviewStatus,optional"`
 	PageSize     int    `json:"pageSize,optional,default=10"`
 	PageIndex    int    `json:"pageIndex,optional,default=1"`
@@ -43,8 +43,8 @@ type MyPublishListReq struct {
 type MyPublishCommonReq struct {
 	MsgId   string `json:"msgId"`
 	UserId  string `json:"userId"`
-	Type    string `json:"type"`
-	MsgType string `json:"msgType,optional"`
+	Type    int64  `json:"type"`
+	MsgType int64  `json:"msgType,optional"`
 	AppId   string `json:"appId"`
 }
 
@@ -80,7 +80,7 @@ type AssProjecctReq struct {
 	UserId  string `json:"userId"`
 	AppId   string `json:"appId"`
 	Match   string `json:"match"`
-	MsgType string `json:"msgType"`
+	MsgType int64  `json:"msgType"`
 }
 
 type PubSupplyInfoReq struct {
@@ -108,7 +108,7 @@ type CommonReq struct {
 	EntId   string `json:"entId,optional"`
 	AppId   string `json:"appId"`
 	Match   string `json:"match,optional"`
-	MsgType string `json:"msgType,optional"`
+	MsgType int64  `json:"msgType,optional"`
 }
 
 type CommonRes struct {

+ 7 - 7
api/jyinfo.api

@@ -2,7 +2,7 @@ type (
 	//信息发布
 	pubInfoReq {
 		Title        string                 `json:"title"`
-		MsgType      string                 `json:"msgType,options=1|2|3"`
+		MsgType      int64                  `json:"msgType,options=1|2|3"`
 		RelatedId    string                 `json:"relatedId,optional"`
 		Code         string                 `json:"code,optional"`
 		Province     string                 `json:"province,optional"`
@@ -22,7 +22,7 @@ type (
 		Phone        string                 `json:"phone"`
 		EntName      string                 `json:"entName,optional"`
 	}
-	Contact  {
+	Contact {
 		Person string `json:"person"`
 		Phone  string `json:"phone"`
 		Overt  int64  `json:"overt"`
@@ -31,7 +31,7 @@ type (
 		UserId       string `json:"userId"`
 		AppId        string `json:"appId"`
 		Match        string `json:"match,optional"`
-		MsgType      string `json:"msgType,optional"`
+		MsgType      int64  `json:"msgType,optional"`
 		ReviewStatus string `json:"reviewStatus,optional"`
 		PageSize     int    `json:"pageSize,optional,default=10"`
 		PageIndex    int    `json:"pageIndex,optional,default=1"`
@@ -39,8 +39,8 @@ type (
 	myPublishCommonReq {
 		MsgId   string `json:"msgId"`
 		UserId  string `json:"userId"`
-		Type    string `json:"type"`
-		MsgType string `json:"msgType,optional"`
+		Type    int64  `json:"type"`
+		MsgType int64  `json:"msgType,optional"`
 		AppId   string `json:"appId"`
 	}
 	reviewCommonReq {
@@ -72,7 +72,7 @@ type (
 		UserId  string `json:"userId"`
 		AppId   string `json:"appId"`
 		Match   string `json:"match"`
-		MsgType string `json:"msgType"`
+		MsgType int64  `json:"msgType"`
 	}
 	pubSupplyInfoReq {
 		Keywords   string `json:"keywords"`
@@ -96,7 +96,7 @@ type (
 		EntId   string `json:"entId,optional"`
 		AppId   string `json:"appId"`
 		Match   string `json:"match,optional"`
-		MsgType string `json:"msgType,optional"`
+		MsgType int64  `json:"msgType,optional"`
 	}
 	commonRes {
 		Err_code int         `json:"err_code"`