删除api/approval

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

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

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=

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"

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"

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"

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"
 )

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"

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"

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"

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"

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"

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"

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"

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"

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"
 )

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"
 )

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"
 )

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"

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"

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"
 )