From c1f5962c655d2f989576bf59855d6ae4c1fcedfe Mon Sep 17 00:00:00 2001 From: luyanming <1490927649@qq.com> Date: Wed, 21 Jun 2023 17:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4api/approval?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- go.mod | 6 +++--- go.sum | 3 --- pkg/model/approval.go | 1 - pkg/model/approval_oa.go | 1 - pkg/model/approval_oa_test.go | 1 - pkg/model/approval_setting.go | 1 - pkg/model/approval_type.go | 1 - pkg/model/bundle.go | 1 - pkg/model/bundle_pay_price.go | 1 - pkg/model/exhibition.go | 1 - pkg/model/exhibition_reward.go | 1 - pkg/model/financial_form.go | 1 - pkg/model/show.go | 1 - pkg/model/work.go | 1 - pkg/serializer/approval.go | 1 - pkg/serializer/approval_type.go | 1 - pkg/serializer/department_approval_setting.go | 1 - pkg/service/approval.go | 1 - pkg/service/approval_oa.go | 1 - pkg/service/financial_form_setting.go | 1 - 21 files changed, 4 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index b8ebff9..e30002f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ### protot文件编译指令 ```shell -protoc --proto_path=. --proto_path=D:/go_workspace/src --go_out=./api/approvalFork --govalidators_out=./api/approvalFork --go-triple_out=./api/approvalFork ./api/approval/approvalFork.proto +protoc --proto_path=. --proto_path=D:/go_workspace/src --go_out=./api/approvalFork --govalidators_out=./api/approvalFork --go-triple_out=./api/approvalFork ./api/approvalFork/approvalFork.proto ``` ## 二、测试启动fontree-client diff --git a/go.mod b/go.mod index 1a13f76..b09f4f2 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,15 @@ module github.com/fonchain_enterprise/fonchain-approval-fork go 1.18 + require ( dubbo.apache.org/dubbo-go/v3 v3.0.2 github.com/dubbogo/grpc-go v1.42.9 github.com/dubbogo/triple v1.1.8 github.com/gin-gonic/gin v1.8.1 - github.com/golang/protobuf v1.5.2 github.com/jinzhu/copier v0.3.5 - github.com/mwitkow/go-proto-validators v0.3.2 github.com/pkg/errors v0.9.1 google.golang.org/protobuf v1.28.0 - gopkg.in/ini.v1 v1.66.6 gorm.io/driver/mysql v1.3.5 gorm.io/gorm v1.23.8 gorm.io/plugin/soft_delete v1.2.0 @@ -63,6 +61,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.5.0 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.3.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect @@ -138,6 +137,7 @@ require ( google.golang.org/appengine v1.6.6 // indirect google.golang.org/genproto v0.0.0-20211104193956-4c6863e31247 // indirect google.golang.org/grpc v1.47.0 // indirect + gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gorm.io/driver/sqlite v1.3.1 // indirect diff --git a/go.sum b/go.sum index e2db8c3..5852b6e 100644 --- a/go.sum +++ b/go.sum @@ -275,7 +275,6 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -570,8 +569,6 @@ github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-proto-validators v0.3.2 h1:qRlmpTzm2pstMKKzTdvwPCF5QfBNURSlAgN/R+qbKos= -github.com/mwitkow/go-proto-validators v0.3.2/go.mod h1:ej0Qp0qMgHN/KtDyUt+Q1/tA7a5VarXUOUxD+oeD30w= github.com/nacos-group/nacos-sdk-go v1.0.8/go.mod h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA= github.com/nacos-group/nacos-sdk-go v1.1.1 h1:beczWcOoTaVBMgCgikqvZflrN5Xbw7pWAWpxl+VJGIA= github.com/nacos-group/nacos-sdk-go v1.1.1/go.mod h1:UHOtQNQY/qpk2dhg6gDq8u5+/CEIc3+lWmrmxEzX0/g= diff --git a/pkg/model/approval.go b/pkg/model/approval.go index e3b6928..641914a 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -5,7 +5,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/page" msg "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "github.com/jinzhu/copier" diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go index 7c9475a..95b7884 100644 --- a/pkg/model/approval_oa.go +++ b/pkg/model/approval_oa.go @@ -5,7 +5,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "github.com/jinzhu/copier" "gorm.io/plugin/soft_delete" diff --git a/pkg/model/approval_oa_test.go b/pkg/model/approval_oa_test.go index 0a631cf..5f88454 100644 --- a/pkg/model/approval_oa_test.go +++ b/pkg/model/approval_oa_test.go @@ -1,7 +1,6 @@ package model import ( - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "gorm.io/plugin/soft_delete" "reflect" "testing" diff --git a/pkg/model/approval_setting.go b/pkg/model/approval_setting.go index 2056189..980d758 100644 --- a/pkg/model/approval_setting.go +++ b/pkg/model/approval_setting.go @@ -3,7 +3,6 @@ package model import ( "database/sql/driver" "encoding/json" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "gorm.io/plugin/soft_delete" "time" ) diff --git a/pkg/model/approval_type.go b/pkg/model/approval_type.go index 7771347..57e653d 100644 --- a/pkg/model/approval_type.go +++ b/pkg/model/approval_type.go @@ -2,7 +2,6 @@ package model import ( "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" md52 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/md5" "gorm.io/plugin/soft_delete" "math/rand" diff --git a/pkg/model/bundle.go b/pkg/model/bundle.go index bb9cd4d..1203458 100644 --- a/pkg/model/bundle.go +++ b/pkg/model/bundle.go @@ -2,7 +2,6 @@ package model import ( "errors" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "gorm.io/plugin/soft_delete" "time" diff --git a/pkg/model/bundle_pay_price.go b/pkg/model/bundle_pay_price.go index de678fd..1442901 100644 --- a/pkg/model/bundle_pay_price.go +++ b/pkg/model/bundle_pay_price.go @@ -2,7 +2,6 @@ package model import ( "errors" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "gorm.io/plugin/soft_delete" "time" diff --git a/pkg/model/exhibition.go b/pkg/model/exhibition.go index 4df17f3..5cb23ac 100644 --- a/pkg/model/exhibition.go +++ b/pkg/model/exhibition.go @@ -3,7 +3,6 @@ package model import ( "errors" "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/collection" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "gorm.io/plugin/soft_delete" diff --git a/pkg/model/exhibition_reward.go b/pkg/model/exhibition_reward.go index acd0567..0d89950 100644 --- a/pkg/model/exhibition_reward.go +++ b/pkg/model/exhibition_reward.go @@ -3,7 +3,6 @@ package model import ( "errors" "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/collection" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "gorm.io/plugin/soft_delete" diff --git a/pkg/model/financial_form.go b/pkg/model/financial_form.go index 2304a0e..5159395 100644 --- a/pkg/model/financial_form.go +++ b/pkg/model/financial_form.go @@ -2,7 +2,6 @@ package model import ( "errors" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "github.com/jinzhu/copier" "gorm.io/plugin/soft_delete" diff --git a/pkg/model/show.go b/pkg/model/show.go index fe83f18..a575404 100644 --- a/pkg/model/show.go +++ b/pkg/model/show.go @@ -2,7 +2,6 @@ package model import ( "errors" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "gorm.io/plugin/soft_delete" "time" diff --git a/pkg/model/work.go b/pkg/model/work.go index 7480398..7e1bece 100644 --- a/pkg/model/work.go +++ b/pkg/model/work.go @@ -3,7 +3,6 @@ package model import ( "errors" "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/collection" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "gorm.io/plugin/soft_delete" diff --git a/pkg/serializer/approval.go b/pkg/serializer/approval.go index 8d96aa7..27edd01 100644 --- a/pkg/serializer/approval.go +++ b/pkg/serializer/approval.go @@ -1,7 +1,6 @@ package serializer import ( - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model" ) diff --git a/pkg/serializer/approval_type.go b/pkg/serializer/approval_type.go index 9c017a9..22c4ec3 100644 --- a/pkg/serializer/approval_type.go +++ b/pkg/serializer/approval_type.go @@ -1,7 +1,6 @@ package serializer import ( - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model" ) diff --git a/pkg/serializer/department_approval_setting.go b/pkg/serializer/department_approval_setting.go index a018a48..d4b85a8 100644 --- a/pkg/serializer/department_approval_setting.go +++ b/pkg/serializer/department_approval_setting.go @@ -1,7 +1,6 @@ package serializer import ( - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model" ) diff --git a/pkg/service/approval.go b/pkg/service/approval.go index 56b9362..2451cd1 100644 --- a/pkg/service/approval.go +++ b/pkg/service/approval.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/page" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model" diff --git a/pkg/service/approval_oa.go b/pkg/service/approval_oa.go index cfac938..2b7b6d3 100644 --- a/pkg/service/approval_oa.go +++ b/pkg/service/approval_oa.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model" "gorm.io/gorm" diff --git a/pkg/service/financial_form_setting.go b/pkg/service/financial_form_setting.go index 2432655..2c1333e 100644 --- a/pkg/service/financial_form_setting.go +++ b/pkg/service/financial_form_setting.go @@ -2,7 +2,6 @@ package service import ( "context" - "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model" )