diff --git a/cmd/app.go b/cmd/app.go index fbe8248..2478839 100644 --- a/cmd/app.go +++ b/cmd/app.go @@ -19,6 +19,7 @@ func main() { config.SetProviderService(&controller.ArtistInfoUserProvider{}) config.SetProviderService(&controller.ArtistInfoArtworkProvider{}) config.SetProviderService(&controller.ArtistInfoArtshowProvider{}) + config.SetProviderService(&controller.ArtistInfoContractProvider{}) //config.SetProviderService(&controller.ContractProvider{}) //config.SetProviderService(&controller.ArtWorkProvider{}) //config.SetProviderService(&controller.SupplyProvider{}) diff --git a/cmd/internal/controller/artistInfo_artwork.go b/cmd/internal/controller/artistInfo_artwork.go index 1edcc8d..78e5017 100644 --- a/cmd/internal/controller/artistInfo_artwork.go +++ b/cmd/internal/controller/artistInfo_artwork.go @@ -9,6 +9,7 @@ package controller import ( "context" "errors" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/logic" "github.com/fonchain/fonchain-artistinfo/pb/artistInfoArtwork" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/cmd/internal/controller/contract.go b/cmd/internal/controller/contract.go index cc69ff3..e83856c 100644 --- a/cmd/internal/controller/contract.go +++ b/cmd/internal/controller/contract.go @@ -8,12 +8,12 @@ import ( contract "github.com/fonchain/fonchain-artistinfo/pb/contract" ) -type ContractProvider struct { +type ArtistInfoContractProvider struct { contract.UnimplementedArtistContractServer contractLogic *logic.Contract } -func (c *ContractProvider) CreateContract(ctx context.Context, req *contract.CreateContractRequest) (rep *contract.CreateContractRespond, err error) { +func (c *ArtistInfoContractProvider) CreateContract(ctx context.Context, req *contract.CreateContractRequest) (rep *contract.CreateContractRespond, err error) { fmt.Println("第一处") if rep, err = c.contractLogic.CreateContract(req); err != nil { return nil, err @@ -21,7 +21,7 @@ func (c *ContractProvider) CreateContract(ctx context.Context, req *contract.Cre return rep, nil } -func (c *ContractProvider) ContractListMgmt(ctx context.Context, req *contract.ContractListMgmtRequest) (rep *contract.ContractListMgmtRespond, err error) { +func (c *ArtistInfoContractProvider) ContractListMgmt(ctx context.Context, req *contract.ContractListMgmtRequest) (rep *contract.ContractListMgmtRespond, err error) { fmt.Println("第一处") if rep, err = c.contractLogic.ContractListMgmt(req); err != nil { return nil, err @@ -29,7 +29,7 @@ func (c *ContractProvider) ContractListMgmt(ctx context.Context, req *contract.C return rep, nil } -func (c *ContractProvider) ContractList(ctx context.Context, req *contract.ContractListRequest) (rep *contract.ContractListRespond, err error) { +func (c *ArtistInfoContractProvider) ContractList(ctx context.Context, req *contract.ContractListRequest) (rep *contract.ContractListRespond, err error) { fmt.Println("第一处") if rep, err = c.contractLogic.ContractList(req); err != nil { return nil, err @@ -37,7 +37,7 @@ func (c *ContractProvider) ContractList(ctx context.Context, req *contract.Contr return rep, nil } -func (c *ContractProvider) SignContract(ctx context.Context, req *contract.SignContractRequest) (rep *contract.SignContractRespond, err error) { +func (c *ArtistInfoContractProvider) SignContract(ctx context.Context, req *contract.SignContractRequest) (rep *contract.SignContractRespond, err error) { fmt.Println("第一处") if rep, err = c.contractLogic.SignContract(req); err != nil { return nil, err @@ -45,7 +45,7 @@ func (c *ContractProvider) SignContract(ctx context.Context, req *contract.SignC return rep, nil } -func (c *ContractProvider) FinishContract(ctx context.Context, req *contract.FinishContractRequest) (rep *contract.FinishContractRespond, err error) { +func (c *ArtistInfoContractProvider) FinishContract(ctx context.Context, req *contract.FinishContractRequest) (rep *contract.FinishContractRespond, err error) { fmt.Println("第一处") if rep, err = c.contractLogic.FinishContract(req); err != nil { return nil, err diff --git a/conf/dev/dubbogo.yaml b/conf/dev/dubbogo.yaml index fba8484..a8964cc 100644 --- a/conf/dev/dubbogo.yaml +++ b/conf/dev/dubbogo.yaml @@ -24,6 +24,9 @@ dubbo: ArtistInfoArtshowProvider: interface: com.fontree.microservices.common.ArtistInfoArtshow retries: 100 + ArtistInfoContractProvider: + interface: com.fontree.microservices.common.ArtistInfoContract + retries: 100 #ContractProvider: # interface: com.fontree.microservices.common.Contract # retries: 0 diff --git a/conf/dubbogo.yaml b/conf/dubbogo.yaml index e1ac224..a1f65e4 100644 --- a/conf/dubbogo.yaml +++ b/conf/dubbogo.yaml @@ -28,6 +28,9 @@ dubbo: ArtistInfoArtshowProvider: interface: com.fontree.microservices.common.ArtistInfoArtshow retries: 100 + ArtistInfoContractProvider: + interface: com.fontree.microservices.common.ArtistInfoContract + retries: 100 #ContractProvider: # interface: com.fontree.microservices.common.Contract # retries: 0 diff --git a/conf/test/dubbogo.yaml b/conf/test/dubbogo.yaml index 440a7d7..cdbb5fe 100644 --- a/conf/test/dubbogo.yaml +++ b/conf/test/dubbogo.yaml @@ -28,6 +28,9 @@ dubbo: ArtistInfoArtshowProvider: interface: com.fontree.microservices.common.ArtistInfoArtshow retries: 100 + ArtistInfoContractProvider: + interface: com.fontree.microservices.common.ArtistInfoContract + retries: 100 #ContractProvider: # interface: com.fontree.microservices.common.Contract # retries: 0 diff --git a/conf/xjjdev/dubbogo.yaml b/conf/xjjdev/dubbogo.yaml index e1ac224..a1f65e4 100644 --- a/conf/xjjdev/dubbogo.yaml +++ b/conf/xjjdev/dubbogo.yaml @@ -28,6 +28,9 @@ dubbo: ArtistInfoArtshowProvider: interface: com.fontree.microservices.common.ArtistInfoArtshow retries: 100 + ArtistInfoContractProvider: + interface: com.fontree.microservices.common.ArtistInfoContract + retries: 100 #ContractProvider: # interface: com.fontree.microservices.common.Contract # retries: 0 diff --git a/pkg/db/init.go b/pkg/db/init.go index a022656..0a4c6d8 100644 --- a/pkg/db/init.go +++ b/pkg/db/init.go @@ -2,11 +2,12 @@ package model import ( "fmt" - "github.com/fonchain/fonchain-artistinfo/cmd/model/old" "os" "strings" "time" + "github.com/fonchain/fonchain-artistinfo/cmd/model/old" + "github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/pkg/m" "github.com/gin-gonic/gin" @@ -121,6 +122,7 @@ func migration() { &model.ArtshowVideoRecord{}, //画展视频记录 &model.ArtshowArtistIndex{}, //画展-画家指数 &model.ArtshowArtistSupplement{}, //画展-画家补充信息 + &model.Contract{}, //合同 ) if err != nil { fmt.Println("register table fail")