From 8f755b2c89efcac82bafca5925cced85bd5f1209 Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Mon, 11 Dec 2023 13:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/golinter.xml | 6 ++++++ .idea/misc.xml | 8 -------- README.md | 5 +++++ cmd/app.go | 31 ++++++++++++++++++------------- conf/prod/config.yaml | 2 +- pb/{grpc => dci}/dci_grpc.pb.go | 2 +- pb/{dci => grpc}/dci_triple.pb.go | 2 +- pkg/err/amendType.go | 8 ++++++++ pkg/err/failDetail.go | 8 ++++++++ 9 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 .idea/golinter.xml delete mode 100644 .idea/misc.xml rename pb/{grpc => dci}/dci_grpc.pb.go (99%) rename pb/{dci => grpc}/dci_triple.pb.go (99%) create mode 100644 pkg/err/amendType.go create mode 100644 pkg/err/failDetail.go diff --git a/.idea/golinter.xml b/.idea/golinter.xml new file mode 100644 index 0000000..084cb03 --- /dev/null +++ b/.idea/golinter.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 283b9b4..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 334df1a..45b5f1e 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,9 @@ https://cdns.fontree.cn/fonchain-main/test/image/0/chain-dci/file/24bfa6de-cf39- ```text #数字版权登记流程 https://cdns.fontree.cn/fonchain-main/test/image/0/chain-dci/file/b2b9ebf8-5e8a-4697-af11-c07f788a6f77.png +``` + +```text +1,不需要的参数就不设置 +2,文件像素要求是 下限400*400，上限5000*5000 ``` \ No newline at end of file diff --git a/cmd/app.go b/cmd/app.go index f021df8..751913f 100644 --- a/cmd/app.go +++ b/cmd/app.go @@ -4,15 +4,20 @@ import ( dciConfig "chain-dci/config" "chain-dci/internal/controller" _ "chain-dci/internal/handler" + "chain-dci/pb/dci" "chain-dci/pkg/app" - common "chain-dci/pkg/init" + "google.golang.org/grpc" + + //common "chain-dci/pkg/init" "chain-dci/pkg/tracing" "dubbo.apache.org/dubbo-go/v3/config" _ "dubbo.apache.org/dubbo-go/v3/filter/tps/strategy" _ "dubbo.apache.org/dubbo-go/v3/imports" + "fmt" bccrClient "github.com/antchain-openapi-sdk-go/bccr/client" "github.com/bwmarrin/snowflake" "go.uber.org/zap" + "net" ) func NewApp(Lg *zap.Logger, JaegerTracer *tracing.JaegerProvider, BccrClient *bccrClient.Client, SfNode *snowflake.Node) *app.App { @@ -32,19 +37,19 @@ func main() { panic(err) } - /* l, err := net.Listen("tcp", ":8883") - if err != nil { - fmt.Printf("failed to listen: %v", err) - return - } + l, err := net.Listen("tcp", ":8883") + if err != nil { + fmt.Printf("failed to listen: %v", err) + return + } - s := grpc.NewServer() // 创建gRPC服务器 - dci.RegisterDciServer(s, &controller.DciProvider{}) // 在gRPC服务端注册服务 - // 启动服务 - err = s.Serve(l)*/ - //注册服务 - config.SetProviderService(&controller.DciProvider{}) - common.Init() + s := grpc.NewServer() // 创建gRPC服务器 + dci.RegisterDciServer(s, &controller.DciProvider{}) // 在gRPC服务端注册服务 + // 启动服务 + err = s.Serve(l) + ////注册服务 + //config.SetProviderService(&controller.DciProvider{}) + //common.Init() if err = config.Load(); err != nil { panic(err) } diff --git a/conf/prod/config.yaml b/conf/prod/config.yaml index 10bcbe5..bc24db5 100644 --- a/conf/prod/config.yaml +++ b/conf/prod/config.yaml @@ -10,7 +10,7 @@ system: Bccr: access_key_id: "ACsK4CQqzj5rGSKf" access_key_secret: "SJmH5eATWY26tJrVg8QyHaBGbLNCbj7y" - end_point: "openapi-sit.antchain.antgroup.com" + end_point: "openapi.antchain.antgroup.com" #redis: # db: ${oa-meeting.redis.db} # addr: ${redis.addr} diff --git a/pb/grpc/dci_grpc.pb.go b/pb/dci/dci_grpc.pb.go similarity index 99% rename from pb/grpc/dci_grpc.pb.go rename to pb/dci/dci_grpc.pb.go index f1fdbaa..462b00e 100644 --- a/pb/grpc/dci_grpc.pb.go +++ b/pb/dci/dci_grpc.pb.go @@ -4,7 +4,7 @@ // - protoc v3.21.4 // source: pb/dci.proto -package grpc +package dci import ( context "context" diff --git a/pb/dci/dci_triple.pb.go b/pb/grpc/dci_triple.pb.go similarity index 99% rename from pb/dci/dci_triple.pb.go rename to pb/grpc/dci_triple.pb.go index 00e6c6f..7cc3381 100644 --- a/pb/dci/dci_triple.pb.go +++ b/pb/grpc/dci_triple.pb.go @@ -4,7 +4,7 @@ // - protoc v3.21.4 // source: pb/dci.proto -package dci +package grpc import ( context "context" diff --git a/pkg/err/amendType.go b/pkg/err/amendType.go new file mode 100644 index 0000000..51d2ed1 --- /dev/null +++ b/pkg/err/amendType.go @@ -0,0 +1,8 @@ +package err + +var AmendType = map[string]string{ + "TOBE_AMEND": "待补正", + "AMEND_CHECK_FAIL": "待补正审核不通过", + "REPLACE_DCI": "需要替换DCI补正", + "NO_NEED_REPLACE_DCI": "不需要替换DCI补正", +} diff --git a/pkg/err/failDetail.go b/pkg/err/failDetail.go new file mode 100644 index 0000000..18ddc49 --- /dev/null +++ b/pkg/err/failDetail.go @@ -0,0 +1,8 @@ +package err + +var FailDetail = map[string]string{ + "CHECK_FAIL": "初审不通过", + "TOBE_AMEND": "待补正", + "AMEND_CHECK_FAIL": "待补正审核不通过", + "DISREGARD": "不予受理", +}