diff --git a/cmd/app.go b/cmd/app.go index fd48ee0..c9145d0 100644 --- a/cmd/app.go +++ b/cmd/app.go @@ -6,11 +6,11 @@ import ( "dubbo.apache.org/dubbo-go/v3/config" _ "dubbo.apache.org/dubbo-go/v3/imports" - "github.com/fonchain-artistserver/cmd/internal/controller" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/controller" - "github.com/fonchain-artistserver/pkg/cache" - db "github.com/fonchain-artistserver/pkg/db" - "github.com/fonchain-artistserver/pkg/m" + "github.com/fonchain/fonchain-artistinfo/pkg/cache" + db "github.com/fonchain/fonchain-artistinfo/pkg/db" + "github.com/fonchain/fonchain-artistinfo/pkg/m" ) // export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-server/conf/dubbogo.yaml diff --git a/cmd/internal/controller/artisrInfo.go b/cmd/internal/controller/artisrInfo.go index 77b1baf..5823eab 100644 --- a/cmd/internal/controller/artisrInfo.go +++ b/cmd/internal/controller/artisrInfo.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/fonchain-artistserver/cmd/internal/logic" - "github.com/fonchain-artistserver/pb/artistinfo" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/logic" + "github.com/fonchain/fonchain-artistinfo/pb/artistinfo" ) type ArtistInfoProvider struct { diff --git a/cmd/internal/controller/artwork.go b/cmd/internal/controller/artwork.go index 0c63c7d..3a16133 100644 --- a/cmd/internal/controller/artwork.go +++ b/cmd/internal/controller/artwork.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/fonchain-artistserver/cmd/internal/logic" - "github.com/fonchain-artistserver/pb/artwork" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/logic" + "github.com/fonchain/fonchain-artistinfo/pb/artwork" ) type ArtWorkProvider struct { artwork.UnimplementedArtworkServer - artWorkLogic *logic.ArtWork + artWorkLogic *logic.Artwork } func (a *ArtWorkProvider) ArtworkAdd(ctx context.Context, req *artwork.ArtworkAddRequest) (rep *artwork.ArtworkAddRespond, err error) { @@ -66,4 +66,4 @@ func (a *ArtWorkProvider) ApproveArtwork(ctx context.Context, req *artwork.Appro return nil, err } return rep, nil -} \ No newline at end of file +} diff --git a/cmd/internal/controller/contract.go b/cmd/internal/controller/contract.go index 31e9eff..1e330f5 100644 --- a/cmd/internal/controller/contract.go +++ b/cmd/internal/controller/contract.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/fonchain-artistserver/cmd/internal/logic" - "github.com/fonchain-artistserver/pb/contract" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/logic" + "github.com/fonchain/fonchain-artistinfo/pb/contract" ) type ContractProvider struct { diff --git a/cmd/internal/controller/supply.go b/cmd/internal/controller/supply.go index 42c324c..d4a4997 100644 --- a/cmd/internal/controller/supply.go +++ b/cmd/internal/controller/supply.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/fonchain-artistserver/cmd/internal/logic" - "github.com/fonchain-artistserver/pb/supplyinfo" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/logic" + "github.com/fonchain/fonchain-artistinfo/pb/supplyinfo" ) type SupplyProvider struct { diff --git a/cmd/internal/dao/artistInfo.go b/cmd/internal/dao/artistInfo.go index 64dde2e..c62164f 100644 --- a/cmd/internal/dao/artistInfo.go +++ b/cmd/internal/dao/artistInfo.go @@ -3,10 +3,10 @@ package dao import ( "errors" - "github.com/fonchain-artistserver/cmd/model" - "github.com/fonchain-artistserver/pb/artistinfo" - db "github.com/fonchain-artistserver/pkg/db" - "github.com/fonchain-artistserver/pkg/m" + "github.com/fonchain/fonchain-artistinfo/cmd/model" + "github.com/fonchain/fonchain-artistinfo/pb/artistinfo" + db "github.com/fonchain/fonchain-artistinfo/pkg/db" + "github.com/fonchain/fonchain-artistinfo/pkg/m" "go.uber.org/zap" ) @@ -117,6 +117,49 @@ func ArtistSupplyList(req *artistinfo.ArtistSupplyListRequest) (rep *artistinfo. } return rep, nil } +func UserLock(req *artistinfo.UserLockRequest) (rep *artistinfo.UserLockRespond, err error) { + var user model.User + user.ID = uint64(req.Id) + if err = db.DB.Model(&user).Update("is_lock", req.IsLock).Error; err != nil { + zap.L().Error("get user info err", zap.Error(err)) + err = errors.New(m.ERROR_SELECT) + return nil, err + } + + if !req.IsLock { + + var vas model.ExhVideo + vas.UserId = uint(req.Id) + if err = db.DB.Model(&vas).Update("state", 5).Where("state = 1 or state = 2 or state = 3").Error; err != nil { + zap.L().Error("get user info err", zap.Error(err)) + err = errors.New(m.ERROR_SELECT) + return nil, err + } + var ee model.ExhExam + ee.UserId = uint(req.Id) + if err = db.DB.Model(&ee).Update("state", 5).Where("state = 1 or state = 2 or state = 3 or state = 4").Error; err != nil { + zap.L().Error("get user info err", zap.Error(err)) + err = errors.New(m.ERROR_SELECT) + return nil, err + } + var si model.SupplyInfo + si.UserId = uint(req.Id) + if err = db.DB.Model(&si).Update("state", 5).Where("state = 1 or state = 2 or state = 3 or state = 4").Error; err != nil { + zap.L().Error("get user info err", zap.Error(err)) + err = errors.New(m.ERROR_SELECT) + return nil, err + } + var ai model.ArtistInfo + ai.UserId = uint(req.Id) + if err = db.DB.Model(&ai).Update("state", 5).Where("state = 1 or state = 2 or state = 3 or state = 4").Error; err != nil { + zap.L().Error("get user info err", zap.Error(err)) + err = errors.New(m.ERROR_SELECT) + return nil, err + } + } + + return rep, nil +} // // Update 用户修改信息 // func Create(reqs *artist.CreateUserInfoRequest) (rep *artist.CreateUserInfoRespond, err error) { diff --git a/cmd/internal/dao/artwork.go b/cmd/internal/dao/artwork.go index 6b4a297..09d8f04 100644 --- a/cmd/internal/dao/artwork.go +++ b/cmd/internal/dao/artwork.go @@ -3,12 +3,10 @@ package dao import ( "encoding/json" "errors" - - "github.com/alibaba/sentinel-golang/logging" - "github.com/fonchain-artistserver/cmd/model" - "github.com/fonchain-artistserver/pb/artwork" - db "github.com/fonchain-artistserver/pkg/db" - "github.com/fonchain-artistserver/pkg/m" + "github.com/fonchain/fonchain-artistinfo/cmd/model" + "github.com/fonchain/fonchain-artistinfo/pb/artwork" + db "github.com/fonchain/fonchain-artistinfo/pkg/db" + "github.com/fonchain/fonchain-artistinfo/pkg/m" "go.uber.org/zap" ) @@ -20,7 +18,7 @@ func ArtworkAdd(res *artwork.ArtworkAddRequest) (req *artwork.ArtworkAddRespond, return } artwork := &model.Artwork{ - ArtistId: int32(res.ArtistId), + ArtistId: res.ArtistId, Name: res.Name, ModelYear: res.ModelYear, Photo: res.Photo, @@ -45,85 +43,6 @@ func ArtworkAdd(res *artwork.ArtworkAddRequest) (req *artwork.ArtworkAddRespond, return } - - -//Get 用户修改信息 -func (service UserUpdateInfoService) Update(id uint) serializer.Response { - var user model.User - code := e.SUCCESS - //找到用户 - err := model.DB.First(&user, "id = ?", id).Error - if err != nil { - logging.Info(err) - code = e.ErrorDatabase - return serializer.Response{ - Status: 400, - Msg: e.GetMsg(code), - Error: err.Error(), - } - } - user.PenName = service.PenName - user.Photo = service.Photo - user.Video = service.Video - user.CertificateImg = service.CertificateImg - conAddessByte, err := json.Marshal(service.ConAddress) - if err != nil { - logging.Info(err) - code = e.ErrorDatabase - return serializer.Response{ - Status: 400, - Msg: e.GetMsg(code), - Error: err.Error(), - } - } - user.ConAddress = string(conAddessByte) - user.WxAccount = service.WxAccount - user.CertificateNum = service.CertificateNum - err = model.DB.Save(&user).Error - if err != nil { - logging.Info(err) - code = e.ErrorDatabase - return serializer.Response{ - Status: 400, - Msg: e.GetMsg(code), - Error: err.Error(), - } - } - var realName model.RealName - err = model.DB.First(&realName, "id = ?", user.RealNameID).Error - if err != nil { - logging.Info(err) - code = e.ErrorDatabase - return serializer.Response{ - Status: 400, - Msg: e.GetMsg(code), - Error: err.Error(), - } - } - realName.IdcardBack = service.IdCardBack - realName.IdcardFront = service.IdCardFront - err = model.DB.Save(&realName).Error - if err != nil { - logging.Info(err) - code = e.ErrorDatabase - return serializer.Response{ - Status: 400, - Msg: e.GetMsg(code), - Error: err.Error(), - } - } - return serializer.Response{ - Status: code, - Data: serializer.BuildUser(user), - Msg: e.GetMsg(code), - } -} - - - - - - func CheckUserLock(id int64) (err error) { var user model.User if err = db.DB.Where("id = ? ", id).First(&user).Error; err != nil { @@ -148,10 +67,15 @@ func UpdateArtwork(data *artwork.UpdateArtworkRequest) (err error) { err = errors.New(m.ERROR_SELECT) return } - + userId, err := GetUserId(data.ArtistId) + if err != nil { + zap.L().Error("get artwork info err", zap.Error(err)) + err = errors.New(m.ERROR_SELECT) + return + } CreataAddByte, _ := json.Marshal(data.CreateAddress) artwork.ID = int32(data.ID) - artwork.ArtistId = int32(data.ArtistId) + artwork.ArtistId = userId artwork.Name = data.Name artwork.ModelYear = data.ModelYear artwork.Photo = data.Photo @@ -184,17 +108,17 @@ func DelArtwork(id int32) (err error) { return } -func ApproveArtwork(req *artwork.ApproveArtworkRequest)(rep *artwork.ApproveArtworkRespond,err error){ +func ApproveArtwork(req *artwork.ApproveArtworkRequest) (rep *artwork.ApproveArtworkRespond, err error) { var artwork model.Artwork - artwork.ID = int32(data.ID) - var state int + artwork.ID = req.ArtworkId + var state int32 if req.IsApprove { - state = 3 + state = 5 } else { state = 4 } - if err = db.DB.Update(&artwork).Where("state = ?,remark = ?,remark2 = ?",state,req.Remark,req.Remark2).Error; err != nil { + if err = db.DB.Model(&artwork).Updates(model.Artwork{State: state, Remark: req.Remark, Remark2: req.Remark2, ArtworkId: req.MgmtArtworkId}).Where("id", req.ArtworkId).Error; err != nil { zap.L().Error("get artwork info err", zap.Error(err)) err = errors.New(m.ERROR_SELECT) return @@ -207,7 +131,7 @@ func GetArtworkList(req *artwork.GetArtworkListRequest) (rep *artwork.GetArtwork var artworkList []model.Artwork //找到用户 p[] - if err = db.DB.Order("created_at desc").Where("id = ?", req.Id).Find(&artworkList).Error; err != nil { + if err = db.DB.Order("created_at desc").Where("id = ?", req.ID).Find(&artworkList).Error; err != nil { zap.L().Error("get artwork info err", zap.Error(err)) err = errors.New(m.ERROR_SELECT) return @@ -281,7 +205,7 @@ func UploadArtwork(Id uint64) (err error) { artwork.State = 1 if err = db.DB.Save(&artwork).Error; err != nil { - zap.L().Error("save artwork info err", zap.Error(rr)) + zap.L().Error("save artwork info err", zap.Error(err)) err = errors.New(m.SAVE_ERROR) return } @@ -289,14 +213,13 @@ func UploadArtwork(Id uint64) (err error) { } func GetMgmtArtworkList(req *artwork.GetMgmtArtworkListRequest) (rep *artwork.GetMgmtArtworkListRespond, err error) { - rep = &artwork.GetArtworkListRespond{} var datas []*artwork.UpdateArtworkRequest - id, err := GetUserId(req.ArtistId) - if err != nil { - zap.L().Error("get artwork info err", zap.Error(err)) - err = errors.New(m.ERROR_SELECT) - return - } + //id, err := GetUserId(req.ArtistId) + //if err != nil { + // zap.L().Error("get artwork info err", zap.Error(err)) + // err = errors.New(m.ERROR_SELECT) + // return + //} var args []interface{} var sqlWhere = " (state >=1 and state <=3) " if req.Name != "" { @@ -309,27 +232,26 @@ func GetMgmtArtworkList(req *artwork.GetMgmtArtworkListRequest) (rep *artwork.Ge // } if req.ArtistId != 0 { sqlWhere += ` artist_id = ? ` - args = append(args, id) + args = append(args, req.ArtistId) } if req.State != 0 { sqlWhere += ` and state = ? ` args = append(args, req.State) } //找到用户 - var artworkCount model.Artwork + var artworkCount int64 - tx = db.DB.Where(sqlWhere, args...).Count(&artworkCount) - if tx.Error != nil { + if db.DB.Where(sqlWhere, args...).Count(&artworkCount).Error != nil { zap.L().Error("get artwork info err", zap.Error(err)) err = errors.New(m.ERROR_SELECT) return } - rep.Count = artworkCount + rep.Count = uint64(artworkCount) var artworkList []model.Artwork //找到用户 - var sqlLimit = sqlWhere + " limit ?,? " + sqlWhere = sqlWhere + " limit ?,? " args = append(args, (req.Page-1)*req.PageSize) - args = append(args, req.Num) + args = append(args, req.PageSize) if err = db.DB.Order("created_at desc").Where(sqlWhere, args...).Find(&artworkList).Error; err != nil { zap.L().Error("get artwork info err", zap.Error(err)) err = errors.New(m.ERROR_SELECT) @@ -344,8 +266,8 @@ func GetMgmtArtworkList(req *artwork.GetMgmtArtworkListRequest) (rep *artwork.Ge data.ModelYear = artworkList[k].ModelYear data.Photo = artworkList[k].Photo data.ArtistPhoto = artworkList[k].ArtistPhoto - data.CreateAt = artworkList[k].CreateTme - data.NetworkTrace = artworkList[k].Netor + data.CreateAt = artworkList[k].CreateTime + data.NetworkTrace = artworkList[k].NetworkTrace data.Url = artworkList[k].Url data.State = uint64(artworkList[k].State) datas = append(datas, &data) @@ -356,9 +278,8 @@ func GetMgmtArtworkList(req *artwork.GetMgmtArtworkListRequest) (rep *artwork.Ge func GetUserId(artistId string) (uint64, error) { var user model.User - if err := db.DB.First(&user, "id = ? and deleted_at is null", id).Error; err != nil { + if err := db.DB.First(&user, "id = ?", artistId).Error; err != nil { - err = errors.New(m.ERROR_SELECT) return 0, err } diff --git a/cmd/internal/dao/contract.go b/cmd/internal/dao/contract.go index 434a287..ddd7fb2 100644 --- a/cmd/internal/dao/contract.go +++ b/cmd/internal/dao/contract.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "github.com/fonchain-artistserver/cmd/model" - "github.com/fonchain-artistserver/pb/contract" - db "github.com/fonchain-artistserver/pkg/db" - "github.com/fonchain-artistserver/pkg/m" + "github.com/fonchain/fonchain-artistinfo/cmd/model" + "github.com/fonchain/fonchain-artistinfo/pb/contract" + db "github.com/fonchain/fonchain-artistinfo/pkg/db" + "github.com/fonchain/fonchain-artistinfo/pkg/m" "go.uber.org/zap" ) diff --git a/cmd/internal/dao/supply.go b/cmd/internal/dao/supply.go index 990904f..107ebb4 100644 --- a/cmd/internal/dao/supply.go +++ b/cmd/internal/dao/supply.go @@ -4,10 +4,10 @@ import ( "encoding/json" "errors" - "github.com/fonchain-artistserver/cmd/model" - "github.com/fonchain-artistserver/pb/supplyinfo" - db "github.com/fonchain-artistserver/pkg/db" - "github.com/fonchain-artistserver/pkg/m" + "github.com/fonchain/fonchain-artistinfo/cmd/model" + "github.com/fonchain/fonchain-artistinfo/pb/supplyinfo" + db "github.com/fonchain/fonchain-artistinfo/pkg/db" + "github.com/fonchain/fonchain-artistinfo/pkg/m" "go.uber.org/zap" ) diff --git a/cmd/internal/logic/artistInfo.go b/cmd/internal/logic/artistInfo.go index 9ab44f6..003bdd3 100644 --- a/cmd/internal/logic/artistInfo.go +++ b/cmd/internal/logic/artistInfo.go @@ -1,8 +1,8 @@ package logic import ( - "github.com/fonchain-artistserver/cmd/internal/dao" - "github.com/fonchain-artistserver/pb/artistinfo" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/dao" + "github.com/fonchain/fonchain-artistinfo/pb/artistinfo" ) type IArtistInfo interface { @@ -50,6 +50,10 @@ func (a *ArtistInfo) CheckUserLock(req *artistinfo.CheckUserLockRequest) (rep *a return } func (a *ArtistInfo) ArtistSupplyList(req *artistinfo.ArtistSupplyListRequest) (rep *artistinfo.ArtistSupplyListRespond, err error) { - err = dao.ArtistSupplyList(int64(req.ID)) + rep, err = dao.ArtistSupplyList(req) + return +} +func (a *ArtistInfo) UserLock(req *artistinfo.UserLockRequest) (rep *artistinfo.UserLockRespond, err error) { + rep, err = dao.UserLock(req) return } diff --git a/cmd/internal/logic/artwork.go b/cmd/internal/logic/artwork.go index d4f86e9..d4a9ba6 100644 --- a/cmd/internal/logic/artwork.go +++ b/cmd/internal/logic/artwork.go @@ -1,8 +1,8 @@ package logic import ( - "github.com/fonchain-artistserver/cmd/internal/dao" - "github.com/fonchain-artistserver/pb/artwork" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/dao" + "github.com/fonchain/fonchain-artistinfo/pb/artwork" ) type IArtWork interface { @@ -15,24 +15,24 @@ type IArtWork interface { } func NewArtWork() IArtWork { - return &ArtWork{} + return &Artwork{} } -type ArtWork struct { +type Artwork struct { } -func (a *ArtWork) ArtworkAdd(req *artwork.ArtworkAddRequest) (rep *artwork.ArtworkAddRespond, err error) { +func (a *Artwork) ArtworkAdd(req *artwork.ArtworkAddRequest) (rep *artwork.ArtworkAddRespond, err error) { rep = &artwork.ArtworkAddRespond{} _, err = dao.ArtworkAdd(req) return } -func (a *ArtWork) UpdateArtwork(req *artwork.UpdateArtworkRequest) (rep *artwork.UpdateArtworkRespond, err error) { +func (a *Artwork) UpdateArtwork(req *artwork.UpdateArtworkRequest) (rep *artwork.UpdateArtworkRespond, err error) { err = dao.UpdateArtwork(req) return } -func (a *ArtWork) DelArtwork(req *artwork.DelArtworkRequest) (rep *artwork.DelArtworkRespond, err error) { +func (a *Artwork) DelArtwork(req *artwork.DelArtworkRequest) (rep *artwork.DelArtworkRespond, err error) { rep = &artwork.DelArtworkRespond{} if err = dao.DelArtwork(int32(req.Id)); err != nil { @@ -42,24 +42,24 @@ func (a *ArtWork) DelArtwork(req *artwork.DelArtworkRequest) (rep *artwork.DelAr return } -func (a *ArtWork) GetArtworkList(req *artwork.GetArtworkListRequest) (rep *artwork.GetArtworkListRespond, err error) { +func (a *Artwork) GetArtworkList(req *artwork.GetArtworkListRequest) (rep *artwork.GetArtworkListRespond, err error) { rep, err = dao.GetArtworkList(req) return } -func (a *ArtWork) GetArtwork(req *artwork.GetArtworkRequest) (rep *artwork.GetArtworkRespond, err error) { +func (a *Artwork) GetArtwork(req *artwork.GetArtworkRequest) (rep *artwork.GetArtworkRespond, err error) { rep, err = dao.GetArtwork(int32(req.ID)) return } -func (a *ArtWork) UploadArtwork(req *artwork.UploadArtworkRequest) (rep *artwork.UploadArtworkRespond, err error) { +func (a *Artwork) UploadArtwork(req *artwork.UploadArtworkRequest) (rep *artwork.UploadArtworkRespond, err error) { err = dao.UploadArtwork(req.ID) return } -func (a *ArtWork) ApproveArtwork(req *artwork.ApproveArtworkRequest) (rep *artwork.ApproveArtworkRespond, err error) { +func (a *Artwork) ApproveArtwork(req *artwork.ApproveArtworkRequest) (rep *artwork.ApproveArtworkRespond, err error) { - err = dao.ApproveArtwork(req.ID) + rep, err = dao.ApproveArtwork(req) return } diff --git a/cmd/internal/logic/contract.go b/cmd/internal/logic/contract.go index ef009fc..632720c 100644 --- a/cmd/internal/logic/contract.go +++ b/cmd/internal/logic/contract.go @@ -1,8 +1,8 @@ package logic import ( - "github.com/fonchain-artistserver/cmd/internal/dao" - "github.com/fonchain-artistserver/pb/contract" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/dao" + "github.com/fonchain/fonchain-artistinfo/pb/contract" ) type IContract interface { diff --git a/cmd/internal/logic/supply.go b/cmd/internal/logic/supply.go index 1f3c142..e857470 100644 --- a/cmd/internal/logic/supply.go +++ b/cmd/internal/logic/supply.go @@ -1,8 +1,8 @@ package logic import ( - "github.com/fonchain-artistserver/cmd/internal/dao" - "github.com/fonchain-artistserver/pb/supplyinfo" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/dao" + "github.com/fonchain/fonchain-artistinfo/pb/supplyinfo" ) type ISupply interface { diff --git a/cmd/model/artwork.go b/cmd/model/artwork.go index ba2989c..9886731 100644 --- a/cmd/model/artwork.go +++ b/cmd/model/artwork.go @@ -8,7 +8,7 @@ import ( type Artwork struct { gorm.Model ID int32 `gorm:"not null" json:"id"` - ArtistId int32 `gorm:"not null" json:"artistId"` + ArtistId uint64 `gorm:"not null" json:"artistId"` Name string `gorm:"type:varchar(256) not null" json:"name"` ArtworkId string `gorm:"type:varchar(256) default ''" json:"artworkId"` ModelYear string `gorm:"type:varchar(256) not null" json:"modelYear"` diff --git a/cmd/model/exhexam.go b/cmd/model/exhexam.go index 5ee4f25..02b5380 100644 --- a/cmd/model/exhexam.go +++ b/cmd/model/exhexam.go @@ -13,7 +13,7 @@ type ExhExam struct { Class string `gorm:"type:varchar(25) default ''"` TitleScore uint `gorm:"default:0"` Score string `gorm:"type:varchar(1024) default ''"` - Types string `gorm:"type:varchar(25) default ''"` + State string `gorm:"type:varchar(25) default ''"` Remark string `gorm:"type:varchar(1024) default ''" json:"remark"` Remark2 string `gorm:"type:varchar(1024) default ''" json:"remark2"` diff --git a/cmd/model/exhvideo.go b/cmd/model/exhvideo.go index f80965f..5a54db8 100644 --- a/cmd/model/exhvideo.go +++ b/cmd/model/exhvideo.go @@ -10,7 +10,7 @@ type ExhVideo struct { ID uint `gorm:"not null "` UserId uint `gorm:"not null default:0"` Url string `gorm:"type:varchar(256) default ''"` - Types string `gorm:"type:varchar(25) default ''"` + State string `gorm:"type:varchar(25) default ''"` Remark string `gorm:"type:varchar(1024) default ''" json:"remark"` Remark2 string `gorm:"type:varchar(1024) default ''" json:"remark2"` Enable bool `gorm:"default:false"` diff --git a/cmd/model/supplyinfo.go b/cmd/model/supplyinfo.go index bb8c1d3..0059267 100644 --- a/cmd/model/supplyinfo.go +++ b/cmd/model/supplyinfo.go @@ -27,7 +27,7 @@ type SupplyInfo struct { NetworkTrace bool `gorm:"default:false"` CreateAddress string `gorm:"type:varchar(256) not null" json:"createAddress"` Url string `gorm:"type:varchar(1024) default ''"` - Types string `gorm:"type:varchar(25) default ''"` + State string `gorm:"type:varchar(25) default ''"` Remark string `gorm:"type:varchar(1024) default ''" json:"remark"` Remark2 string `gorm:"type:varchar(1024) default ''" json:"remark2"` diff --git a/fonchain-artistinfo.exe b/fonchain-artistinfo.exe new file mode 100644 index 0000000..9aeb8f7 Binary files /dev/null and b/fonchain-artistinfo.exe differ diff --git a/fonchain-artistserver.exe b/fonchain-artistserver.exe new file mode 100644 index 0000000..2b76c34 Binary files /dev/null and b/fonchain-artistserver.exe differ diff --git a/go.mod b/go.mod index 7deb87a..8230afb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/fonchain-artistserver +module github.com/fonchain/fonchain-artistinfo -go 1.17 +go 1.16 replace ( github.com/fonchain/electronic-contract => ../electronic-contract @@ -33,6 +33,7 @@ require ( ) require ( + github.com/alibaba/sentinel-golang v1.0.4 github.com/baidubce/bce-sdk-go v0.9.138 // indirect github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect github.com/spf13/viper v1.11.0 // indirect diff --git a/pb/artistinfo/artistinfo.pb.go b/pb/artistinfo/artistinfo.pb.go index b3ef335..53f1111 100644 --- a/pb/artistinfo/artistinfo.pb.go +++ b/pb/artistinfo/artistinfo.pb.go @@ -1969,6 +1969,99 @@ func (x *ArtistArtworkSupplyListResponseData) GetRulerCount() uint64 { return 0 } +type UserLockRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int64 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` + IsLock bool `protobuf:"varint,2,opt,name=IsLock,proto3" json:"IsLock,omitempty"` +} + +func (x *UserLockRequest) Reset() { + *x = UserLockRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_pb_artistinfo_artistinfo_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserLockRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserLockRequest) ProtoMessage() {} + +func (x *UserLockRequest) ProtoReflect() protoreflect.Message { + mi := &file_pb_artistinfo_artistinfo_proto_msgTypes[25] + 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 UserLockRequest.ProtoReflect.Descriptor instead. +func (*UserLockRequest) Descriptor() ([]byte, []int) { + return file_pb_artistinfo_artistinfo_proto_rawDescGZIP(), []int{25} +} + +func (x *UserLockRequest) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *UserLockRequest) GetIsLock() bool { + if x != nil { + return x.IsLock + } + return false +} + +type UserLockRespond struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *UserLockRespond) Reset() { + *x = UserLockRespond{} + if protoimpl.UnsafeEnabled { + mi := &file_pb_artistinfo_artistinfo_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserLockRespond) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserLockRespond) ProtoMessage() {} + +func (x *UserLockRespond) ProtoReflect() protoreflect.Message { + mi := &file_pb_artistinfo_artistinfo_proto_msgTypes[26] + 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 UserLockRespond.ProtoReflect.Descriptor instead. +func (*UserLockRespond) Descriptor() ([]byte, []int) { + return file_pb_artistinfo_artistinfo_proto_rawDescGZIP(), []int{26} +} + var File_pb_artistinfo_artistinfo_proto protoreflect.FileDescriptor var file_pb_artistinfo_artistinfo_proto_rawDesc = []byte{ @@ -2227,67 +2320,77 @@ var file_pb_artistinfo_artistinfo_proto_rawDesc = []byte{ 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x21, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x75, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x22, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x0a, 0x52, 0x75, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x32, - 0xa2, 0x07, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x49, - 0x0a, 0x09, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x69, 0x63, 0x12, 0x1c, 0x2e, 0x61, 0x72, - 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x50, - 0x69, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x61, 0x72, 0x74, 0x69, + 0x01, 0x28, 0x04, 0x52, 0x0a, 0x52, 0x75, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, + 0x39, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, + 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, + 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x32, 0xea, 0x07, + 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x49, 0x0a, 0x09, + 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x69, 0x63, 0x12, 0x1c, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x69, 0x63, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0c, 0x55, 0x70, 0x6c, - 0x6f, 0x61, 0x64, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x12, 0x1f, 0x2e, 0x61, 0x72, 0x74, 0x69, - 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x64, 0x43, - 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x72, 0x74, - 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x64, - 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, - 0x0c, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, - 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, - 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, - 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, - 0x00, 0x12, 0x43, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1a, 0x2e, 0x61, - 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, - 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, - 0x72, 0x42, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, - 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x49, 0x64, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, - 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x49, 0x64, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1d, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, - 0x66, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, - 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, - 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, - 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, - 0x58, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, - 0x65, 0x12, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, - 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0c, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x1f, 0x2e, 0x61, 0x72, 0x74, 0x69, - 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, - 0x69, 0x66, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x72, 0x74, - 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x55, 0x0a, - 0x0d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x12, 0x20, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, + 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x69, 0x63, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0c, 0x55, 0x70, 0x6c, 0x6f, 0x61, + 0x64, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x12, 0x1f, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, + 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x64, 0x43, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, + 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x64, 0x43, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0c, 0x52, + 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x61, 0x72, + 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, + 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, + 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, + 0x43, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1a, 0x2e, 0x61, 0x72, 0x74, + 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, + 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, + 0x79, 0x49, 0x64, 0x12, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, + 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, + 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, + 0x73, 0x65, 0x72, 0x12, 0x1d, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x64, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, + 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, + 0x66, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, + 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, + 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x58, 0x0a, + 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0c, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x1f, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, + 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, + 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, + 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, 0x69, + 0x66, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x0d, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x12, 0x20, 0x2e, 0x61, + 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, + 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x68, 0x65, 0x63, - 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x20, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x64, 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x10, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x53, 0x75, - 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, - 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x53, 0x75, 0x70, 0x70, - 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, - 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x69, 0x73, - 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x64, 0x22, 0x00, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x2f, 0x3b, 0x61, 0x72, 0x74, 0x69, 0x73, - 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, + 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x10, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x53, 0x75, 0x70, 0x70, + 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, + 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x61, 0x72, + 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x53, + 0x75, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, + 0x22, 0x00, 0x12, 0x46, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x12, 0x1b, + 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x61, 0x72, + 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, + 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x2f, + 0x3b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -2302,7 +2405,7 @@ func file_pb_artistinfo_artistinfo_proto_rawDescGZIP() []byte { return file_pb_artistinfo_artistinfo_proto_rawDescData } -var file_pb_artistinfo_artistinfo_proto_msgTypes = make([]protoimpl.MessageInfo, 25) +var file_pb_artistinfo_artistinfo_proto_msgTypes = make([]protoimpl.MessageInfo, 27) var file_pb_artistinfo_artistinfo_proto_goTypes = []interface{}{ (*UploadPicRequest)(nil), // 0: artistinfo.UploadPicRequest (*UploadPicRespond)(nil), // 1: artistinfo.UploadPicRespond @@ -2329,6 +2432,8 @@ var file_pb_artistinfo_artistinfo_proto_goTypes = []interface{}{ (*ArtistSupplyListRequest)(nil), // 22: artistinfo.ArtistSupplyListRequest (*ArtistSupplyListRespond)(nil), // 23: artistinfo.ArtistSupplyListRespond (*ArtistArtworkSupplyListResponseData)(nil), // 24: artistinfo.ArtistArtworkSupplyListResponseData + (*UserLockRequest)(nil), // 25: artistinfo.UserLockRequest + (*UserLockRespond)(nil), // 26: artistinfo.UserLockRespond } var file_pb_artistinfo_artistinfo_proto_depIdxs = []int32{ 24, // 0: artistinfo.ArtistSupplyListRespond.Data:type_name -> artistinfo.ArtistArtworkSupplyListResponseData @@ -2343,19 +2448,21 @@ var file_pb_artistinfo_artistinfo_proto_depIdxs = []int32{ 18, // 9: artistinfo.ArtistInfo.FinishVerify:input_type -> artistinfo.FinishVerifyRequest 20, // 10: artistinfo.ArtistInfo.CheckUserLock:input_type -> artistinfo.CheckUserLockRequest 22, // 11: artistinfo.ArtistInfo.ArtistSupplyList:input_type -> artistinfo.ArtistSupplyListRequest - 1, // 12: artistinfo.ArtistInfo.UploadPic:output_type -> artistinfo.UploadPicRespond - 3, // 13: artistinfo.ArtistInfo.UploadIdCard:output_type -> artistinfo.UploadIdCardRespond - 6, // 14: artistinfo.ArtistInfo.RegisterUser:output_type -> artistinfo.RegisterUserRespond - 8, // 15: artistinfo.ArtistInfo.GetUser:output_type -> artistinfo.GetUserRespond - 10, // 16: artistinfo.ArtistInfo.GetUserById:output_type -> artistinfo.GetUserByIdRespond - 13, // 17: artistinfo.ArtistInfo.CreateUser:output_type -> artistinfo.CreateUserRespond - 15, // 18: artistinfo.ArtistInfo.CreateUserInfo:output_type -> artistinfo.CreateUserInfoRespond - 17, // 19: artistinfo.ArtistInfo.UpdateRealName:output_type -> artistinfo.UpdateRealNameRespond - 19, // 20: artistinfo.ArtistInfo.FinishVerify:output_type -> artistinfo.FinishVerifyRespond - 21, // 21: artistinfo.ArtistInfo.CheckUserLock:output_type -> artistinfo.CheckUserLockRespond - 23, // 22: artistinfo.ArtistInfo.ArtistSupplyList:output_type -> artistinfo.ArtistSupplyListRespond - 12, // [12:23] is the sub-list for method output_type - 1, // [1:12] is the sub-list for method input_type + 25, // 12: artistinfo.ArtistInfo.UserLock:input_type -> artistinfo.UserLockRequest + 1, // 13: artistinfo.ArtistInfo.UploadPic:output_type -> artistinfo.UploadPicRespond + 3, // 14: artistinfo.ArtistInfo.UploadIdCard:output_type -> artistinfo.UploadIdCardRespond + 6, // 15: artistinfo.ArtistInfo.RegisterUser:output_type -> artistinfo.RegisterUserRespond + 8, // 16: artistinfo.ArtistInfo.GetUser:output_type -> artistinfo.GetUserRespond + 10, // 17: artistinfo.ArtistInfo.GetUserById:output_type -> artistinfo.GetUserByIdRespond + 13, // 18: artistinfo.ArtistInfo.CreateUser:output_type -> artistinfo.CreateUserRespond + 15, // 19: artistinfo.ArtistInfo.CreateUserInfo:output_type -> artistinfo.CreateUserInfoRespond + 17, // 20: artistinfo.ArtistInfo.UpdateRealName:output_type -> artistinfo.UpdateRealNameRespond + 19, // 21: artistinfo.ArtistInfo.FinishVerify:output_type -> artistinfo.FinishVerifyRespond + 21, // 22: artistinfo.ArtistInfo.CheckUserLock:output_type -> artistinfo.CheckUserLockRespond + 23, // 23: artistinfo.ArtistInfo.ArtistSupplyList:output_type -> artistinfo.ArtistSupplyListRespond + 26, // 24: artistinfo.ArtistInfo.UserLock:output_type -> artistinfo.UserLockRespond + 13, // [13:25] is the sub-list for method output_type + 1, // [1:13] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name 1, // [1:1] is the sub-list for extension extendee 0, // [0:1] is the sub-list for field type_name @@ -2667,6 +2774,30 @@ func file_pb_artistinfo_artistinfo_proto_init() { return nil } } + file_pb_artistinfo_artistinfo_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserLockRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pb_artistinfo_artistinfo_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserLockRespond); 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{ @@ -2674,7 +2805,7 @@ func file_pb_artistinfo_artistinfo_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pb_artistinfo_artistinfo_proto_rawDesc, NumEnums: 0, - NumMessages: 25, + NumMessages: 27, NumExtensions: 0, NumServices: 1, }, diff --git a/pb/artistinfo/artistinfo.proto b/pb/artistinfo/artistinfo.proto index 20ed605..04bca78 100644 --- a/pb/artistinfo/artistinfo.proto +++ b/pb/artistinfo/artistinfo.proto @@ -14,6 +14,7 @@ service ArtistInfo { rpc FinishVerify (FinishVerifyRequest) returns (FinishVerifyRespond){} rpc CheckUserLock (CheckUserLockRequest) returns (CheckUserLockRespond) {} rpc ArtistSupplyList (ArtistSupplyListRequest) returns (ArtistSupplyListRespond){} + rpc UserLock (UserLockRequest) returns(UserLockRespond){} } message UploadPicRequest { @@ -21,62 +22,62 @@ message UploadPicRequest { } message UploadPicRespond { - + } message UploadIdCardRequest { - + } message UploadIdCardRespond { - + } message CheckMsgRequest{ - string TelNum = 1 ; - string VerCode = 2; + string TelNum = 1 ; + string VerCode = 2; } message RegisterUserRequest { - uint64 Id =1; - uint64 MgmtUserId =2; - string MgmtArtistId = 3; - string TelNum = 4; + uint64 Id =1; + uint64 MgmtUserId =2; + string MgmtArtistId = 3; + string TelNum = 4; } message RegisterUserRespond { - + } message GetUserRequest { - string TelNum = 1; + string TelNum = 1; } message GetUserRespond { - uint64 Id =1; - uint64 MgmtUserId =2; - string MgmtArtistId = 3; - string TelNum = 4; - int64 IsFdd = 5; - int64 IsRealName =6; - int64 ruler = 7; + uint64 Id =1; + uint64 MgmtUserId =2; + string MgmtArtistId = 3; + string TelNum = 4; + int64 IsFdd = 5; + int64 IsRealName =6; + int64 ruler = 7; } message GetUserByIdRequest { - uint64 Id = 1; + uint64 Id = 1; } message GetUserByIdRespond{ - uint64 Id =1; - uint64 MgmtUserId =2; - string MgmtArtistId = 3; - string TelNum = 4; - int64 IsFdd = 5; - int64 IsRealName =6; - int64 ruler = 7; - string InvitedCode = 8; - string CustomerId = 9; + uint64 Id =1; + uint64 MgmtUserId =2; + string MgmtArtistId = 3; + string TelNum = 4; + int64 IsFdd = 5; + int64 IsRealName =6; + int64 ruler = 7; + string InvitedCode = 8; + string CustomerId = 9; } message GetUserByIdData { string TelNum =1 [json_name ="telNum"]; @@ -109,126 +110,135 @@ message GetUserByIdData { message CreateUserRequest { - uint64 Id =1; - string TelNum = 2; + uint64 Id =1; + string TelNum = 2; } message CreateUserRespond { - + } message CreateUserInfoRequest { - string TelNum =1 [json_name ="telNum"]; - string CertificateNum =2 [json_name ="certificateNum" ]; - string CertificateImg =3 [json_name ="certificateImg" ]; - string JoinAssoTime =4 [json_name= "joinAssoTime"]; - string RealName =5 [json_name ="realName" ]; - string PenName =6 [json_name ="penName" ]; - string StageName =7 [json_name ="stageName" ]; - int32 Sex =8 [json_name ="sex" ]; - string IdCard =9 [json_name ="idCard" ]; - string IdCardFront =10 [json_name ="idCardFront" ]; - string IdCardBack =11 [json_name ="idCardBack" ]; - int32 Age =12 [json_name ="age" ]; - int64 Ruler =13 [json_name ="ruler" ]; - repeated string ConAddress =14 [json_name ="conAddress" ]; - string Photo =15 [json_name ="photo" ]; - string Video =16 [json_name ="video" ]; - int64 FddState =17 [json_name ="fddState" ]; - string CustomerId =18 [json_name ="customerId" ]; - string InvitedCode =19 [json_name ="invitedCode" ]; - string InvitedName =20 [json_name ="invitedName" ]; - string WxAccount =21 [json_name ="wxAccount" ]; - string QrCodeImg =22 [json_name ="qrCode" ]; - string QrCodeImgDownload =23 [json_name ="qrCodeDownload" ]; - string HtmlType =24 [json_name ="htmlType" ]; - string EnvType =25 [json_name ="envType" ]; + string TelNum =1 [json_name ="telNum"]; + string CertificateNum =2 [json_name ="certificateNum" ]; + string CertificateImg =3 [json_name ="certificateImg" ]; + string JoinAssoTime =4 [json_name= "joinAssoTime"]; + string RealName =5 [json_name ="realName" ]; + string PenName =6 [json_name ="penName" ]; + string StageName =7 [json_name ="stageName" ]; + int32 Sex =8 [json_name ="sex" ]; + string IdCard =9 [json_name ="idCard" ]; + string IdCardFront =10 [json_name ="idCardFront" ]; + string IdCardBack =11 [json_name ="idCardBack" ]; + int32 Age =12 [json_name ="age" ]; + int64 Ruler =13 [json_name ="ruler" ]; + repeated string ConAddress =14 [json_name ="conAddress" ]; + string Photo =15 [json_name ="photo" ]; + string Video =16 [json_name ="video" ]; + int64 FddState =17 [json_name ="fddState" ]; + string CustomerId =18 [json_name ="customerId" ]; + string InvitedCode =19 [json_name ="invitedCode" ]; + string InvitedName =20 [json_name ="invitedName" ]; + string WxAccount =21 [json_name ="wxAccount" ]; + string QrCodeImg =22 [json_name ="qrCode" ]; + string QrCodeImgDownload =23 [json_name ="qrCodeDownload" ]; + string HtmlType =24 [json_name ="htmlType" ]; + string EnvType =25 [json_name ="envType" ]; } message CreateUserInfoRespond { - + } message UpdateRealNameRequest { - uint64 Id =1; + uint64 Id =1; } message UpdateRealNameRespond { - + } message FinishVerifyRequest { - uint64 Id =1; + uint64 Id =1; } message FinishVerifyRespond { - + } message CheckUserLockRequest { - uint64 ID = 1 [json_name = "id"]; - } - - message CheckUserLockRespond { - - } + uint64 ID = 1 [json_name = "id"]; +} + +message CheckUserLockRespond { + +} - message ArtistSupplyListRequest { -string ArtistId = 1; -string Name =2; -string ArtistName =3; -string InvitedName =4; -uint64 IsImport =5; -uint64 State =6; -uint64 Page =7; -uint64 PageSize =8; - } - - message ArtistSupplyListRespond { - uint64 Count =1; - repeated ArtistArtworkSupplyListResponseData Data =2; - } +message ArtistSupplyListRequest { + string ArtistId = 1; + string Name =2; + string ArtistName =3; + string InvitedName =4; + uint64 IsImport =5; + uint64 State =6; + uint64 Page =7; + uint64 PageSize =8; +} + +message ArtistSupplyListRespond { + uint64 Count =1; + repeated ArtistArtworkSupplyListResponseData Data =2; +} message ArtistArtworkSupplyListResponseData { - string ID = 1; - string Account = 2; - uint64 PassRulerCount = 3; - string MnemonicWords = 4; - string TelNum = 5; - uint64 PassArtworkCount = 6; - string Name = 7; - string PenName = 8; - string Certificate = 9; - string CertificateImg = 10; - string Key = 11; - uint64 Sex = 12; - uint64 Age = 13; - string Introduct = 14; - string CreateTime = 15; - string JoinAssoTime = 16; - string StageName = 17; - string UpdateTime = 18; - string ConAddress = 19; - string Photo = 20; - string Video = 21; - string InvitedName = 22; - bool Enable = 23; - string IdCard = 24; - uint64 IsImport = 25; - bool IsLock = 26; - string IdCardFront = 27; - string IdCardBack = 28; - string BankName = 29; - string BankAccount = 30; - string MinTime = 31; - string LockTime = 32; - uint64 ArtworkCount = 33; - uint64 RulerCount = 34; - } - \ No newline at end of file + string ID = 1; + string Account = 2; + uint64 PassRulerCount = 3; + string MnemonicWords = 4; + string TelNum = 5; + uint64 PassArtworkCount = 6; + string Name = 7; + string PenName = 8; + string Certificate = 9; + string CertificateImg = 10; + string Key = 11; + uint64 Sex = 12; + uint64 Age = 13; + string Introduct = 14; + string CreateTime = 15; + string JoinAssoTime = 16; + string StageName = 17; + string UpdateTime = 18; + string ConAddress = 19; + string Photo = 20; + string Video = 21; + string InvitedName = 22; + bool Enable = 23; + string IdCard = 24; + uint64 IsImport = 25; + bool IsLock = 26; + string IdCardFront = 27; + string IdCardBack = 28; + string BankName = 29; + string BankAccount = 30; + string MinTime = 31; + string LockTime = 32; + uint64 ArtworkCount = 33; + uint64 RulerCount = 34; +} + + +message UserLockRequest { + int64 Id =1; + bool IsLock =2; +} + +message UserLockRespond { + +} \ No newline at end of file diff --git a/pb/artistinfo/artistinfo_triple.pb.go b/pb/artistinfo/artistinfo_triple.pb.go index 755af75..ff87c6e 100644 --- a/pb/artistinfo/artistinfo_triple.pb.go +++ b/pb/artistinfo/artistinfo_triple.pb.go @@ -39,6 +39,7 @@ type ArtistInfoClient interface { FinishVerify(ctx context.Context, in *FinishVerifyRequest, opts ...grpc_go.CallOption) (*FinishVerifyRespond, common.ErrorWithAttachment) CheckUserLock(ctx context.Context, in *CheckUserLockRequest, opts ...grpc_go.CallOption) (*CheckUserLockRespond, common.ErrorWithAttachment) ArtistSupplyList(ctx context.Context, in *ArtistSupplyListRequest, opts ...grpc_go.CallOption) (*ArtistSupplyListRespond, common.ErrorWithAttachment) + UserLock(ctx context.Context, in *UserLockRequest, opts ...grpc_go.CallOption) (*UserLockRespond, common.ErrorWithAttachment) } type artistInfoClient struct { @@ -57,6 +58,7 @@ type ArtistInfoClientImpl struct { FinishVerify func(ctx context.Context, in *FinishVerifyRequest) (*FinishVerifyRespond, error) CheckUserLock func(ctx context.Context, in *CheckUserLockRequest) (*CheckUserLockRespond, error) ArtistSupplyList func(ctx context.Context, in *ArtistSupplyListRequest) (*ArtistSupplyListRespond, error) + UserLock func(ctx context.Context, in *UserLockRequest) (*UserLockRespond, error) } func (c *ArtistInfoClientImpl) GetDubboStub(cc *triple.TripleConn) ArtistInfoClient { @@ -137,6 +139,12 @@ func (c *artistInfoClient) ArtistSupplyList(ctx context.Context, in *ArtistSuppl return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ArtistSupplyList", in, out) } +func (c *artistInfoClient) UserLock(ctx context.Context, in *UserLockRequest, opts ...grpc_go.CallOption) (*UserLockRespond, common.ErrorWithAttachment) { + out := new(UserLockRespond) + interfaceKey := ctx.Value(constant.InterfaceKey).(string) + return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/UserLock", in, out) +} + // ArtistInfoServer is the server API for ArtistInfo service. // All implementations must embed UnimplementedArtistInfoServer // for forward compatibility @@ -152,6 +160,7 @@ type ArtistInfoServer interface { FinishVerify(context.Context, *FinishVerifyRequest) (*FinishVerifyRespond, error) CheckUserLock(context.Context, *CheckUserLockRequest) (*CheckUserLockRespond, error) ArtistSupplyList(context.Context, *ArtistSupplyListRequest) (*ArtistSupplyListRespond, error) + UserLock(context.Context, *UserLockRequest) (*UserLockRespond, error) mustEmbedUnimplementedArtistInfoServer() } @@ -193,6 +202,9 @@ func (UnimplementedArtistInfoServer) CheckUserLock(context.Context, *CheckUserLo func (UnimplementedArtistInfoServer) ArtistSupplyList(context.Context, *ArtistSupplyListRequest) (*ArtistSupplyListRespond, error) { return nil, status.Errorf(codes.Unimplemented, "method ArtistSupplyList not implemented") } +func (UnimplementedArtistInfoServer) UserLock(context.Context, *UserLockRequest) (*UserLockRespond, error) { + return nil, status.Errorf(codes.Unimplemented, "method UserLock not implemented") +} func (s *UnimplementedArtistInfoServer) XXX_SetProxyImpl(impl protocol.Invoker) { s.proxyImpl = impl } @@ -540,6 +552,35 @@ func _ArtistInfo_ArtistSupplyList_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +func _ArtistInfo_UserLock_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { + in := new(UserLockRequest) + if err := dec(in); err != nil { + return nil, err + } + base := srv.(dubbo3.Dubbo3GrpcService) + args := []interface{}{} + args = append(args, in) + md, _ := metadata.FromIncomingContext(ctx) + invAttachment := make(map[string]interface{}, len(md)) + for k, v := range md { + invAttachment[k] = v + } + invo := invocation.NewRPCInvocation("UserLock", args, invAttachment) + if interceptor == nil { + result := base.XXX_GetProxyImpl().Invoke(ctx, invo) + return result, result.Error() + } + info := &grpc_go.UnaryServerInfo{ + Server: srv, + FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string), + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + result := base.XXX_GetProxyImpl().Invoke(ctx, invo) + return result, result.Error() + } + return interceptor(ctx, in, info, handler) +} + // ArtistInfo_ServiceDesc is the grpc_go.ServiceDesc for ArtistInfo service. // It's only intended for direct use with grpc_go.RegisterService, // and not to be introspected or modified (even as a copy) @@ -591,6 +632,10 @@ var ArtistInfo_ServiceDesc = grpc_go.ServiceDesc{ MethodName: "ArtistSupplyList", Handler: _ArtistInfo_ArtistSupplyList_Handler, }, + { + MethodName: "UserLock", + Handler: _ArtistInfo_UserLock_Handler, + }, }, Streams: []grpc_go.StreamDesc{}, Metadata: "pb/artistinfo/artistinfo.proto", diff --git a/pb/artwork/artwork.pb.go b/pb/artwork/artwork.pb.go index b766990..36590c7 100644 --- a/pb/artwork/artwork.pb.go +++ b/pb/artwork/artwork.pb.go @@ -742,10 +742,11 @@ type ApproveArtworkRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ArtworkId string `protobuf:"bytes,1,opt,name=ArtworkId,json=artworkId,proto3" json:"ArtworkId,omitempty"` - IsApprove bool `protobuf:"varint,2,opt,name=IsApprove,json=isApprove,proto3" json:"IsApprove,omitempty"` - Remark string `protobuf:"bytes,3,opt,name=Remark,json=remark,proto3" json:"Remark,omitempty"` - Remark2 string `protobuf:"bytes,4,opt,name=Remark2,json=remark2,proto3" json:"Remark2,omitempty"` + ArtworkId int32 `protobuf:"varint,1,opt,name=ArtworkId,json=artworkId,proto3" json:"ArtworkId,omitempty"` + IsApprove bool `protobuf:"varint,2,opt,name=IsApprove,json=isApprove,proto3" json:"IsApprove,omitempty"` + Remark string `protobuf:"bytes,3,opt,name=Remark,json=remark,proto3" json:"Remark,omitempty"` + Remark2 string `protobuf:"bytes,4,opt,name=Remark2,json=remark2,proto3" json:"Remark2,omitempty"` + MgmtArtworkId string `protobuf:"bytes,5,opt,name=MgmtArtworkId,json=mgmtArtworkId,proto3" json:"MgmtArtworkId,omitempty"` } func (x *ApproveArtworkRequest) Reset() { @@ -780,11 +781,11 @@ func (*ApproveArtworkRequest) Descriptor() ([]byte, []int) { return file_api_artwork_artwork_proto_rawDescGZIP(), []int{9} } -func (x *ApproveArtworkRequest) GetArtworkId() string { +func (x *ApproveArtworkRequest) GetArtworkId() int32 { if x != nil { return x.ArtworkId } - return "" + return 0 } func (x *ApproveArtworkRequest) GetIsApprove() bool { @@ -808,6 +809,13 @@ func (x *ApproveArtworkRequest) GetRemark2() string { return "" } +func (x *ApproveArtworkRequest) GetMgmtArtworkId() string { + if x != nil { + return x.MgmtArtworkId + } + return "" +} + type GetArtworkListRespond struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -860,15 +868,14 @@ type GetMgmtArtworkListRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BatchId int64 `protobuf:"varint,1,opt,name=BatchId,json=batchId,proto3" json:"BatchId,omitempty"` - ArtistId int64 `protobuf:"varint,2,opt,name=ArtistId,json=artistId,proto3" json:"ArtistId,omitempty"` - Name string `protobuf:"bytes,3,opt,name=Name,json=name,proto3" json:"Name,omitempty"` - ArtistName string `protobuf:"bytes,4,opt,name=ArtistName,json=artistName,proto3" json:"ArtistName,omitempty"` - InvitedName string `protobuf:"bytes,5,opt,name=InvitedName,json=invitedName,proto3" json:"InvitedName,omitempty"` - IsImport uint64 `protobuf:"varint,6,opt,name=IsImport,json=isImport,proto3" json:"IsImport,omitempty"` - State uint64 `protobuf:"varint,7,opt,name=State,json=state,proto3" json:"State,omitempty"` - Page uint64 `protobuf:"varint,8,opt,name=Page,json=page,proto3" json:"Page,omitempty"` - Num uint64 `protobuf:"varint,9,opt,name=Num,json=num,proto3" json:"Num,omitempty"` + ArtistId uint64 `protobuf:"varint,1,opt,name=ArtistId,json=artistId,proto3" json:"ArtistId,omitempty"` + Name string `protobuf:"bytes,2,opt,name=Name,json=name,proto3" json:"Name,omitempty"` + ArtistName string `protobuf:"bytes,3,opt,name=ArtistName,json=artistName,proto3" json:"ArtistName,omitempty"` + InvitedName string `protobuf:"bytes,4,opt,name=InvitedName,json=invitedName,proto3" json:"InvitedName,omitempty"` + IsImport uint64 `protobuf:"varint,5,opt,name=IsImport,json=isImport,proto3" json:"IsImport,omitempty"` + State uint64 `protobuf:"varint,6,opt,name=State,json=state,proto3" json:"State,omitempty"` + Page uint64 `protobuf:"varint,7,opt,name=Page,json=page,proto3" json:"Page,omitempty"` + PageSize uint64 `protobuf:"varint,8,opt,name=PageSize,json=num,proto3" json:"PageSize,omitempty"` } func (x *GetMgmtArtworkListRequest) Reset() { @@ -903,14 +910,7 @@ func (*GetMgmtArtworkListRequest) Descriptor() ([]byte, []int) { return file_api_artwork_artwork_proto_rawDescGZIP(), []int{11} } -func (x *GetMgmtArtworkListRequest) GetBatchId() int64 { - if x != nil { - return x.BatchId - } - return 0 -} - -func (x *GetMgmtArtworkListRequest) GetArtistId() int64 { +func (x *GetMgmtArtworkListRequest) GetArtistId() uint64 { if x != nil { return x.ArtistId } @@ -959,9 +959,9 @@ func (x *GetMgmtArtworkListRequest) GetPage() uint64 { return 0 } -func (x *GetMgmtArtworkListRequest) GetNum() uint64 { +func (x *GetMgmtArtworkListRequest) GetPageSize() uint64 { if x != nil { - return x.Num + return x.PageSize } return 0 } @@ -971,7 +971,8 @@ type GetMgmtArtworkListRespond struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data []*UpdateArtworkRequest `protobuf:"bytes,2,rep,name=Data,json=data,proto3" json:"Data,omitempty"` + Count uint64 `protobuf:"varint,1,opt,name=Count,proto3" json:"Count,omitempty"` + Data []*UpdateArtworkRequest `protobuf:"bytes,2,rep,name=Data,proto3" json:"Data,omitempty"` } func (x *GetMgmtArtworkListRespond) Reset() { @@ -1006,6 +1007,13 @@ func (*GetMgmtArtworkListRespond) Descriptor() ([]byte, []int) { return file_api_artwork_artwork_proto_rawDescGZIP(), []int{12} } +func (x *GetMgmtArtworkListRespond) GetCount() uint64 { + if x != nil { + return x.Count + } + return 0 +} + func (x *GetMgmtArtworkListRespond) GetData() []*UpdateArtworkRequest { if x != nil { return x.Data @@ -1018,7 +1026,7 @@ type GetArtworkRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ID uint64 `protobuf:"varint,1,opt,name=ID,json=id,proto3" json:"ID,omitempty"` + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` } func (x *GetArtworkRequest) Reset() { @@ -1535,130 +1543,132 @@ var file_api_artwork_artwork_proto_rawDesc = []byte{ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x27, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, - 0x22, 0x85, 0x01, 0x0a, 0x15, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x41, 0x72, 0x74, 0x77, + 0x22, 0xab, 0x01, 0x0a, 0x15, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x72, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x73, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x52, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x32, 0x22, 0x4a, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x41, - 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x64, 0x12, 0x31, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x22, 0xff, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4d, 0x67, 0x6d, 0x74, - 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x42, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, - 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, - 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, - 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x49, 0x73, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x08, 0x69, 0x73, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, - 0x70, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x22, 0x4e, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4d, 0x67, 0x6d, - 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x23, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, - 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0xbf, 0x03, 0x0a, 0x11, - 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a, - 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x59, 0x65, 0x61, 0x72, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x59, 0x65, 0x61, 0x72, 0x12, - 0x14, 0x0a, 0x05, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x50, - 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, - 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x57, 0x69, 0x64, 0x74, 0x68, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x12, 0x24, 0x0a, - 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x08, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x52, - 0x75, 0x6c, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, - 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x18, 0x0b, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x12, - 0x24, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x4f, 0x66, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x67, 0x65, 0x4f, 0x66, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, - 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, - 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x72, 0x61, 0x63, - 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, - 0x54, 0x72, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x0f, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x18, 0x10, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x3f, 0x0a, - 0x11, 0x44, 0x65, 0x6c, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x22, 0x13, - 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x64, 0x22, 0x26, 0x0a, 0x14, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, - 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x55, - 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x41, 0x72, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x32, 0xdc, 0x05, 0x0a, - 0x07, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x46, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x12, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, - 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x41, 0x72, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, - 0x12, 0x4f, 0x0a, 0x0d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, - 0x6b, 0x12, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x43, 0x68, 0x65, 0x63, - 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, - 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, - 0x00, 0x12, 0x4f, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x12, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, - 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, - 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, - 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0e, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, - 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x1e, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2e, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2e, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x12, 0x47, 0x65, - 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x12, 0x22, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x67, - 0x6d, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, + 0x07, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x32, 0x12, 0x24, 0x0a, 0x0d, 0x4d, 0x67, 0x6d, 0x74, + 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0d, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x22, 0x4a, + 0x0a, 0x15, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xea, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x0a, 0x47, 0x65, - 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, - 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, - 0x22, 0x00, 0x12, 0x46, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, - 0x12, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x44, 0x65, 0x6c, 0x41, 0x72, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x41, - 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x44, 0x65, 0x6c, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0d, 0x55, 0x70, - 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x1d, 0x2e, 0x41, 0x72, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x41, 0x72, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, - 0x2f, 0x3b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x72, 0x74, 0x69, + 0x73, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, + 0x73, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x69, + 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, + 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x69, + 0x74, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, + 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x73, + 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x69, 0x73, + 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, + 0x50, 0x61, 0x67, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, + 0x12, 0x15, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x04, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x22, 0x64, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4d, 0x67, + 0x6d, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x04, 0x52, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x44, 0x61, + 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x23, 0x0a, + 0x11, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, + 0x49, 0x44, 0x22, 0xbf, 0x03, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x72, 0x74, 0x69, + 0x73, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, + 0x73, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x4d, 0x6f, 0x64, 0x65, + 0x6c, 0x59, 0x65, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x59, 0x65, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x0a, 0x0b, + 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x14, + 0x0a, 0x05, 0x57, 0x69, 0x64, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x75, 0x6c, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x6e, 0x74, 0x72, + 0x6f, 0x64, 0x75, 0x63, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, + 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x4f, 0x66, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, + 0x67, 0x65, 0x4f, 0x66, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x4e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x54, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, + 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x72, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x55, 0x72, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x14, + 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, + 0x74, 0x61, 0x74, 0x65, 0x22, 0x3f, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x41, 0x72, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x72, 0x74, + 0x69, 0x73, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x61, 0x72, 0x74, + 0x69, 0x73, 0x74, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x41, 0x72, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x26, 0x0a, 0x14, 0x55, 0x70, + 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, + 0x69, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x41, 0x70, + 0x70, 0x72, 0x6f, 0x76, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x64, 0x32, 0xdc, 0x05, 0x0a, 0x07, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, + 0x46, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x12, 0x1a, 0x2e, + 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, + 0x64, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0d, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x12, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x6b, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0e, 0x47, 0x65, 0x74, + 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x2e, 0x41, 0x72, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x41, 0x72, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x52, 0x0a, + 0x0e, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, + 0x1e, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, + 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1e, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, + 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, + 0x00, 0x12, 0x5e, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x22, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x41, 0x72, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, + 0x00, 0x12, 0x46, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, + 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x41, 0x72, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x0a, 0x44, 0x65, 0x6c, + 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x2e, 0x44, 0x65, 0x6c, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x44, 0x65, + 0x6c, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, + 0x00, 0x12, 0x4f, 0x0a, 0x0d, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x12, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x6c, + 0x6f, 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1d, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x55, 0x70, 0x6c, 0x6f, + 0x61, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, + 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x2f, 0x3b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/artwork/artwork.proto b/pb/artwork/artwork.proto index fe3ef67..0ded29b 100644 --- a/pb/artwork/artwork.proto +++ b/pb/artwork/artwork.proto @@ -94,31 +94,32 @@ message CheckUserLockRequest { } message ApproveArtworkRequest { - string ArtworkId =1 [json_name = "artworkId"]; + int32 ArtworkId =1 [json_name = "artworkId"]; bool IsApprove =2 [json_name = "isApprove"]; string Remark =3 [json_name = "remark"]; string Remark2 =4 [json_name = "remark2"]; + string MgmtArtworkId = 5 [json_name = "mgmtArtworkId"]; } message GetArtworkListRespond { repeated UpdateArtworkRequest Data = 1 [json_name = "data"]; } message GetMgmtArtworkListRequest { - int64 BatchId = 1 [json_name = "batchId"]; - int64 ArtistId = 2 [json_name = "artistId"]; - string Name = 3 [json_name = "name"]; - string ArtistName = 4 [json_name = "artistName"]; - string InvitedName = 5 [json_name = "invitedName"]; - uint64 IsImport = 6 [json_name ="isImport"]; - uint64 State = 7 [json_name = "state"]; - uint64 Page = 8 [json_name = "page"]; - uint64 Num = 9 [json_name = "num"]; + uint64 ArtistId = 1 [json_name = "artistId"]; + string Name = 2 [json_name = "name"]; + string ArtistName = 3 [json_name = "artistName"]; + string InvitedName = 4 [json_name = "invitedName"]; + uint64 IsImport = 5 [json_name ="isImport"]; + uint64 State = 6 [json_name = "state"]; + uint64 Page = 7 [json_name = "page"]; + uint64 PageSize = 8 [json_name = "num"]; } message GetMgmtArtworkListRespond { - repeated UpdateArtworkRequest Data = 2 [json_name = "data"]; + uint64 Count = 1; + repeated UpdateArtworkRequest Data = 2 ; } - message GetArtworkRequest { - uint64 ID = 1 [json_name = "id"]; +message GetArtworkRequest{ + uint64 ID = 1 ; } message GetArtworkRespond { diff --git a/pb/contract/contract.pb.go b/pb/contract/contract.pb.go index 0a05a4e..fc297fb 100644 --- a/pb/contract/contract.pb.go +++ b/pb/contract/contract.pb.go @@ -105,122 +105,21 @@ func (*FinishContractRespond) Descriptor() ([]byte, []int) { return file_api_contract_contract_proto_rawDescGZIP(), []int{1} } -type FinishVerifyRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ContractId int64 `protobuf:"varint,1,opt,name=ContractId,json=contractId,proto3" json:"ContractId,omitempty"` - HtmlType string `protobuf:"bytes,2,opt,name=HtmlType,json=htmlType,proto3" json:"HtmlType,omitempty"` - EnvType string `protobuf:"bytes,3,opt,name=EnvType,json=envType,proto3" json:"EnvType,omitempty"` -} - -func (x *FinishVerifyRequest) Reset() { - *x = FinishVerifyRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *FinishVerifyRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*FinishVerifyRequest) ProtoMessage() {} - -func (x *FinishVerifyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[2] - 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 FinishVerifyRequest.ProtoReflect.Descriptor instead. -func (*FinishVerifyRequest) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{2} -} - -func (x *FinishVerifyRequest) GetContractId() int64 { - if x != nil { - return x.ContractId - } - return 0 -} - -func (x *FinishVerifyRequest) GetHtmlType() string { - if x != nil { - return x.HtmlType - } - return "" -} - -func (x *FinishVerifyRequest) GetEnvType() string { - if x != nil { - return x.EnvType - } - return "" -} - -type FinishVerifyRespond struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *FinishVerifyRespond) Reset() { - *x = FinishVerifyRespond{} - if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *FinishVerifyRespond) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*FinishVerifyRespond) ProtoMessage() {} - -func (x *FinishVerifyRespond) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[3] - 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 FinishVerifyRespond.ProtoReflect.Descriptor instead. -func (*FinishVerifyRespond) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{3} -} - type ContractListRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"` - Page int64 `protobuf:"varint,2,opt,name=Page,json=page,proto3" json:"Page,omitempty"` - State int64 `protobuf:"varint,3,opt,name=State,json=state,proto3" json:"State,omitempty"` - ID int64 `protobuf:"varint,4,opt,name=ID,json=id,proto3" json:"ID,omitempty"` + PageSize int64 `protobuf:"varint,1,opt,name=PageSize,json=pageSize,proto3" json:"PageSize,omitempty"` + Page int64 `protobuf:"varint,2,opt,name=Page,json=page,proto3" json:"Page,omitempty"` + State int64 `protobuf:"varint,3,opt,name=State,json=state,proto3" json:"State,omitempty"` + ID int64 `protobuf:"varint,4,opt,name=ID,json=id,proto3" json:"ID,omitempty"` } func (x *ContractListRequest) Reset() { *x = ContractListRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[4] + mi := &file_api_contract_contract_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -233,7 +132,7 @@ func (x *ContractListRequest) String() string { func (*ContractListRequest) ProtoMessage() {} func (x *ContractListRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[4] + mi := &file_api_contract_contract_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -246,12 +145,12 @@ func (x *ContractListRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ContractListRequest.ProtoReflect.Descriptor instead. func (*ContractListRequest) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{4} + return file_api_contract_contract_proto_rawDescGZIP(), []int{2} } -func (x *ContractListRequest) GetNum() int64 { +func (x *ContractListRequest) GetPageSize() int64 { if x != nil { - return x.Num + return x.PageSize } return 0 } @@ -288,7 +187,7 @@ type ContractListRespond struct { func (x *ContractListRespond) Reset() { *x = ContractListRespond{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[5] + mi := &file_api_contract_contract_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -301,7 +200,7 @@ func (x *ContractListRespond) String() string { func (*ContractListRespond) ProtoMessage() {} func (x *ContractListRespond) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[5] + mi := &file_api_contract_contract_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -314,7 +213,7 @@ func (x *ContractListRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use ContractListRespond.ProtoReflect.Descriptor instead. func (*ContractListRespond) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{5} + return file_api_contract_contract_proto_rawDescGZIP(), []int{3} } func (x *ContractListRespond) GetData() []*ContractData { @@ -351,7 +250,7 @@ type ContractData struct { func (x *ContractData) Reset() { *x = ContractData{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[6] + mi := &file_api_contract_contract_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -364,7 +263,7 @@ func (x *ContractData) String() string { func (*ContractData) ProtoMessage() {} func (x *ContractData) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[6] + mi := &file_api_contract_contract_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -377,7 +276,7 @@ func (x *ContractData) ProtoReflect() protoreflect.Message { // Deprecated: Use ContractData.ProtoReflect.Descriptor instead. func (*ContractData) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{6} + return file_api_contract_contract_proto_rawDescGZIP(), []int{4} } func (x *ContractData) GetID() uint64 { @@ -504,16 +403,16 @@ type ContractTxListRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"` - Page int64 `protobuf:"varint,2,opt,name=Page,json=page,proto3" json:"Page,omitempty"` - State int64 `protobuf:"varint,3,opt,name=State,json=state,proto3" json:"State,omitempty"` - ID int64 `protobuf:"varint,4,opt,name=ID,json=id,proto3" json:"ID,omitempty"` + PageSize int64 `protobuf:"varint,1,opt,name=PageSize,json=pageSize,proto3" json:"PageSize,omitempty"` + Page int64 `protobuf:"varint,2,opt,name=Page,json=page,proto3" json:"Page,omitempty"` + State int64 `protobuf:"varint,3,opt,name=State,json=state,proto3" json:"State,omitempty"` + ID int64 `protobuf:"varint,4,opt,name=ID,json=id,proto3" json:"ID,omitempty"` } func (x *ContractTxListRequest) Reset() { *x = ContractTxListRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[7] + mi := &file_api_contract_contract_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -526,7 +425,7 @@ func (x *ContractTxListRequest) String() string { func (*ContractTxListRequest) ProtoMessage() {} func (x *ContractTxListRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[7] + mi := &file_api_contract_contract_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -539,12 +438,12 @@ func (x *ContractTxListRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ContractTxListRequest.ProtoReflect.Descriptor instead. func (*ContractTxListRequest) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{7} + return file_api_contract_contract_proto_rawDescGZIP(), []int{5} } -func (x *ContractTxListRequest) GetNum() int64 { +func (x *ContractTxListRequest) GetPageSize() int64 { if x != nil { - return x.Num + return x.PageSize } return 0 } @@ -581,7 +480,7 @@ type ContractTxListRespond struct { func (x *ContractTxListRespond) Reset() { *x = ContractTxListRespond{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[8] + mi := &file_api_contract_contract_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -594,7 +493,7 @@ func (x *ContractTxListRespond) String() string { func (*ContractTxListRespond) ProtoMessage() {} func (x *ContractTxListRespond) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[8] + mi := &file_api_contract_contract_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -607,7 +506,7 @@ func (x *ContractTxListRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use ContractTxListRespond.ProtoReflect.Descriptor instead. func (*ContractTxListRespond) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{8} + return file_api_contract_contract_proto_rawDescGZIP(), []int{6} } func (x *ContractTxListRespond) GetData() []*ContractData { @@ -630,7 +529,7 @@ type SignContractRequest struct { func (x *SignContractRequest) Reset() { *x = SignContractRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[9] + mi := &file_api_contract_contract_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -643,7 +542,7 @@ func (x *SignContractRequest) String() string { func (*SignContractRequest) ProtoMessage() {} func (x *SignContractRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[9] + mi := &file_api_contract_contract_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -656,7 +555,7 @@ func (x *SignContractRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SignContractRequest.ProtoReflect.Descriptor instead. func (*SignContractRequest) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{9} + return file_api_contract_contract_proto_rawDescGZIP(), []int{7} } func (x *SignContractRequest) GetContractId() int64 { @@ -689,7 +588,7 @@ type SignContractRespond struct { func (x *SignContractRespond) Reset() { *x = SignContractRespond{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[10] + mi := &file_api_contract_contract_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -702,7 +601,7 @@ func (x *SignContractRespond) String() string { func (*SignContractRespond) ProtoMessage() {} func (x *SignContractRespond) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[10] + mi := &file_api_contract_contract_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -715,7 +614,7 @@ func (x *SignContractRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use SignContractRespond.ProtoReflect.Descriptor instead. func (*SignContractRespond) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{10} + return file_api_contract_contract_proto_rawDescGZIP(), []int{8} } type GetContractRequest struct { @@ -729,7 +628,7 @@ type GetContractRequest struct { func (x *GetContractRequest) Reset() { *x = GetContractRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[11] + mi := &file_api_contract_contract_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -742,7 +641,7 @@ func (x *GetContractRequest) String() string { func (*GetContractRequest) ProtoMessage() {} func (x *GetContractRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[11] + mi := &file_api_contract_contract_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -755,7 +654,7 @@ func (x *GetContractRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetContractRequest.ProtoReflect.Descriptor instead. func (*GetContractRequest) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{11} + return file_api_contract_contract_proto_rawDescGZIP(), []int{9} } func (x *GetContractRequest) GetId() int64 { @@ -792,7 +691,7 @@ type UpdateContractRequest struct { func (x *UpdateContractRequest) Reset() { *x = UpdateContractRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[12] + mi := &file_api_contract_contract_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -805,7 +704,7 @@ func (x *UpdateContractRequest) String() string { func (*UpdateContractRequest) ProtoMessage() {} func (x *UpdateContractRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[12] + mi := &file_api_contract_contract_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -818,7 +717,7 @@ func (x *UpdateContractRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateContractRequest.ProtoReflect.Descriptor instead. func (*UpdateContractRequest) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{12} + return file_api_contract_contract_proto_rawDescGZIP(), []int{10} } func (x *UpdateContractRequest) GetID() uint64 { @@ -949,7 +848,7 @@ type UpdateContractRespond struct { func (x *UpdateContractRespond) Reset() { *x = UpdateContractRespond{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[13] + mi := &file_api_contract_contract_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -962,7 +861,7 @@ func (x *UpdateContractRespond) String() string { func (*UpdateContractRespond) ProtoMessage() {} func (x *UpdateContractRespond) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[13] + mi := &file_api_contract_contract_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -975,7 +874,7 @@ func (x *UpdateContractRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateContractRespond.ProtoReflect.Descriptor instead. func (*UpdateContractRespond) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{13} + return file_api_contract_contract_proto_rawDescGZIP(), []int{11} } type UpdateContractTxRequest struct { @@ -990,7 +889,7 @@ type UpdateContractTxRequest struct { func (x *UpdateContractTxRequest) Reset() { *x = UpdateContractTxRequest{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[14] + mi := &file_api_contract_contract_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1003,7 +902,7 @@ func (x *UpdateContractTxRequest) String() string { func (*UpdateContractTxRequest) ProtoMessage() {} func (x *UpdateContractTxRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[14] + mi := &file_api_contract_contract_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1016,7 +915,7 @@ func (x *UpdateContractTxRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateContractTxRequest.ProtoReflect.Descriptor instead. func (*UpdateContractTxRequest) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{14} + return file_api_contract_contract_proto_rawDescGZIP(), []int{12} } func (x *UpdateContractTxRequest) GetID() int64 { @@ -1042,7 +941,7 @@ type UpdateContractTxRespond struct { func (x *UpdateContractTxRespond) Reset() { *x = UpdateContractTxRespond{} if protoimpl.UnsafeEnabled { - mi := &file_api_contract_contract_proto_msgTypes[15] + mi := &file_api_contract_contract_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1055,7 +954,7 @@ func (x *UpdateContractTxRespond) String() string { func (*UpdateContractTxRespond) ProtoMessage() {} func (x *UpdateContractTxRespond) ProtoReflect() protoreflect.Message { - mi := &file_api_contract_contract_proto_msgTypes[15] + mi := &file_api_contract_contract_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1068,7 +967,7 @@ func (x *UpdateContractTxRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateContractTxRespond.ProtoReflect.Descriptor instead. func (*UpdateContractTxRespond) Descriptor() ([]byte, []int) { - return file_api_contract_contract_proto_rawDescGZIP(), []int{15} + return file_api_contract_contract_proto_rawDescGZIP(), []int{13} } var File_api_contract_contract_proto protoreflect.FileDescriptor @@ -1082,59 +981,52 @@ var file_api_contract_contract_proto_rawDesc = []byte{ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, - 0x6b, 0x0a, 0x13, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x61, 0x63, 0x74, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x48, 0x74, 0x6d, 0x6c, 0x54, 0x79, - 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x74, 0x6d, 0x6c, 0x54, 0x79, - 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x22, 0x15, 0x0a, 0x13, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x64, 0x22, 0x61, 0x0a, 0x13, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, - 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x12, 0x0a, 0x04, - 0x50, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x41, 0x0a, 0x13, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x2a, 0x0a, - 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, - 0x61, 0x74, 0x61, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0xf4, 0x03, 0x0a, 0x0c, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x67, - 0x6d, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x6d, 0x67, 0x6d, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x72, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, - 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x61, 0x63, 0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, - 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, - 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, - 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x42, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x18, 0x09, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, - 0x42, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x69, - 0x65, 0x77, 0x55, 0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x69, 0x65, - 0x77, 0x55, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, - 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, - 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, - 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x10, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, - 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, - 0x22, 0x63, 0x0a, 0x15, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x50, + 0x6b, 0x0a, 0x13, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, + 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, + 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, + 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x41, 0x0a, 0x13, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x64, 0x12, 0x2a, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x16, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, + 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, + 0xf4, 0x03, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, 0x61, 0x74, 0x61, + 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x61, 0x72, 0x64, + 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x49, 0x64, + 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x67, 0x6d, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x67, 0x6d, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, + 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x1e, + 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x64, 0x12, 0x24, + 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x42, 0x61, 0x74, 0x63, + 0x68, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x61, 0x74, 0x63, 0x68, + 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x56, 0x69, 0x65, 0x77, 0x55, 0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x76, 0x69, 0x65, 0x77, 0x55, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x6f, + 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x54, 0x69, 0x6d, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x78, 0x70, 0x69, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x69, + 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x69, + 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x6d, 0x0a, 0x15, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, + 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, @@ -1193,18 +1085,13 @@ var file_api_contract_contract_proto_rawDesc = []byte{ 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, - 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x32, 0x9f, 0x05, 0x0a, 0x08, 0x43, 0x6f, + 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x32, 0xcf, 0x04, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x54, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x1f, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4e, 0x0a, 0x0c, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x1d, 0x2e, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x56, 0x65, 0x72, - 0x69, 0x66, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x4e, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1d, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x43, 0x6f, @@ -1252,46 +1139,42 @@ func file_api_contract_contract_proto_rawDescGZIP() []byte { return file_api_contract_contract_proto_rawDescData } -var file_api_contract_contract_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_api_contract_contract_proto_msgTypes = make([]protoimpl.MessageInfo, 14) var file_api_contract_contract_proto_goTypes = []interface{}{ (*FinishContractRequest)(nil), // 0: Contract.FinishContractRequest (*FinishContractRespond)(nil), // 1: Contract.FinishContractRespond - (*FinishVerifyRequest)(nil), // 2: Contract.FinishVerifyRequest - (*FinishVerifyRespond)(nil), // 3: Contract.FinishVerifyRespond - (*ContractListRequest)(nil), // 4: Contract.ContractListRequest - (*ContractListRespond)(nil), // 5: Contract.ContractListRespond - (*ContractData)(nil), // 6: Contract.ContractData - (*ContractTxListRequest)(nil), // 7: Contract.ContractTxListRequest - (*ContractTxListRespond)(nil), // 8: Contract.ContractTxListRespond - (*SignContractRequest)(nil), // 9: Contract.SignContractRequest - (*SignContractRespond)(nil), // 10: Contract.SignContractRespond - (*GetContractRequest)(nil), // 11: Contract.GetContractRequest - (*UpdateContractRequest)(nil), // 12: Contract.UpdateContractRequest - (*UpdateContractRespond)(nil), // 13: Contract.UpdateContractRespond - (*UpdateContractTxRequest)(nil), // 14: Contract.UpdateContractTxRequest - (*UpdateContractTxRespond)(nil), // 15: Contract.UpdateContractTxRespond + (*ContractListRequest)(nil), // 2: Contract.ContractListRequest + (*ContractListRespond)(nil), // 3: Contract.ContractListRespond + (*ContractData)(nil), // 4: Contract.ContractData + (*ContractTxListRequest)(nil), // 5: Contract.ContractTxListRequest + (*ContractTxListRespond)(nil), // 6: Contract.ContractTxListRespond + (*SignContractRequest)(nil), // 7: Contract.SignContractRequest + (*SignContractRespond)(nil), // 8: Contract.SignContractRespond + (*GetContractRequest)(nil), // 9: Contract.GetContractRequest + (*UpdateContractRequest)(nil), // 10: Contract.UpdateContractRequest + (*UpdateContractRespond)(nil), // 11: Contract.UpdateContractRespond + (*UpdateContractTxRequest)(nil), // 12: Contract.UpdateContractTxRequest + (*UpdateContractTxRespond)(nil), // 13: Contract.UpdateContractTxRespond } var file_api_contract_contract_proto_depIdxs = []int32{ - 6, // 0: Contract.ContractListRespond.Data:type_name -> Contract.ContractData - 6, // 1: Contract.ContractTxListRespond.Data:type_name -> Contract.ContractData + 4, // 0: Contract.ContractListRespond.Data:type_name -> Contract.ContractData + 4, // 1: Contract.ContractTxListRespond.Data:type_name -> Contract.ContractData 0, // 2: Contract.Contract.FinishContract:input_type -> Contract.FinishContractRequest - 2, // 3: Contract.Contract.FinishVerify:input_type -> Contract.FinishVerifyRequest - 4, // 4: Contract.Contract.ContractList:input_type -> Contract.ContractListRequest - 11, // 5: Contract.Contract.GetContract:input_type -> Contract.GetContractRequest - 7, // 6: Contract.Contract.ContractTxList:input_type -> Contract.ContractTxListRequest - 9, // 7: Contract.Contract.SignContract:input_type -> Contract.SignContractRequest - 12, // 8: Contract.Contract.UpdateContract:input_type -> Contract.UpdateContractRequest - 14, // 9: Contract.Contract.UpdateContractTx:input_type -> Contract.UpdateContractTxRequest - 1, // 10: Contract.Contract.FinishContract:output_type -> Contract.FinishContractRespond - 3, // 11: Contract.Contract.FinishVerify:output_type -> Contract.FinishVerifyRespond - 5, // 12: Contract.Contract.ContractList:output_type -> Contract.ContractListRespond - 6, // 13: Contract.Contract.GetContract:output_type -> Contract.ContractData - 8, // 14: Contract.Contract.ContractTxList:output_type -> Contract.ContractTxListRespond - 10, // 15: Contract.Contract.SignContract:output_type -> Contract.SignContractRespond - 13, // 16: Contract.Contract.UpdateContract:output_type -> Contract.UpdateContractRespond - 15, // 17: Contract.Contract.UpdateContractTx:output_type -> Contract.UpdateContractTxRespond - 10, // [10:18] is the sub-list for method output_type - 2, // [2:10] is the sub-list for method input_type + 2, // 3: Contract.Contract.ContractList:input_type -> Contract.ContractListRequest + 9, // 4: Contract.Contract.GetContract:input_type -> Contract.GetContractRequest + 5, // 5: Contract.Contract.ContractTxList:input_type -> Contract.ContractTxListRequest + 7, // 6: Contract.Contract.SignContract:input_type -> Contract.SignContractRequest + 10, // 7: Contract.Contract.UpdateContract:input_type -> Contract.UpdateContractRequest + 12, // 8: Contract.Contract.UpdateContractTx:input_type -> Contract.UpdateContractTxRequest + 1, // 9: Contract.Contract.FinishContract:output_type -> Contract.FinishContractRespond + 3, // 10: Contract.Contract.ContractList:output_type -> Contract.ContractListRespond + 4, // 11: Contract.Contract.GetContract:output_type -> Contract.ContractData + 6, // 12: Contract.Contract.ContractTxList:output_type -> Contract.ContractTxListRespond + 8, // 13: Contract.Contract.SignContract:output_type -> Contract.SignContractRespond + 11, // 14: Contract.Contract.UpdateContract:output_type -> Contract.UpdateContractRespond + 13, // 15: Contract.Contract.UpdateContractTx:output_type -> Contract.UpdateContractTxRespond + 9, // [9:16] is the sub-list for method output_type + 2, // [2:9] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name 2, // [2:2] is the sub-list for extension extendee 0, // [0:2] is the sub-list for field type_name @@ -1328,30 +1211,6 @@ func file_api_contract_contract_proto_init() { } } file_api_contract_contract_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FinishVerifyRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_contract_contract_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FinishVerifyRespond); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_contract_contract_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ContractListRequest); i { case 0: return &v.state @@ -1363,7 +1222,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ContractListRespond); i { case 0: return &v.state @@ -1375,7 +1234,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ContractData); i { case 0: return &v.state @@ -1387,7 +1246,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ContractTxListRequest); i { case 0: return &v.state @@ -1399,7 +1258,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ContractTxListRespond); i { case 0: return &v.state @@ -1411,7 +1270,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SignContractRequest); i { case 0: return &v.state @@ -1423,7 +1282,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SignContractRespond); i { case 0: return &v.state @@ -1435,7 +1294,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetContractRequest); i { case 0: return &v.state @@ -1447,7 +1306,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateContractRequest); i { case 0: return &v.state @@ -1459,7 +1318,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateContractRespond); i { case 0: return &v.state @@ -1471,7 +1330,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateContractTxRequest); i { case 0: return &v.state @@ -1483,7 +1342,7 @@ func file_api_contract_contract_proto_init() { return nil } } - file_api_contract_contract_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_api_contract_contract_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateContractTxRespond); i { case 0: return &v.state @@ -1502,7 +1361,7 @@ func file_api_contract_contract_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_api_contract_contract_proto_rawDesc, NumEnums: 0, - NumMessages: 16, + NumMessages: 14, NumExtensions: 0, NumServices: 1, }, diff --git a/pb/contract/contract.proto b/pb/contract/contract.proto index c651cdc..556a18f 100644 --- a/pb/contract/contract.proto +++ b/pb/contract/contract.proto @@ -4,7 +4,6 @@ option go_package = "./;contract"; //$ protoc --proto_path=. --go_out=./api/contract --go-triple_out=./api/contract ./api/contract/contract.proto service Contract { rpc FinishContract (FinishContractRequest) returns (FinishContractRespond) {} - rpc FinishVerify (FinishVerifyRequest) returns (FinishVerifyRespond) {} rpc ContractList (ContractListRequest) returns (ContractListRespond) {} rpc GetContract (GetContractRequest) returns (ContractData) {} rpc ContractTxList (ContractTxListRequest) returns (ContractTxListRespond) {} @@ -24,19 +23,9 @@ message FinishContractRespond { } -message FinishVerifyRequest { - int64 ContractId = 1 [json_name="contractId"]; - string HtmlType = 2 [json_name="htmlType"]; - string EnvType = 3 [json_name= "envType"]; -} - -message FinishVerifyRespond { - -} - message ContractListRequest { - int64 Num = 1 [json_name="num"]; + int64 PageSize = 1 [json_name="pageSize"]; int64 Page = 2 [json_name="page"]; int64 State = 3 [json_name="state"]; int64 ID =4 [json_name = "id"]; @@ -68,7 +57,7 @@ message ContractData{ message ContractTxListRequest { - int64 Num = 1 [json_name="num"]; + int64 PageSize = 1 [json_name="pageSize"]; int64 Page = 2 [json_name="page"]; int64 State = 3 [json_name="state"]; int64 ID =4 [json_name = "id"]; diff --git a/pb/contract/contract_triple.pb.go b/pb/contract/contract_triple.pb.go index 88f7c12..cd742bd 100644 --- a/pb/contract/contract_triple.pb.go +++ b/pb/contract/contract_triple.pb.go @@ -29,7 +29,6 @@ const _ = grpc_go.SupportPackageIsVersion7 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type ContractClient interface { FinishContract(ctx context.Context, in *FinishContractRequest, opts ...grpc_go.CallOption) (*FinishContractRespond, common.ErrorWithAttachment) - FinishVerify(ctx context.Context, in *FinishVerifyRequest, opts ...grpc_go.CallOption) (*FinishVerifyRespond, common.ErrorWithAttachment) ContractList(ctx context.Context, in *ContractListRequest, opts ...grpc_go.CallOption) (*ContractListRespond, common.ErrorWithAttachment) GetContract(ctx context.Context, in *GetContractRequest, opts ...grpc_go.CallOption) (*ContractData, common.ErrorWithAttachment) ContractTxList(ctx context.Context, in *ContractTxListRequest, opts ...grpc_go.CallOption) (*ContractTxListRespond, common.ErrorWithAttachment) @@ -44,7 +43,6 @@ type contractClient struct { type ContractClientImpl struct { FinishContract func(ctx context.Context, in *FinishContractRequest) (*FinishContractRespond, error) - FinishVerify func(ctx context.Context, in *FinishVerifyRequest) (*FinishVerifyRespond, error) ContractList func(ctx context.Context, in *ContractListRequest) (*ContractListRespond, error) GetContract func(ctx context.Context, in *GetContractRequest) (*ContractData, error) ContractTxList func(ctx context.Context, in *ContractTxListRequest) (*ContractTxListRespond, error) @@ -71,12 +69,6 @@ func (c *contractClient) FinishContract(ctx context.Context, in *FinishContractR return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/FinishContract", in, out) } -func (c *contractClient) FinishVerify(ctx context.Context, in *FinishVerifyRequest, opts ...grpc_go.CallOption) (*FinishVerifyRespond, common.ErrorWithAttachment) { - out := new(FinishVerifyRespond) - interfaceKey := ctx.Value(constant.InterfaceKey).(string) - return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/FinishVerify", in, out) -} - func (c *contractClient) ContractList(ctx context.Context, in *ContractListRequest, opts ...grpc_go.CallOption) (*ContractListRespond, common.ErrorWithAttachment) { out := new(ContractListRespond) interfaceKey := ctx.Value(constant.InterfaceKey).(string) @@ -118,7 +110,6 @@ func (c *contractClient) UpdateContractTx(ctx context.Context, in *UpdateContrac // for forward compatibility type ContractServer interface { FinishContract(context.Context, *FinishContractRequest) (*FinishContractRespond, error) - FinishVerify(context.Context, *FinishVerifyRequest) (*FinishVerifyRespond, error) ContractList(context.Context, *ContractListRequest) (*ContractListRespond, error) GetContract(context.Context, *GetContractRequest) (*ContractData, error) ContractTxList(context.Context, *ContractTxListRequest) (*ContractTxListRespond, error) @@ -136,9 +127,6 @@ type UnimplementedContractServer struct { func (UnimplementedContractServer) FinishContract(context.Context, *FinishContractRequest) (*FinishContractRespond, error) { return nil, status.Errorf(codes.Unimplemented, "method FinishContract not implemented") } -func (UnimplementedContractServer) FinishVerify(context.Context, *FinishVerifyRequest) (*FinishVerifyRespond, error) { - return nil, status.Errorf(codes.Unimplemented, "method FinishVerify not implemented") -} func (UnimplementedContractServer) ContractList(context.Context, *ContractListRequest) (*ContractListRespond, error) { return nil, status.Errorf(codes.Unimplemented, "method ContractList not implemented") } @@ -214,35 +202,6 @@ func _Contract_FinishContract_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Contract_FinishVerify_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { - in := new(FinishVerifyRequest) - if err := dec(in); err != nil { - return nil, err - } - base := srv.(dubbo3.Dubbo3GrpcService) - args := []interface{}{} - args = append(args, in) - md, _ := metadata.FromIncomingContext(ctx) - invAttachment := make(map[string]interface{}, len(md)) - for k, v := range md { - invAttachment[k] = v - } - invo := invocation.NewRPCInvocation("FinishVerify", args, invAttachment) - if interceptor == nil { - result := base.XXX_GetProxyImpl().Invoke(ctx, invo) - return result, result.Error() - } - info := &grpc_go.UnaryServerInfo{ - Server: srv, - FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string), - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - result := base.XXX_GetProxyImpl().Invoke(ctx, invo) - return result, result.Error() - } - return interceptor(ctx, in, info, handler) -} - func _Contract_ContractList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { in := new(ContractListRequest) if err := dec(in); err != nil { @@ -428,10 +387,6 @@ var Contract_ServiceDesc = grpc_go.ServiceDesc{ MethodName: "FinishContract", Handler: _Contract_FinishContract_Handler, }, - { - MethodName: "FinishVerify", - Handler: _Contract_FinishVerify_Handler, - }, { MethodName: "ContractList", Handler: _Contract_ContractList_Handler, diff --git a/pkg/db/init.go b/pkg/db/init.go index e5305c6..89180b5 100644 --- a/pkg/db/init.go +++ b/pkg/db/init.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/fonchain-artistserver/cmd/model" - "github.com/fonchain-artistserver/pkg/m" + "github.com/fonchain/fonchain-artistinfo/cmd/model" + "github.com/fonchain/fonchain-artistinfo/pkg/m" "github.com/gin-gonic/gin" "gopkg.in/ini.v1" "gorm.io/driver/mysql" diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 5abc9ed..28bee94 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/fonchain-artistserver/pkg/m" + "github.com/fonchain/fonchain-artistinfo/pkg/m" "github.com/fonchain/utils/objstorage" )