Selaa lähdekoodia

merg:工作桌面和站内社交冲突处理

zhangxinlei1996 2 vuotta sitten
vanhempi
commit
82007e756b

+ 4 - 3
api/internal/handler/getentuserinfohandler.go

@@ -3,9 +3,10 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/logic"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/types"
+	"userCenter/api/internal/logic"
+	"userCenter/api/internal/svc"
+	"userCenter/api/internal/types"
+
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 4 - 3
api/internal/handler/getuserinfohandler.go

@@ -3,9 +3,10 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/logic"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/types"
+	"userCenter/api/internal/logic"
+	"userCenter/api/internal/svc"
+	"userCenter/api/internal/types"
+
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/routes.go

@@ -59,7 +59,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-<<<<<<< HEAD
 				Path:    "/userCenter/workDesktop/menuInfo",
 				Handler: WorkDesktopMenuInfoHandler(serverCtx),
 			},
@@ -72,7 +71,9 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Method:  http.MethodGet,
 				Path:    "/userCenter/workDesktop/clearUserInfo",
 				Handler: WorkDesktopClearUserInfoHandler(serverCtx),
-=======
+			},
+			{
+				Method:  http.MethodPost,
 				Path:    "/userCenter/user/getUserInfo",
 				Handler: GetUserInfoHandler(serverCtx),
 			},
@@ -80,7 +81,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Method:  http.MethodPost,
 				Path:    "/userCenter/ent/userInfo",
 				Handler: GetEntUserInfoHandler(serverCtx),
->>>>>>> master
 			},
 		},
 	)

+ 4 - 4
api/internal/logic/getentuserinfologic.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/entity"
+	"userCenter/entity"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+	"userCenter/rpc/pb"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/types"
+	"userCenter/api/internal/svc"
+	"userCenter/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 5 - 4
api/internal/logic/getuserinfologic.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+	"userCenter/rpc/pb"
+
+	"userCenter/api/internal/svc"
+	"userCenter/api/internal/types"
+	"userCenter/entity"
 
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/api/internal/types"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/entity"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

+ 1 - 1
api/userCenter.api

@@ -307,7 +307,7 @@ service userCenter-api {
 	post /userCenter/workDesktop/renew/:actionMode (WorkDesktopComprehensiveReq) returns (CommonResp)
 	@handler WorkDesktopClearUserInfo
 	get /userCenter/workDesktop/clearUserInfo (WorkDesktopClearUserInfo) returns (CommonResp)
-
+	
 	@handler GetUserInfo
 	post /userCenter/user/getUserInfo(UserReq)returns(resp)
 	@handler GetEntUserInfo

+ 0 - 1
entity/db.go

@@ -11,5 +11,4 @@ var (
 	BaseMysql         *mysql.Mysql
 	UserTable         = "base_user"
 	UserSnapshotTable = "base_user_snapshot"
-	Mgo               mongodb.MongodbSim
 )

+ 2 - 1
entity/entUser.go

@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"userCenter/rpc/usercenter"
+
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/mysql"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/usercenter"
 )
 
 type EntUserInfo struct {

+ 5 - 92
go.mod

@@ -1,101 +1,14 @@
 module userCenter
 
-go 1.18
+go 1.16
 
 require (
 	app.yhyue.com/moapp/jyInfo v1.0.0
-	app.yhyue.com/moapp/jybase v0.0.0-20220719064915-2fef79005dfa
+	app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
-<<<<<<< HEAD
-	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.1
-	github.com/zeromicro/go-zero v1.3.5
-=======
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.2-0.20220723113228-8ddb7d40e0dc
-	github.com/zeromicro/go-zero v1.3.5
-	golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 // indirect
->>>>>>> master
+	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220812011915-0653b00d30fd
+	github.com/zeromicro/go-zero v1.4.0
 	google.golang.org/grpc v1.48.0
-	google.golang.org/protobuf v1.28.0
-)
-
-require (
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/garyburd/redigo v1.6.2 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-redis/redis/v8 v8.11.5 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
-	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.1 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/openzipkin/zipkin-go v0.4.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.12.2 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.0.2 // indirect
-	github.com/xdg-go/stringprep v1.0.2 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.etcd.io/etcd/api/v3 v3.5.4 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.4 // indirect
-	go.mongodb.org/mongo-driver v1.9.1 // indirect
-	go.opentelemetry.io/otel v1.8.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.8.0 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.8.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.8.0 // indirect
-	go.opentelemetry.io/otel/trace v1.8.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/automaxprocs v1.5.1 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 // indirect
-	golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
-	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2 // indirect
-	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/driver/mysql v1.0.5 // indirect
-	gorm.io/gorm v1.21.3 // indirect
-	k8s.io/api v0.22.9 // indirect
-	k8s.io/apimachinery v0.22.9 // indirect
-	k8s.io/client-go v0.22.9 // indirect
-	k8s.io/klog/v2 v2.40.1 // indirect
-	k8s.io/utils v0.0.0-20220706174534-f6158b442e7c // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	google.golang.org/protobuf v1.28.1
 )

+ 46 - 26
go.sum

@@ -6,8 +6,9 @@ app.yhyue.com/moapp/jybase v0.0.0-20220418104200-46c3fff161c7/go.mod h1:qNRA0sHu
 app.yhyue.com/moapp/jybase v0.0.0-20220419023055-f406279ff7e3/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-app.yhyue.com/moapp/jybase v0.0.0-20220719064915-2fef79005dfa h1:fGlW3FjP2VeJCH6hZ2Oc1lwi5lI3n3U8JeLVCPKs+9c=
 app.yhyue.com/moapp/jybase v0.0.0-20220719064915-2fef79005dfa/go.mod h1:FjBF25AYoBrPhVKTXGXWcmEAbBT0ATTK6KJMOA+I80Q=
+app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b h1:7EtDV0o2XsluZI0ftgb2Twa/QlX7HxHP2SKhtyfnJV4=
+app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tcD9TcKb/HOP2BLbzppyDz2kpQSFhPMQTUgbQ=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
 bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.mod h1:Yj4oabIGItuMoF0BXYLz2XAnF581kxgXBrvlUtIJrkI=
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4 h1:zl5eZrKDBENVVBUiPpzyQQ0/SBdGUmZS3thXycSEO1g=
@@ -16,15 +17,12 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220418005748-8ba5d936d
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419023723-0b32d4a41751/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419063004-233fc7ce006c/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220420075831-0b59892e9982/go.mod h1:wsHNO91h37H+xE4ZNny0yd7mtpODeDJxbVYhIRMR+qw=
-<<<<<<< HEAD
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.1 h1:DsPfVxVBWQ1NUWuroqRkPYuqQnRPj+LRPQjjPG+Vjyc=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.1/go.mod h1:hIemvGYYrFtL8mP7qIy1DENTEn1QQ09eUMf2DyXnigk=
-=======
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.2-0.20220723113228-8ddb7d40e0dc h1:cFKYXQLF1r3vD6xp5xf3ar4keWpD6qQb9kpJUCUPySw=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.2-0.20220723113228-8ddb7d40e0dc/go.mod h1:Z353aucNO5hH4ZYjeKST3kE1PN3W8/uPc4J8s0Upz40=
->>>>>>> master
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220812011915-0653b00d30fd h1:TNhv1DL+rz7iUseiZIEihm3rrOdPxvhN5Vbuj2Mswcc=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220812011915-0653b00d30fd/go.mod h1:bdeIxGXB56vv+T0T751KSYmMuwFgtIwlXwQmkxV66kQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -174,6 +172,7 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/fullstorydev/grpcurl v1.8.6/go.mod h1:WhP7fRQdhxz2TkL97u+TCb505sxfH78W1usyoB3tepw=
 github.com/garyburd/redigo v1.6.2 h1:yE/pwKCrbLpLpQICzYTeZ7JsTA/C53wFTJHaEtRqniM=
 github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -215,9 +214,9 @@ github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
 github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
@@ -329,6 +328,7 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i
 github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
 github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=
 github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
+github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
@@ -359,6 +359,12 @@ github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/U
 github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
 github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
+github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI=
+github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI=
+github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ=
+github.com/jhump/protoreflect v1.10.3/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg=
+github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E=
+github.com/jhump/protoreflect v1.12.0/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI=
 github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
@@ -438,13 +444,16 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 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/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso=
 github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -461,6 +470,7 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
 github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -476,10 +486,7 @@ github.com/openzipkin/zipkin-go v0.4.0 h1:CtfRrOVZtbDj8rt1WXjklw0kqqJQwICrCKmlfU
 github.com/openzipkin/zipkin-go v0.4.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ=
 github.com/paulmach/orb v0.7.1/go.mod h1:FWRlTgl88VI1RBx/MkrwWDRhQ96ctqMCh8boXhmqB/A=
 github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
-<<<<<<< HEAD
-=======
 github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI=
->>>>>>> master
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
 github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
@@ -575,10 +582,12 @@ github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hM
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
-github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
+github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
+github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
+github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
@@ -594,8 +603,9 @@ github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 h1:k/gmLsJDWwWqbLC
 github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeromicro/go-zero v1.3.2/go.mod h1:DEj3Fwj1Ui1ltsgf6YqwTL9nD4+tYzIRX0c1pWtQo1E=
-github.com/zeromicro/go-zero v1.3.5 h1:+3T4Rx/5o/EgLuCE3Qo4X0i+3GCHRYEgkabmfKhhQ7Q=
 github.com/zeromicro/go-zero v1.3.5/go.mod h1:wh4o794b7Ul3W0k35Pw9nc3iB4O0OpaQTMQz/PJc1bc=
+github.com/zeromicro/go-zero v1.4.0 h1:gtJ6XY7AZUJvA9omWNAWqxCd4hRE5vo1ObS2q+dUJgo=
+github.com/zeromicro/go-zero v1.4.0/go.mod h1:1amLn98K7c6FLntb9f8hdmq26ajtolOg4DTFWnRt54o=
 go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
@@ -606,8 +616,9 @@ go.etcd.io/etcd/client/v3 v3.5.2/go.mod h1:kOOaWFFgHygyT0WlSmL8TJiXmMysO/nNUlEsS
 go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4=
 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 go.mongodb.org/mongo-driver v1.5.0/go.mod h1:boiGPFqyBs5R0R5qf2ErokGRekMfwn+MqKaUyHs7wy0=
-go.mongodb.org/mongo-driver v1.9.1 h1:m078y9v7sBItkt1aaoe2YlvWEXcD263e1a4E1fBrJ1c=
 go.mongodb.org/mongo-driver v1.9.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
+go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4=
+go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -617,23 +628,28 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg=
 go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
 go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
-go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg=
 go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
+go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw=
+go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo=
 go.opentelemetry.io/otel/exporters/jaeger v1.3.0/go.mod h1:KoYHi1BtkUPncGSRtCe/eh1ijsnePhSkxwzz07vU0Fc=
-go.opentelemetry.io/otel/exporters/jaeger v1.8.0 h1:TLLqD6kDhLPziEC7pgPrMvP9lAqdk3n1gf8DiFSnfW8=
 go.opentelemetry.io/otel/exporters/jaeger v1.8.0/go.mod h1:GbWg+ng88rDtx+id26C34QLqw2erqJeAjsCx9AFeHfE=
+go.opentelemetry.io/otel/exporters/jaeger v1.9.0 h1:gAEgEVGDWwFjcis9jJTOJqZNxDzoZfR12WNIxr7g9Ww=
+go.opentelemetry.io/otel/exporters/jaeger v1.9.0/go.mod h1:hquezOLVAybNW6vanIxkdLXTXvzlj2Vn3wevSP15RYs=
 go.opentelemetry.io/otel/exporters/zipkin v1.3.0/go.mod h1:LxGGfHIYbvsFnrJtBcazb0yG24xHdDGrT/H6RB9r3+8=
-go.opentelemetry.io/otel/exporters/zipkin v1.8.0 h1:PIAiDdROZzATAFfxr5ASYuSOG0JIJxRq3GwlpJGbSYQ=
 go.opentelemetry.io/otel/exporters/zipkin v1.8.0/go.mod h1:0uYAyCuGT67MFV9Z/Mmx93wGuugHw0FbxMc74fs3LNo=
+go.opentelemetry.io/otel/exporters/zipkin v1.9.0 h1:06b/nt6xao6th00aue9WU3ZDTTe+InaMXA/vym6pLuA=
+go.opentelemetry.io/otel/exporters/zipkin v1.9.0/go.mod h1:HyIvYIu37wV4Wx5azd7e05x9k/dOz9KB4x0plw2QNvs=
 go.opentelemetry.io/otel/sdk v1.0.0/go.mod h1:PCrDHlSy5x1kjezSdL37PhbFUMjrsLRshJ2zCzeXwbM=
 go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
-go.opentelemetry.io/otel/sdk v1.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk=
 go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c=
+go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo=
+go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4=
 go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs=
 go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
 go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
-go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY=
 go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
+go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc=
+go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
@@ -665,8 +681,9 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 h1:kETrAMYZq6WVGPa8IIixL0CaEcIUNi+1WX7grUoi3y8=
 golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -689,6 +706,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -698,6 +716,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -742,14 +761,9 @@ golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-<<<<<<< HEAD
-golang.org/x/net v0.0.0-20220531201128-c960675eff93 h1:MYimHLfoXEpOhqd/zgoA/uoXzHB86AEky4LAx5ij9xA=
-golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-=======
 golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 h1:8NSylCMxLW4JvserAndSgFL7aPli6A68yf0bYFTcWCM=
 golang.org/x/net v0.0.0-20220706163947-c90051bbdb60/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
->>>>>>> master
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -903,8 +917,10 @@ golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWc
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
@@ -913,10 +929,12 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -1009,11 +1027,13 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

+ 2 - 5
rpc/internal/config/config.go

@@ -1,12 +1,13 @@
 package config
 
 import (
+	"userCenter/entity"
+
 	"bp.jydev.jianyu360.cn/BaseService/resourceCenter/rpc/resource"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/discov"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/zrpc"
-	"userCenter/entity"
 )
 
 type Config struct {
@@ -21,7 +22,6 @@ type Config struct {
 	IsRun            bool   //定时任务是否开启
 	CheckEntIsExpire string //
 	DoMain           string
-<<<<<<< HEAD
 	RedisAddrees     []string
 	RedisOutTime     int64
 	InternalTime     int64
@@ -43,9 +43,6 @@ type MongoStruct struct {
 	CollectionBack string `json:"collectionBack,optional"`
 	MaxOpenConns   int    `json:"maxOpenConns,optional"`
 	MaxIdleConns   int    `json:"maxIdleConns,optional"`
-=======
-	Mongo            Mongodb
->>>>>>> master
 }
 
 var (

+ 4 - 13
rpc/internal/db/db.go

@@ -1,15 +1,16 @@
 package db
 
 import (
-	"app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jybase/redis"
 	"log"
 	"strings"
 
 	"app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
+
 	"userCenter/entity"
 	"userCenter/rpc/internal/config"
+
+	"app.yhyue.com/moapp/jybase/mysql"
 )
 
 func init() {
@@ -33,7 +34,6 @@ func init() {
 	}
 	log.Println("初始化 base mysql")
 	entity.BaseMysql.Init()
-<<<<<<< HEAD
 
 	log.Println("初始化 redis")
 	redis.InitRedisBySize(strings.Join(config.ConfigJson.RedisAddrees, ","), 100, 30, 300)
@@ -50,15 +50,6 @@ func init() {
 	}
 	//用户角色功能初始化
 	entity.UserRolePowerInit(config.ConfigJson.UserRolePower)
-=======
 	log.Println("初始化 mysql")
 
-	entity.Mgo = mongodb.MongodbSim{
-		MongodbAddr: config.ConfigJson.Mongo.Address,
-		Size:        config.ConfigJson.Mongo.Size,
-		DbName:      config.ConfigJson.Mongo.DbName,
-	}
-	entity.Mgo.InitPool()
-	log.Println("初始化mongodb")
->>>>>>> master
 }

+ 2 - 2
rpc/internal/logic/checkisentadminlogic.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+	"userCenter/rpc/internal/svc"
+	"userCenter/rpc/pb"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 2 - 2
rpc/internal/logic/getentuserinfologic.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+	"userCenter/rpc/internal/svc"
+	"userCenter/rpc/pb"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 2 - 2
rpc/internal/logic/getentuserlistlogic.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+	"userCenter/rpc/internal/svc"
+	"userCenter/rpc/pb"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 2
rpc/internal/logic/getuserinfologic.go

@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"log"
 
+	"userCenter/rpc/internal/svc"
+	"userCenter/rpc/pb"
+
 	"app.yhyue.com/moapp/jybase/common"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/internal/svc"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 24 - 24
rpc/internal/server/usercenterserver.go

@@ -76,30 +76,6 @@ func (s *UserCenterServer) GetStatusByCode(ctx context.Context, in *pb.GetStatus
 	return l.GetStatusByCode(in)
 }
 
-// 获取客户信息
-func (s *UserCenterServer) GetUserInfo(ctx context.Context, in *pb.UserReq) (*pb.UserInfo, error) {
-	l := logic.NewGetUserInfoLogic(ctx, s.svcCtx)
-	return l.GetUserInfo(in)
-}
-
-// 根据企业员工id获取员工的信息
-func (s *UserCenterServer) GetEntUserInfo(ctx context.Context, in *pb.EntUserReq) (*pb.EntUserResp, error) {
-	l := logic.NewGetEntUserInfoLogic(ctx, s.svcCtx)
-	return l.GetEntUserInfo(in)
-}
-
-// 获取企业员工列表
-func (s *UserCenterServer) GetEntUserList(ctx context.Context, in *pb.EntUserListReq) (*pb.EntUserListResp, error) {
-	l := logic.NewGetEntUserListLogic(ctx, s.svcCtx)
-	return l.GetEntUserList(in)
-}
-
-// 查看员工是否是企业管理员
-func (s *UserCenterServer) CheckIsEntAdmin(ctx context.Context, in *pb.EntUserReq) (*pb.CheckIsEntAdminResp, error) {
-	l := logic.NewCheckIsEntAdminLogic(ctx, s.svcCtx)
-	return l.CheckIsEntAdmin(in)
-}
-
 // 新增用户
 func (s *UserCenterServer) UserAdd(ctx context.Context, in *pb.UserAddReq) (*pb.UserAddResp, error) {
 	l := logic.NewUserAddLogic(ctx, s.svcCtx)
@@ -135,3 +111,27 @@ func (s *UserCenterServer) WorkDesktopClearUserInfo(ctx context.Context, in *pb.
 	l := logic.NewWorkDesktopClearUserInfoLogic(ctx, s.svcCtx)
 	return l.WorkDesktopClearUserInfo(in)
 }
+
+// 获取客户信息
+func (s *UserCenterServer) GetUserInfo(ctx context.Context, in *pb.UserReq) (*pb.UserInfo, error) {
+	l := logic.NewGetUserInfoLogic(ctx, s.svcCtx)
+	return l.GetUserInfo(in)
+}
+
+// 根据企业员工id获取员工的信息
+func (s *UserCenterServer) GetEntUserInfo(ctx context.Context, in *pb.EntUserReq) (*pb.EntUserResp, error) {
+	l := logic.NewGetEntUserInfoLogic(ctx, s.svcCtx)
+	return l.GetEntUserInfo(in)
+}
+
+// 获取企业员工列表
+func (s *UserCenterServer) GetEntUserList(ctx context.Context, in *pb.EntUserListReq) (*pb.EntUserListResp, error) {
+	l := logic.NewGetEntUserListLogic(ctx, s.svcCtx)
+	return l.GetEntUserList(in)
+}
+
+// 查看员工是否是企业管理员
+func (s *UserCenterServer) CheckIsEntAdmin(ctx context.Context, in *pb.EntUserReq) (*pb.CheckIsEntAdminResp, error) {
+	l := logic.NewCheckIsEntAdminLogic(ctx, s.svcCtx)
+	return l.CheckIsEntAdmin(in)
+}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 925 - 591
rpc/pb/userCenter.pb.go


+ 125 - 211
rpc/pb/userCenter_grpc.pb.go

@@ -1,11 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-<<<<<<< HEAD
-// - protoc             v3.15.5
-=======
 // - protoc             v3.19.4
->>>>>>> master
 // source: userCenter.proto
 
 package pb
@@ -44,32 +40,26 @@ type UserCenterClient interface {
 	ExamineInfo(ctx context.Context, in *CheckExamineReq, opts ...grpc.CallOption) (*EntInfoResp, error)
 	//根据统一社会信用代码查询企业状态
 	GetStatusByCode(ctx context.Context, in *GetStatusByCodeReq, opts ...grpc.CallOption) (*GetStatusByCodeResp, error)
-<<<<<<< HEAD
-=======
-	//获取客户信息
-	GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error)
-	//根据企业员工id获取员工的信息
-	GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error)
-	//获取企业员工列表
-	GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error)
-	//查看员工是否是企业管理员
-	CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error)
->>>>>>> master
 	//新增用户
 	UserAdd(ctx context.Context, in *UserAddReq, opts ...grpc.CallOption) (*UserAddResp, error)
 	//更新用户
 	UserUpdate(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error)
 	//删除用户
 	UserDel(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error)
-<<<<<<< HEAD
 	//获取菜单树
 	WorkDesktopMenuInfo(ctx context.Context, in *WorkDesktopMenuInfoReq, opts ...grpc.CallOption) (*WorkDesktopMenuInfoResp, error)
 	//菜单选择模式||常用功能更新||常用功能列表
 	WorkDesktopComprehensive(ctx context.Context, in *WorkDesktopComprehensiveReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error)
 	//手动清除用户功能内存信息
 	WorkDesktopClearUserInfo(ctx context.Context, in *WorkDesktopClearUserInfoReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error)
-=======
->>>>>>> master
+	//获取客户信息
+	GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error)
+	//根据企业员工id获取员工的信息
+	GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error)
+	//获取企业员工列表
+	GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error)
+	//查看员工是否是企业管理员
+	CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error)
 }
 
 type userCenterClient struct {
@@ -161,99 +151,90 @@ func (c *userCenterClient) GetStatusByCode(ctx context.Context, in *GetStatusByC
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *userCenterClient) UserAdd(ctx context.Context, in *UserAddReq, opts ...grpc.CallOption) (*UserAddResp, error) {
 	out := new(UserAddResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/UserAdd", in, out, opts...)
-=======
-func (c *userCenterClient) GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error) {
-	out := new(UserInfo)
-	err := c.cc.Invoke(ctx, "/UserCenter/GetUserInfo", in, out, opts...)
->>>>>>> master
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *userCenterClient) UserUpdate(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error) {
 	out := new(ExamineResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/UserUpdate", in, out, opts...)
-=======
-func (c *userCenterClient) GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error) {
-	out := new(EntUserResp)
-	err := c.cc.Invoke(ctx, "/UserCenter/GetEntUserInfo", in, out, opts...)
->>>>>>> master
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *userCenterClient) UserDel(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error) {
 	out := new(ExamineResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/UserDel", in, out, opts...)
-=======
-func (c *userCenterClient) GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error) {
-	out := new(EntUserListResp)
-	err := c.cc.Invoke(ctx, "/UserCenter/GetEntUserList", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *userCenterClient) CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error) {
-	out := new(CheckIsEntAdminResp)
-	err := c.cc.Invoke(ctx, "/UserCenter/CheckIsEntAdmin", in, out, opts...)
->>>>>>> master
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-<<<<<<< HEAD
 func (c *userCenterClient) WorkDesktopMenuInfo(ctx context.Context, in *WorkDesktopMenuInfoReq, opts ...grpc.CallOption) (*WorkDesktopMenuInfoResp, error) {
 	out := new(WorkDesktopMenuInfoResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/WorkDesktopMenuInfo", in, out, opts...)
-=======
-func (c *userCenterClient) UserAdd(ctx context.Context, in *UserAddReq, opts ...grpc.CallOption) (*UserAddResp, error) {
-	out := new(UserAddResp)
-	err := c.cc.Invoke(ctx, "/UserCenter/UserAdd", in, out, opts...)
->>>>>>> master
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *userCenterClient) WorkDesktopComprehensive(ctx context.Context, in *WorkDesktopComprehensiveReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error) {
 	out := new(WorkDesktopComprehensiveResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/WorkDesktopComprehensive", in, out, opts...)
-=======
-func (c *userCenterClient) UserUpdate(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error) {
-	out := new(ExamineResp)
-	err := c.cc.Invoke(ctx, "/UserCenter/UserUpdate", in, out, opts...)
->>>>>>> master
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *userCenterClient) WorkDesktopClearUserInfo(ctx context.Context, in *WorkDesktopClearUserInfoReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error) {
 	out := new(WorkDesktopComprehensiveResp)
 	err := c.cc.Invoke(ctx, "/UserCenter/WorkDesktopClearUserInfo", in, out, opts...)
-=======
-func (c *userCenterClient) UserDel(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error) {
-	out := new(ExamineResp)
-	err := c.cc.Invoke(ctx, "/UserCenter/UserDel", in, out, opts...)
->>>>>>> master
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userCenterClient) GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error) {
+	out := new(UserInfo)
+	err := c.cc.Invoke(ctx, "/UserCenter/GetUserInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userCenterClient) GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error) {
+	out := new(EntUserResp)
+	err := c.cc.Invoke(ctx, "/UserCenter/GetEntUserInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userCenterClient) GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error) {
+	out := new(EntUserListResp)
+	err := c.cc.Invoke(ctx, "/UserCenter/GetEntUserList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userCenterClient) CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error) {
+	out := new(CheckIsEntAdminResp)
+	err := c.cc.Invoke(ctx, "/UserCenter/CheckIsEntAdmin", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -282,32 +263,26 @@ type UserCenterServer interface {
 	ExamineInfo(context.Context, *CheckExamineReq) (*EntInfoResp, error)
 	//根据统一社会信用代码查询企业状态
 	GetStatusByCode(context.Context, *GetStatusByCodeReq) (*GetStatusByCodeResp, error)
-<<<<<<< HEAD
-=======
-	//获取客户信息
-	GetUserInfo(context.Context, *UserReq) (*UserInfo, error)
-	//根据企业员工id获取员工的信息
-	GetEntUserInfo(context.Context, *EntUserReq) (*EntUserResp, error)
-	//获取企业员工列表
-	GetEntUserList(context.Context, *EntUserListReq) (*EntUserListResp, error)
-	//查看员工是否是企业管理员
-	CheckIsEntAdmin(context.Context, *EntUserReq) (*CheckIsEntAdminResp, error)
->>>>>>> master
 	//新增用户
 	UserAdd(context.Context, *UserAddReq) (*UserAddResp, error)
 	//更新用户
 	UserUpdate(context.Context, *UserIdReq) (*ExamineResp, error)
 	//删除用户
 	UserDel(context.Context, *UserIdReq) (*ExamineResp, error)
-<<<<<<< HEAD
 	//获取菜单树
 	WorkDesktopMenuInfo(context.Context, *WorkDesktopMenuInfoReq) (*WorkDesktopMenuInfoResp, error)
 	//菜单选择模式||常用功能更新||常用功能列表
 	WorkDesktopComprehensive(context.Context, *WorkDesktopComprehensiveReq) (*WorkDesktopComprehensiveResp, error)
 	//手动清除用户功能内存信息
 	WorkDesktopClearUserInfo(context.Context, *WorkDesktopClearUserInfoReq) (*WorkDesktopComprehensiveResp, error)
-=======
->>>>>>> master
+	//获取客户信息
+	GetUserInfo(context.Context, *UserReq) (*UserInfo, error)
+	//根据企业员工id获取员工的信息
+	GetEntUserInfo(context.Context, *EntUserReq) (*EntUserResp, error)
+	//获取企业员工列表
+	GetEntUserList(context.Context, *EntUserListReq) (*EntUserListResp, error)
+	//查看员工是否是企业管理员
+	CheckIsEntAdmin(context.Context, *EntUserReq) (*CheckIsEntAdminResp, error)
 	mustEmbedUnimplementedUserCenterServer()
 }
 
@@ -342,21 +317,6 @@ func (UnimplementedUserCenterServer) ExamineInfo(context.Context, *CheckExamineR
 func (UnimplementedUserCenterServer) GetStatusByCode(context.Context, *GetStatusByCodeReq) (*GetStatusByCodeResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetStatusByCode not implemented")
 }
-<<<<<<< HEAD
-=======
-func (UnimplementedUserCenterServer) GetUserInfo(context.Context, *UserReq) (*UserInfo, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetUserInfo not implemented")
-}
-func (UnimplementedUserCenterServer) GetEntUserInfo(context.Context, *EntUserReq) (*EntUserResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetEntUserInfo not implemented")
-}
-func (UnimplementedUserCenterServer) GetEntUserList(context.Context, *EntUserListReq) (*EntUserListResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetEntUserList not implemented")
-}
-func (UnimplementedUserCenterServer) CheckIsEntAdmin(context.Context, *EntUserReq) (*CheckIsEntAdminResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CheckIsEntAdmin not implemented")
-}
->>>>>>> master
 func (UnimplementedUserCenterServer) UserAdd(context.Context, *UserAddReq) (*UserAddResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserAdd not implemented")
 }
@@ -366,7 +326,6 @@ func (UnimplementedUserCenterServer) UserUpdate(context.Context, *UserIdReq) (*E
 func (UnimplementedUserCenterServer) UserDel(context.Context, *UserIdReq) (*ExamineResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserDel not implemented")
 }
-<<<<<<< HEAD
 func (UnimplementedUserCenterServer) WorkDesktopMenuInfo(context.Context, *WorkDesktopMenuInfoReq) (*WorkDesktopMenuInfoResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method WorkDesktopMenuInfo not implemented")
 }
@@ -376,8 +335,18 @@ func (UnimplementedUserCenterServer) WorkDesktopComprehensive(context.Context, *
 func (UnimplementedUserCenterServer) WorkDesktopClearUserInfo(context.Context, *WorkDesktopClearUserInfoReq) (*WorkDesktopComprehensiveResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method WorkDesktopClearUserInfo not implemented")
 }
-=======
->>>>>>> master
+func (UnimplementedUserCenterServer) GetUserInfo(context.Context, *UserReq) (*UserInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetUserInfo not implemented")
+}
+func (UnimplementedUserCenterServer) GetEntUserInfo(context.Context, *EntUserReq) (*EntUserResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetEntUserInfo not implemented")
+}
+func (UnimplementedUserCenterServer) GetEntUserList(context.Context, *EntUserListReq) (*EntUserListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetEntUserList not implemented")
+}
+func (UnimplementedUserCenterServer) CheckIsEntAdmin(context.Context, *EntUserReq) (*CheckIsEntAdminResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CheckIsEntAdmin not implemented")
+}
 func (UnimplementedUserCenterServer) mustEmbedUnimplementedUserCenterServer() {}
 
 // UnsafeUserCenterServer may be embedded to opt out of forward compatibility for this service.
@@ -553,18 +522,12 @@ func _UserCenter_GetStatusByCode_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
 func _UserCenter_UserAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UserAddReq)
-=======
-func _UserCenter_GetUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserReq)
->>>>>>> master
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
 		return srv.(UserCenterServer).UserAdd(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -573,32 +536,16 @@ func _UserCenter_GetUserInfo_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserCenterServer).UserAdd(ctx, req.(*UserAddReq))
-=======
-		return srv.(UserCenterServer).GetUserInfo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/UserCenter/GetUserInfo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).GetUserInfo(ctx, req.(*UserReq))
->>>>>>> master
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
 func _UserCenter_UserUpdate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UserIdReq)
-=======
-func _UserCenter_GetEntUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(EntUserReq)
->>>>>>> master
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
 		return srv.(UserCenterServer).UserUpdate(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -607,32 +554,16 @@ func _UserCenter_GetEntUserInfo_Handler(srv interface{}, ctx context.Context, de
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserCenterServer).UserUpdate(ctx, req.(*UserIdReq))
-=======
-		return srv.(UserCenterServer).GetEntUserInfo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/UserCenter/GetEntUserInfo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).GetEntUserInfo(ctx, req.(*EntUserReq))
->>>>>>> master
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
 func _UserCenter_UserDel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UserIdReq)
-=======
-func _UserCenter_GetEntUserList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(EntUserListReq)
->>>>>>> master
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
 		return srv.(UserCenterServer).UserDel(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -641,136 +572,132 @@ func _UserCenter_GetEntUserList_Handler(srv interface{}, ctx context.Context, de
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserCenterServer).UserDel(ctx, req.(*UserIdReq))
-=======
-		return srv.(UserCenterServer).GetEntUserList(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/UserCenter/GetEntUserList",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).GetEntUserList(ctx, req.(*EntUserListReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _UserCenter_CheckIsEntAdmin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(EntUserReq)
+func _UserCenter_WorkDesktopMenuInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(WorkDesktopMenuInfoReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(UserCenterServer).CheckIsEntAdmin(ctx, in)
+		return srv.(UserCenterServer).WorkDesktopMenuInfo(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/CheckIsEntAdmin",
+		FullMethod: "/UserCenter/WorkDesktopMenuInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).CheckIsEntAdmin(ctx, req.(*EntUserReq))
->>>>>>> master
+		return srv.(UserCenterServer).WorkDesktopMenuInfo(ctx, req.(*WorkDesktopMenuInfoReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
-func _UserCenter_WorkDesktopMenuInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WorkDesktopMenuInfoReq)
-=======
-func _UserCenter_UserAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserAddReq)
->>>>>>> master
+func _UserCenter_WorkDesktopComprehensive_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(WorkDesktopComprehensiveReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
-		return srv.(UserCenterServer).WorkDesktopMenuInfo(ctx, in)
+		return srv.(UserCenterServer).WorkDesktopComprehensive(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/WorkDesktopMenuInfo",
+		FullMethod: "/UserCenter/WorkDesktopComprehensive",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).WorkDesktopMenuInfo(ctx, req.(*WorkDesktopMenuInfoReq))
-=======
-		return srv.(UserCenterServer).UserAdd(ctx, in)
+		return srv.(UserCenterServer).WorkDesktopComprehensive(ctx, req.(*WorkDesktopComprehensiveReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _UserCenter_WorkDesktopClearUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(WorkDesktopClearUserInfoReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserCenterServer).WorkDesktopClearUserInfo(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/UserAdd",
+		FullMethod: "/UserCenter/WorkDesktopClearUserInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).UserAdd(ctx, req.(*UserAddReq))
->>>>>>> master
+		return srv.(UserCenterServer).WorkDesktopClearUserInfo(ctx, req.(*WorkDesktopClearUserInfoReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
-func _UserCenter_WorkDesktopComprehensive_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WorkDesktopComprehensiveReq)
-=======
-func _UserCenter_UserUpdate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserIdReq)
->>>>>>> master
+func _UserCenter_GetUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
-		return srv.(UserCenterServer).WorkDesktopComprehensive(ctx, in)
+		return srv.(UserCenterServer).GetUserInfo(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/WorkDesktopComprehensive",
+		FullMethod: "/UserCenter/GetUserInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).WorkDesktopComprehensive(ctx, req.(*WorkDesktopComprehensiveReq))
-=======
-		return srv.(UserCenterServer).UserUpdate(ctx, in)
+		return srv.(UserCenterServer).GetUserInfo(ctx, req.(*UserReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _UserCenter_GetEntUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(EntUserReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserCenterServer).GetEntUserInfo(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/UserUpdate",
+		FullMethod: "/UserCenter/GetEntUserInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).UserUpdate(ctx, req.(*UserIdReq))
->>>>>>> master
+		return srv.(UserCenterServer).GetEntUserInfo(ctx, req.(*EntUserReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
-func _UserCenter_WorkDesktopClearUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WorkDesktopClearUserInfoReq)
-=======
-func _UserCenter_UserDel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserIdReq)
->>>>>>> master
+func _UserCenter_GetEntUserList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(EntUserListReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
-		return srv.(UserCenterServer).WorkDesktopClearUserInfo(ctx, in)
+		return srv.(UserCenterServer).GetEntUserList(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/WorkDesktopClearUserInfo",
+		FullMethod: "/UserCenter/GetEntUserList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).WorkDesktopClearUserInfo(ctx, req.(*WorkDesktopClearUserInfoReq))
-=======
-		return srv.(UserCenterServer).UserDel(ctx, in)
+		return srv.(UserCenterServer).GetEntUserList(ctx, req.(*EntUserListReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _UserCenter_CheckIsEntAdmin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(EntUserReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserCenterServer).CheckIsEntAdmin(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/UserCenter/UserDel",
+		FullMethod: "/UserCenter/CheckIsEntAdmin",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserCenterServer).UserDel(ctx, req.(*UserIdReq))
->>>>>>> master
+		return srv.(UserCenterServer).CheckIsEntAdmin(ctx, req.(*EntUserReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -819,7 +746,6 @@ var UserCenter_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _UserCenter_GetStatusByCode_Handler,
 		},
 		{
-<<<<<<< HEAD
 			MethodName: "UserAdd",
 			Handler:    _UserCenter_UserAdd_Handler,
 		},
@@ -842,7 +768,8 @@ var UserCenter_ServiceDesc = grpc.ServiceDesc{
 		{
 			MethodName: "WorkDesktopClearUserInfo",
 			Handler:    _UserCenter_WorkDesktopClearUserInfo_Handler,
-=======
+		},
+		{
 			MethodName: "GetUserInfo",
 			Handler:    _UserCenter_GetUserInfo_Handler,
 		},
@@ -858,19 +785,6 @@ var UserCenter_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "CheckIsEntAdmin",
 			Handler:    _UserCenter_CheckIsEntAdmin_Handler,
 		},
-		{
-			MethodName: "UserAdd",
-			Handler:    _UserCenter_UserAdd_Handler,
-		},
-		{
-			MethodName: "UserUpdate",
-			Handler:    _UserCenter_UserUpdate_Handler,
-		},
-		{
-			MethodName: "UserDel",
-			Handler:    _UserCenter_UserDel_Handler,
->>>>>>> master
-		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "userCenter.proto",

+ 44 - 91
rpc/usercenter/usercenter.go

@@ -13,11 +13,11 @@ import (
 )
 
 type (
-<<<<<<< HEAD
 	CheckData                    = pb.CheckData
 	CheckEntReq                  = pb.CheckEntReq
 	CheckEntResp                 = pb.CheckEntResp
 	CheckExamineReq              = pb.CheckExamineReq
+	CheckIsEntAdminResp          = pb.CheckIsEntAdminResp
 	EntAuthData                  = pb.EntAuthData
 	EntAuthReq                   = pb.EntAuthReq
 	EntAuthResp                  = pb.EntAuthResp
@@ -28,6 +28,12 @@ type (
 	EntListReq                   = pb.EntListReq
 	EntListResp                  = pb.EntListResp
 	EntUpdateReq                 = pb.EntUpdateReq
+	EntUser                      = pb.EntUser
+	EntUserListData              = pb.EntUserListData
+	EntUserListReq               = pb.EntUserListReq
+	EntUserListResp              = pb.EntUserListResp
+	EntUserReq                   = pb.EntUserReq
+	EntUserResp                  = pb.EntUserResp
 	ExamineData                  = pb.ExamineData
 	ExamineList                  = pb.ExamineList
 	ExamineListData              = pb.ExamineListData
@@ -38,63 +44,26 @@ type (
 	GetStatusByCode              = pb.GetStatusByCode
 	GetStatusByCodeReq           = pb.GetStatusByCodeReq
 	GetStatusByCodeResp          = pb.GetStatusByCodeResp
+	Items                        = pb.Items
+	Keys                         = pb.Keys
+	List                         = pb.List
 	MenuData                     = pb.MenuData
 	MenuList                     = pb.MenuList
 	SecondLevelMenu              = pb.SecondLevelMenu
+	Subscribe                    = pb.Subscribe
 	ThreeLevelMenu               = pb.ThreeLevelMenu
 	TipInfo                      = pb.TipInfo
 	UserAddReq                   = pb.UserAddReq
 	UserAddResp                  = pb.UserAddResp
 	UserAdds                     = pb.UserAdds
 	UserIdReq                    = pb.UserIdReq
+	UserInfo                     = pb.UserInfo
+	UserReq                      = pb.UserReq
 	WorkDesktopClearUserInfoReq  = pb.WorkDesktopClearUserInfoReq
 	WorkDesktopComprehensiveReq  = pb.WorkDesktopComprehensiveReq
 	WorkDesktopComprehensiveResp = pb.WorkDesktopComprehensiveResp
 	WorkDesktopMenuInfoReq       = pb.WorkDesktopMenuInfoReq
 	WorkDesktopMenuInfoResp      = pb.WorkDesktopMenuInfoResp
-=======
-	CheckData           = pb.CheckData
-	CheckEntReq         = pb.CheckEntReq
-	CheckEntResp        = pb.CheckEntResp
-	CheckExamineReq     = pb.CheckExamineReq
-	CheckIsEntAdminResp = pb.CheckIsEntAdminResp
-	EntAuthData         = pb.EntAuthData
-	EntAuthReq          = pb.EntAuthReq
-	EntAuthResp         = pb.EntAuthResp
-	EntData             = pb.EntData
-	EntInfoData         = pb.EntInfoData
-	EntInfoResp         = pb.EntInfoResp
-	EntList             = pb.EntList
-	EntListReq          = pb.EntListReq
-	EntListResp         = pb.EntListResp
-	EntUpdateReq        = pb.EntUpdateReq
-	EntUser             = pb.EntUser
-	EntUserListData     = pb.EntUserListData
-	EntUserListReq      = pb.EntUserListReq
-	EntUserListResp     = pb.EntUserListResp
-	EntUserReq          = pb.EntUserReq
-	EntUserResp         = pb.EntUserResp
-	ExamineData         = pb.ExamineData
-	ExamineList         = pb.ExamineList
-	ExamineListData     = pb.ExamineListData
-	ExamineListReq      = pb.ExamineListReq
-	ExamineListResp     = pb.ExamineListResp
-	ExamineReq          = pb.ExamineReq
-	ExamineResp         = pb.ExamineResp
-	GetStatusByCode     = pb.GetStatusByCode
-	GetStatusByCodeReq  = pb.GetStatusByCodeReq
-	GetStatusByCodeResp = pb.GetStatusByCodeResp
-	Items               = pb.Items
-	Keys                = pb.Keys
-	List                = pb.List
-	Subscribe           = pb.Subscribe
-	UserAddReq          = pb.UserAddReq
-	UserAddResp         = pb.UserAddResp
-	UserAdds            = pb.UserAdds
-	UserIdReq           = pb.UserIdReq
-	UserInfo            = pb.UserInfo
-	UserReq             = pb.UserReq
->>>>>>> master
 
 	UserCenter interface {
 		// 企业认证
@@ -115,32 +84,26 @@ type (
 		ExamineInfo(ctx context.Context, in *CheckExamineReq, opts ...grpc.CallOption) (*EntInfoResp, error)
 		// 根据统一社会信用代码查询企业状态
 		GetStatusByCode(ctx context.Context, in *GetStatusByCodeReq, opts ...grpc.CallOption) (*GetStatusByCodeResp, error)
-<<<<<<< HEAD
-=======
-		// 获取客户信息
-		GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error)
-		// 根据企业员工id获取员工的信息
-		GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error)
-		// 获取企业员工列表
-		GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error)
-		// 查看员工是否是企业管理员
-		CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error)
->>>>>>> master
 		// 新增用户
 		UserAdd(ctx context.Context, in *UserAddReq, opts ...grpc.CallOption) (*UserAddResp, error)
 		// 更新用户
 		UserUpdate(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error)
 		// 删除用户
 		UserDel(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error)
-<<<<<<< HEAD
 		// 获取菜单树
 		WorkDesktopMenuInfo(ctx context.Context, in *WorkDesktopMenuInfoReq, opts ...grpc.CallOption) (*WorkDesktopMenuInfoResp, error)
 		// 菜单选择模式||常用功能更新||常用功能列表
 		WorkDesktopComprehensive(ctx context.Context, in *WorkDesktopComprehensiveReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error)
 		// 手动清除用户功能内存信息
 		WorkDesktopClearUserInfo(ctx context.Context, in *WorkDesktopClearUserInfoReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error)
-=======
->>>>>>> master
+		// 获取客户信息
+		GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error)
+		// 根据企业员工id获取员工的信息
+		GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error)
+		// 获取企业员工列表
+		GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error)
+		// 查看员工是否是企业管理员
+		CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error)
 	}
 
 	defaultUserCenter struct {
@@ -204,37 +167,8 @@ func (m *defaultUserCenter) ExamineInfo(ctx context.Context, in *CheckExamineReq
 
 // 根据统一社会信用代码查询企业状态
 func (m *defaultUserCenter) GetStatusByCode(ctx context.Context, in *GetStatusByCodeReq, opts ...grpc.CallOption) (*GetStatusByCodeResp, error) {
-<<<<<<< HEAD
 	client := pb.NewUserCenterClient(m.cli.Conn())
 	return client.GetStatusByCode(ctx, in, opts...)
-=======
-	client := pb.NewUserCenterClient(m.cli.Conn())
-	return client.GetStatusByCode(ctx, in, opts...)
-}
-
-// 获取客户信息
-func (m *defaultUserCenter) GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error) {
-	client := pb.NewUserCenterClient(m.cli.Conn())
-	return client.GetUserInfo(ctx, in, opts...)
-}
-
-// 根据企业员工id获取员工的信息
-func (m *defaultUserCenter) GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error) {
-	client := pb.NewUserCenterClient(m.cli.Conn())
-	return client.GetEntUserInfo(ctx, in, opts...)
-}
-
-// 获取企业员工列表
-func (m *defaultUserCenter) GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error) {
-	client := pb.NewUserCenterClient(m.cli.Conn())
-	return client.GetEntUserList(ctx, in, opts...)
-}
-
-// 查看员工是否是企业管理员
-func (m *defaultUserCenter) CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error) {
-	client := pb.NewUserCenterClient(m.cli.Conn())
-	return client.CheckIsEntAdmin(ctx, in, opts...)
->>>>>>> master
 }
 
 // 新增用户
@@ -251,7 +185,6 @@ func (m *defaultUserCenter) UserUpdate(ctx context.Context, in *UserIdReq, opts
 
 // 删除用户
 func (m *defaultUserCenter) UserDel(ctx context.Context, in *UserIdReq, opts ...grpc.CallOption) (*ExamineResp, error) {
-<<<<<<< HEAD
 	client := pb.NewUserCenterClient(m.cli.Conn())
 	return client.UserDel(ctx, in, opts...)
 }
@@ -272,8 +205,28 @@ func (m *defaultUserCenter) WorkDesktopComprehensive(ctx context.Context, in *Wo
 func (m *defaultUserCenter) WorkDesktopClearUserInfo(ctx context.Context, in *WorkDesktopClearUserInfoReq, opts ...grpc.CallOption) (*WorkDesktopComprehensiveResp, error) {
 	client := pb.NewUserCenterClient(m.cli.Conn())
 	return client.WorkDesktopClearUserInfo(ctx, in, opts...)
-=======
+}
+
+// 获取客户信息
+func (m *defaultUserCenter) GetUserInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserInfo, error) {
 	client := pb.NewUserCenterClient(m.cli.Conn())
-	return client.UserDel(ctx, in, opts...)
->>>>>>> master
+	return client.GetUserInfo(ctx, in, opts...)
+}
+
+// 根据企业员工id获取员工的信息
+func (m *defaultUserCenter) GetEntUserInfo(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*EntUserResp, error) {
+	client := pb.NewUserCenterClient(m.cli.Conn())
+	return client.GetEntUserInfo(ctx, in, opts...)
+}
+
+// 获取企业员工列表
+func (m *defaultUserCenter) GetEntUserList(ctx context.Context, in *EntUserListReq, opts ...grpc.CallOption) (*EntUserListResp, error) {
+	client := pb.NewUserCenterClient(m.cli.Conn())
+	return client.GetEntUserList(ctx, in, opts...)
+}
+
+// 查看员工是否是企业管理员
+func (m *defaultUserCenter) CheckIsEntAdmin(ctx context.Context, in *EntUserReq, opts ...grpc.CallOption) (*CheckIsEntAdminResp, error) {
+	client := pb.NewUserCenterClient(m.cli.Conn())
+	return client.CheckIsEntAdmin(ctx, in, opts...)
 }

+ 2 - 2
service/subscribe.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/entity"
-	userCenter "bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/usercenter"
+	"userCenter/entity"
+	userCenter "userCenter/rpc/usercenter"
 )
 
 type SubscribeService struct{}

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä