فهرست منبع

添加接口:查询erp用户所在的校区

hongxuan 1 سال پیش
والد
کامیت
7431dfa59c
10فایلهای تغییر یافته به همراه391 افزوده شده و 249 حذف شده
  1. 5 4
      etc/transform.yaml
  2. 2 2
      go.mod
  3. 4 10
      go.sum
  4. 40 0
      internal/logic/get_erp_user_logic.go
  5. 13 60
      internal/logic/get_user_logic.go
  6. 6 0
      internal/server/transform_server.go
  7. 21 11
      model/sys_user_model.go
  8. 8 1
      transform.proto
  9. 250 129
      transform/transform.pb.go
  10. 42 32
      transformclient/transform.go

+ 5 - 4
etc/transform.yaml

@@ -2,13 +2,14 @@ Name: transform.rpc
 ListenOn: 0.0.0.0:8080
 Etcd:
   Hosts:
-  - 47.103.219.158:30019
+  - 127.0.0.1:2379
   Key: transform.rpc
 DataSource: root:gSRGZqb121TlYIbJy0@tcp(47.103.202.94:3306)/i2erp_erp1?charset=utf8&loc=Local&parseTime=true
 Table:
 Cache:
-  - Host: 47.103.219.158:7001
-    Pass: i2#333
+  - Host: 127.0.0.1:36379
+    Pass: G62m50oigInC30sf
 Erp:
   AutoRefresh: true
-  AuthServer: 47.103.153.70:31134
+  #AuthServer: 47.103.153.70:31134
+  AuthServer: http://127.0.0.1:8086

+ 2 - 2
go.mod

@@ -10,10 +10,10 @@ require (
 	github.com/agrison/go-tablib v0.0.0-20160310143025-4930582c22ee // indirect
 	github.com/agrison/mxj v0.0.0-20160310142625-1269f8afb3b4 // indirect
 	github.com/bndr/gotabulate v1.1.2 // indirect
+	github.com/clbanning/mxj v1.8.4 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/golang/protobuf v1.4.2
-	github.com/iancoleman/strcase v0.1.3 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/tal-tech/go-zero v1.1.7
 	github.com/tealeg/xlsx v1.0.5 // indirect
@@ -22,6 +22,6 @@ require (
 	github.com/xormplus/xorm v0.0.0-20210512135344-8123d584d5f5
 	go.uber.org/automaxprocs v1.4.0 // indirect
 	google.golang.org/grpc v1.29.1
-	google.golang.org/protobuf v1.26.0-rc.1
+	google.golang.org/protobuf v1.26.0-rc.1 // indirect
 	gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect
 )

+ 4 - 10
go.sum

@@ -1,6 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f h1:zD6rIG7+PhJwYXuQbHyw1pn/z5oUXzrUg9bo9F9+b5k=
 git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f/go.mod h1:a9idDtfMmMXrZIHyDg6XnYjWuCpKG0I6zv6Vo9Fpncc=
+gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -40,6 +41,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
+github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -50,7 +53,6 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28=
 github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -60,7 +62,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/emicklei/proto v1.9.0 h1:l0QiNT6Qs7Yj0Mb4X6dnWBQer4ebei2BFcgQLbGqUDc=
 github.com/emicklei/proto v1.9.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -70,7 +71,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
@@ -147,8 +147,6 @@ github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplb
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
-github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw=
-github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
@@ -174,7 +172,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -186,6 +183,7 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -233,7 +231,6 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -265,7 +262,6 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 h1:lYIiVDtZnyTWlNwiAxLj0bbpTcx1BWCFhXjfsvmPdNc=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
 github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -273,12 +269,10 @@ github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be h1:HTSana2sMSKVze
 github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be/go.mod h1:PgBA7NoHtnttVkWModa/qpvIWkX6MpOKgyRCWsSKSB0=
 github.com/xormplus/xorm v0.0.0-20210512135344-8123d584d5f5 h1:cWR+WB50oxaGYLQP/GKODvUPgpAMikPeW5BQKSmvvU0=
 github.com/xormplus/xorm v0.0.0-20210512135344-8123d584d5f5/go.mod h1:+v6b10b4x5IcQmp1/Cbo9IqaknxVeuhQng+fhya6bdI=
-github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ=
 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0=
 github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
-github.com/zeromicro/antlr v0.0.1 h1:CQpIn/dc0pUjgGQ81y98s/NGOm2Hfru2NNio2I9mQgk=
 github.com/zeromicro/antlr v0.0.1/go.mod h1:nfpjEwFR6Q4xGDJMcZnCL9tEfQRgszMwu3rDz2Z+p5M=
 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=

+ 40 - 0
internal/logic/get_erp_user_logic.go

@@ -0,0 +1,40 @@
+package logic
+
+import (
+	"context"
+	"git.i2edu.net/i2/i2-bill-erp/internal/svc"
+	"git.i2edu.net/i2/i2-bill-erp/transform"
+
+	"git.i2edu.net/i2/go-zero/core/logx"
+)
+
+type GetErpUserLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetErpUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetErpUserLogic {
+	return &GetErpUserLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 查看erp用户是否正常
+func (l *GetErpUserLogic) GetErpUser(in *transform.ErpUserReq) (*transform.ErpUserRes, error) {
+	findOne, err := l.svcCtx.SysUserModel.FindOrgById(in.ErpId)
+
+	if err != nil {
+		return nil, err
+	}
+	res := &transform.ErpUserRes{}
+	if findOne == nil {
+		return res, nil
+	}
+	if findOne.OsId != "" {
+		res.OsId = findOne.OsId
+	}
+	return res, nil
+}

+ 13 - 60
internal/logic/get_user_logic.go

@@ -46,17 +46,14 @@ func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserRespon
 		return &transform.UserResponse{}, nil
 	}
 	var tfr transform.UserResponse
-	ext, err := l.svcCtx.ErpUtil.InRoles(user.Id, "LAMK", "LAMKM", "student/readingStudent")
-	if err != nil {
-		return &transform.UserResponse{}, err
-	} else if ext {
-		tfr.Id = user.Id
-		tfr.Phone = user.Mobile
-		tfr.Status = user.Status.Int64
-		tfr.Gender = user.Gender
-		tfr.UserName = user.Name
-		tfr.ErpRoleType = 1
-		sql := `
+
+	tfr.Id = user.Id
+	tfr.Phone = user.Mobile
+	tfr.Status = user.Status.Int64
+	tfr.Gender = user.Gender
+	tfr.UserName = user.Name
+	tfr.ErpRoleType = 1
+	sql := `
 				select 
 					base_organ.name 
 				from 
@@ -67,55 +64,11 @@ func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserRespon
 					base_organ on base_organ.id = base_organ_school.organ_id
 				where sys_user_school.user_id = ? and sys_user_school.del_flag = 0
 			`
-		var cityName string
-		_, err := l.svcCtx.DB.SQL(sql, user.Id).Get(&cityName)
-		if err != nil {
-			return &transform.UserResponse{}, err
-		}
-		tfr.CityName = cityName
-
+	var cityName string
+	if _, err := l.svcCtx.DB.SQL(sql, user.Id).Get(&cityName); err != nil {
+		return &transform.UserResponse{}, err
 	}
-	//if in.Phone != "" {
-	//	var mk model.MktPartTimeUser
-	//	err := l.svcCtx.SqlConn.QueryRowPartial(&mk, `
-	//		SELECT
-	//		mkt_part_time_user.id,
-	//		mkt_part_time_user.name,
-	//		mkt_part_time_user.sex,
-	//		mkt_part_time_user.name,
-	//		mkt_part_time_user.ipone_number,
-	//		mkt_part_time_user_city.name city_name,
-	//		mkt_part_time_user_city.organ_id
-	//		FROM
-	//			mkt_part_time_user
-	//		LEFT JOIN (
-	//			SELECT
-	//				mkt_part_time_user_city.organ_id,
-	//				mkt_part_time_user_city.ptuser_id,
-	//				base_organ.name
-	//			FROM
-	//				mkt_part_time_user_city,base_organ
-	//			WHERE
-	//				base_organ.id = mkt_part_time_user_city.organ_id
-	//
-	//		) mkt_part_time_user_city
-	//		ON
-	//		mkt_part_time_user_city.ptuser_id = mkt_part_time_user.id
-	//		WHERE
-	//			del_flag = 0 and ipone_number=?
-	//	`, in.Phone)
-	//
-	//	if err != nil {
-	//		logx.Error(err)
-	//		return &tfr, nil
-	//	}
-	//	if err == nil && mk.Id != 0 {
-	//		tfr.ErpRoleType = 2
-	//		tfr.Gender = mk.Sex.Int64
-	//		tfr.UserName = mk.Name.String
-	//		tfr.CityName = mk.CityName.String
-	//		return &tfr, nil
-	//	}
-	//}
+	tfr.CityName = cityName
+
 	return &tfr, nil
 }

+ 6 - 0
internal/server/transform_server.go

@@ -125,3 +125,9 @@ func (s *TransformServer) GetErpOrganSchTree(ctx context.Context, in *transform.
 	l := logic.NewGetErpOrganSchTreeLogic(ctx, s.svcCtx)
 	return l.GetErpOrganSchTree(in)
 }
+
+// 查看erp用户是否正常
+func (s *TransformServer) GetErpUser(ctx context.Context, in *transform.ErpUserReq) (*transform.ErpUserRes, error) {
+	l := logic.NewGetErpUserLogic(ctx, s.svcCtx)
+	return l.GetErpUser(in)
+}

+ 21 - 11
model/sys_user_model.go

@@ -21,6 +21,7 @@ var (
 
 	cacheSysUserIdPrefix    = "cache:sysUser:id:"
 	cacheSysUserPhonePrefix = "cache:sysUser:phone:"
+	cacheSysUserOrgIdPrefix = "cache:sysUser:orgId:"
 )
 
 type (
@@ -30,13 +31,16 @@ type (
 		FindOneByPhone(id string) (*SysUser, error)
 		Update(data SysUser) error
 		Delete(id string) error
+		FindOrgById(id string) (*SysUserSchool, error)
 	}
 
 	defaultSysUserModel struct {
 		sqlc.CachedConn
 		table string
 	}
-
+	SysUserSchool struct {
+		OsId string `db:"os_id"`
+	}
 	SysUser struct {
 		Status         sql.NullInt64  `db:"status"`
 		Avatar         sql.NullString `db:"avatar"`
@@ -77,14 +81,9 @@ func (m *defaultSysUserModel) Insert(data SysUser) (sql.Result, error) {
 }
 
 func (m *defaultSysUserModel) FindOne(id string) (*SysUser, error) {
-	//sysUserIdKey := fmt.Sprintf("%s%v", cacheSysUserIdPrefix, id)
 	var resp SysUser
 	query := fmt.Sprintf("select %s from %s where `id` = ? and  status = 0 and del_flag = 0 limit 1", sysUserRows, m.table)
 	err := m.QueryRowNoCache(&resp, query, id)
-	//err := m.QueryRow(&resp, sysUserIdKey, func(conn sqlx.SqlConn, v interface{}) error {
-	//	query := fmt.Sprintf("select %s from %s where `id` = ? and  status = 0 and del_flag = 0 limit 1", sysUserRows, m.table)
-	//	return conn.QueryRow(v, query, id)
-	//})
 	switch err {
 	case nil:
 		return &resp, nil
@@ -96,14 +95,9 @@ func (m *defaultSysUserModel) FindOne(id string) (*SysUser, error) {
 }
 
 func (m *defaultSysUserModel) FindOneByPhone(phone string) (*SysUser, error) {
-	//sysUserIPhoneKey := fmt.Sprintf("%s%v", cacheSysUserPhonePrefix, phone)
 	var resp SysUser
 	query := fmt.Sprintf("select %s from %s where `mobile` = ? and status = 0  and del_flag = 0 limit 1 ", sysUserRows, m.table)
 	err := m.QueryRowNoCache(&resp, query, phone)
-	//err := m.QueryRow(&resp, sysUserIPhoneKey, func(conn sqlx.SqlConn, v interface{}) error {
-	//	query := fmt.Sprintf("select %s from %s where `mobile` = ? and status = 0  and del_flag = 0 limit 1 ", sysUserRows, m.table)
-	//	return conn.QueryRow(v, query, phone)
-	//})
 	switch err {
 	case nil:
 		return &resp, nil
@@ -141,3 +135,19 @@ func (m *defaultSysUserModel) queryPrimary(conn sqlx.SqlConn, v, primary interfa
 	query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", sysUserRows, m.table)
 	return conn.QueryRow(v, query, primary)
 }
+func (m *defaultSysUserModel) FindOrgById(id string) (school *SysUserSchool, err error) {
+	erpUserOrgIdKey := fmt.Sprintf("%s%v", cacheSysUserOrgIdPrefix, id)
+	var resp SysUserSchool
+	err = m.QueryRow(&resp, erpUserOrgIdKey, func(conn sqlx.SqlConn, v interface{}) error {
+		query := fmt.Sprintf("select os_id from sys_user_school where `id` = ? limit 1")
+		return conn.QueryRow(v, query, id)
+	})
+	switch err {
+	case nil:
+		return &resp, nil
+	case sqlc.ErrNotFound:
+		return nil, ErrNotFound
+	default:
+		return nil, err
+	}
+}

+ 8 - 1
transform.proto

@@ -234,7 +234,12 @@ message StudentRes {
   string CreateBy = 3;
   string CreateTime = 4;
 }
-
+message ErpUserReq{
+  string ErpId =1;
+}
+message ErpUserRes {
+  string OsId = 1;
+}
 service Transform {
   rpc GetUser(UserRequest) returns(UserResponse);
   rpc ParseToken(TokenRequest) returns(TokenResponse);
@@ -265,4 +270,6 @@ service Transform {
   rpc GetErpActive(GetErpActiveReq) returns(GetErpActiveRes);
   //获取erp 省、城、校区
   rpc GetErpOrganSchTree(Empty) returns(TreeNodes);
+  // 查看erp用户是否正常
+  rpc GetErpUser(ErpUserReq) returns(ErpUserRes);
 }

+ 250 - 129
transform/transform.pb.go

@@ -2166,6 +2166,84 @@ func (m *StudentRes) GetCreateTime() string {
 	return ""
 }
 
+type ErpUserReq struct {
+	ErpId                string   `protobuf:"bytes,1,opt,name=ErpId,proto3" json:"ErpId,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ErpUserReq) Reset()         { *m = ErpUserReq{} }
+func (m *ErpUserReq) String() string { return proto.CompactTextString(m) }
+func (*ErpUserReq) ProtoMessage()    {}
+func (*ErpUserReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cb4a498eeb2ba07d, []int{42}
+}
+
+func (m *ErpUserReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErpUserReq.Unmarshal(m, b)
+}
+func (m *ErpUserReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErpUserReq.Marshal(b, m, deterministic)
+}
+func (m *ErpUserReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErpUserReq.Merge(m, src)
+}
+func (m *ErpUserReq) XXX_Size() int {
+	return xxx_messageInfo_ErpUserReq.Size(m)
+}
+func (m *ErpUserReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErpUserReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ErpUserReq proto.InternalMessageInfo
+
+func (m *ErpUserReq) GetErpId() string {
+	if m != nil {
+		return m.ErpId
+	}
+	return ""
+}
+
+type ErpUserRes struct {
+	OsId                 string   `protobuf:"bytes,1,opt,name=OsId,proto3" json:"OsId,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ErpUserRes) Reset()         { *m = ErpUserRes{} }
+func (m *ErpUserRes) String() string { return proto.CompactTextString(m) }
+func (*ErpUserRes) ProtoMessage()    {}
+func (*ErpUserRes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cb4a498eeb2ba07d, []int{43}
+}
+
+func (m *ErpUserRes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErpUserRes.Unmarshal(m, b)
+}
+func (m *ErpUserRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErpUserRes.Marshal(b, m, deterministic)
+}
+func (m *ErpUserRes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErpUserRes.Merge(m, src)
+}
+func (m *ErpUserRes) XXX_Size() int {
+	return xxx_messageInfo_ErpUserRes.Size(m)
+}
+func (m *ErpUserRes) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErpUserRes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ErpUserRes proto.InternalMessageInfo
+
+func (m *ErpUserRes) GetOsId() string {
+	if m != nil {
+		return m.OsId
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*UserRequest)(nil), "transform.UserRequest")
 	proto.RegisterType((*UserResponse)(nil), "transform.UserResponse")
@@ -2214,120 +2292,125 @@ func init() {
 	proto.RegisterType((*MktRes)(nil), "transform.MktRes")
 	proto.RegisterType((*StudentReq)(nil), "transform.StudentReq")
 	proto.RegisterType((*StudentRes)(nil), "transform.StudentRes")
+	proto.RegisterType((*ErpUserReq)(nil), "transform.ErpUserReq")
+	proto.RegisterType((*ErpUserRes)(nil), "transform.ErpUserRes")
 }
 
 func init() { proto.RegisterFile("transform.proto", fileDescriptor_cb4a498eeb2ba07d) }
 
 var fileDescriptor_cb4a498eeb2ba07d = []byte{
-	// 1726 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcb, 0x73, 0x1b, 0x4d,
-	0x11, 0x2f, 0x49, 0xd6, 0xab, 0x25, 0xdb, 0xf1, 0xc4, 0x8f, 0xfd, 0x16, 0xf3, 0xe1, 0x6f, 0x08,
-	0xe0, 0x70, 0xf0, 0x21, 0x1f, 0x15, 0x52, 0x26, 0x15, 0xe2, 0x57, 0x54, 0xaa, 0xb2, 0x6c, 0x23,
-	0x39, 0x45, 0x71, 0xc1, 0xb5, 0xd1, 0x4e, 0xe4, 0x45, 0xab, 0x1d, 0x79, 0x67, 0x14, 0xa2, 0x3b,
-	0xc5, 0x81, 0x1b, 0x05, 0xc5, 0x0d, 0xfe, 0x2a, 0x6e, 0xfc, 0x33, 0x54, 0xcf, 0xcc, 0xee, 0x8e,
-	0xa4, 0x95, 0x9d, 0x10, 0x72, 0xdb, 0xee, 0xe9, 0xe9, 0xe9, 0xee, 0xe9, 0xc7, 0x6f, 0x16, 0xd6,
-	0x65, 0xec, 0x45, 0xe2, 0x3d, 0x8f, 0x47, 0x07, 0xe3, 0x98, 0x4b, 0x4e, 0xea, 0x29, 0x83, 0x7e,
-	0x0f, 0x8d, 0xb7, 0x82, 0xc5, 0x5d, 0x76, 0x37, 0x61, 0x42, 0x92, 0x35, 0x28, 0x06, 0xbe, 0x53,
-	0xd8, 0x2b, 0xec, 0xd7, 0xbb, 0xc5, 0xc0, 0x27, 0x9b, 0x50, 0x1e, 0xdf, 0xf2, 0x88, 0x39, 0x45,
-	0xc5, 0xd2, 0x04, 0xfd, 0x77, 0x01, 0x9a, 0x7a, 0x97, 0x18, 0xf3, 0x48, 0xb0, 0x4f, 0xdb, 0x86,
-	0xdc, 0x98, 0x87, 0x4c, 0x38, 0x25, 0xcd, 0x55, 0x04, 0xd9, 0x86, 0x8a, 0x90, 0x9e, 0x9c, 0x08,
-	0x67, 0x65, 0xaf, 0xb0, 0x5f, 0xea, 0x1a, 0x8a, 0xec, 0x41, 0x83, 0xc5, 0xe3, 0x2e, 0x0f, 0xd9,
-	0xf5, 0x74, 0xcc, 0x9c, 0xb2, 0x5a, 0xb4, 0x59, 0xc4, 0x85, 0xda, 0x44, 0xb0, 0xf8, 0xc2, 0x1b,
-	0x31, 0xa7, 0xa2, 0x54, 0xa6, 0x34, 0xae, 0xf5, 0x03, 0x39, 0x55, 0x6b, 0x55, 0xbd, 0x96, 0xd0,
-	0x78, 0xe2, 0x80, 0x45, 0x3e, 0x8b, 0x9d, 0x9a, 0x3e, 0x51, 0x53, 0xf4, 0x09, 0x34, 0xaf, 0xf9,
-	0x90, 0x45, 0x49, 0x30, 0x36, 0xa1, 0x2c, 0x91, 0x36, 0x8e, 0x69, 0x82, 0xfe, 0xb3, 0x08, 0xab,
-	0x46, 0xcc, 0x78, 0xbf, 0x0d, 0x15, 0x8c, 0x46, 0x3b, 0x89, 0x80, 0xa1, 0xd0, 0x03, 0x15, 0x25,
-	0x1e, 0xb2, 0xb6, 0x2f, 0x4c, 0x2c, 0x6c, 0x16, 0x79, 0x02, 0xab, 0x48, 0xf6, 0xfa, 0xb7, 0x9c,
-	0x87, 0x28, 0xa3, 0x23, 0x33, 0xcb, 0x24, 0xfb, 0xb0, 0x8e, 0x8c, 0xab, 0x98, 0x7f, 0x08, 0xa2,
-	0xbe, 0xd2, 0xb5, 0xa2, 0xe4, 0xe6, 0xd9, 0x84, 0xea, 0x7b, 0xb9, 0x8c, 0x07, 0x5e, 0x84, 0x62,
-	0x65, 0x25, 0x36, 0xc3, 0x43, 0xab, 0x7a, 0x53, 0x91, 0x68, 0x37, 0x81, 0xb3, 0x59, 0xe4, 0x5b,
-	0x80, 0xde, 0x54, 0x98, 0x0d, 0x26, 0x7a, 0x16, 0x87, 0xec, 0x42, 0x5d, 0x1d, 0xac, 0x6e, 0xb8,
-	0xa6, 0x96, 0x33, 0x06, 0xad, 0x42, 0xf9, 0x6c, 0x34, 0x96, 0x53, 0xfa, 0x1c, 0xea, 0xd7, 0x31,
-	0x63, 0x17, 0xdc, 0x67, 0x82, 0x3c, 0x85, 0x72, 0x84, 0x1f, 0x4e, 0x61, 0xaf, 0xb4, 0xdf, 0x78,
-	0xf6, 0xf8, 0x20, 0xcb, 0xc9, 0x44, 0xa8, 0xab, 0x25, 0xe8, 0xdf, 0x0a, 0x50, 0x4b, 0x78, 0x56,
-	0x66, 0x95, 0x54, 0x66, 0x11, 0x58, 0x91, 0xec, 0xa3, 0x34, 0xc1, 0x54, 0xdf, 0x18, 0xff, 0xb1,
-	0x17, 0xb3, 0x48, 0xaa, 0xf0, 0x95, 0xba, 0x86, 0x22, 0x7b, 0x50, 0x92, 0xde, 0x40, 0xc5, 0xaa,
-	0xf1, 0x6c, 0xcd, 0x3e, 0xd1, 0x1b, 0x74, 0x71, 0x29, 0xb3, 0xaa, 0xfc, 0xa0, 0x55, 0xff, 0x2a,
-	0xc0, 0xe3, 0xb3, 0x78, 0xdc, 0x19, 0xca, 0x0b, 0x26, 0x7f, 0xcb, 0xe3, 0xe1, 0x29, 0x93, 0x5e,
-	0x10, 0x7e, 0x86, 0x8a, 0x2f, 0xf4, 0xa5, 0x11, 0x44, 0xb7, 0x2c, 0x0e, 0xa4, 0x17, 0xf5, 0x99,
-	0xb9, 0x7f, 0x9b, 0x45, 0x2f, 0x60, 0x3b, 0xc7, 0xbe, 0x2e, 0x13, 0xe4, 0x17, 0x50, 0x0e, 0x24,
-	0x1b, 0x25, 0x26, 0x7e, 0x6b, 0x99, 0x98, 0xb7, 0x43, 0x0b, 0xd3, 0x9f, 0x2f, 0xd1, 0x77, 0x47,
-	0x1e, 0x41, 0x29, 0xf0, 0x85, 0x49, 0x76, 0xfc, 0xa4, 0x4f, 0xa1, 0x74, 0xed, 0x0d, 0xf2, 0x1c,
-	0x8c, 0xb0, 0x00, 0x8d, 0x83, 0xf8, 0x4d, 0x29, 0x34, 0x2f, 0xc7, 0x32, 0xc0, 0xc2, 0x91, 0xa8,
-	0x8c, 0xc0, 0x4a, 0x9f, 0xfb, 0xcc, 0x68, 0x53, 0xdf, 0xf4, 0x2f, 0x85, 0x19, 0x21, 0x41, 0x5e,
-	0x41, 0x75, 0xe4, 0x8d, 0xcf, 0x03, 0x21, 0x4d, 0xfe, 0x3c, 0xb1, 0x7c, 0xb0, 0x25, 0x0f, 0x3a,
-	0x5a, 0xec, 0x2c, 0x92, 0xf1, 0xb4, 0x9b, 0x6c, 0x72, 0x0f, 0xa1, 0x69, 0x2f, 0xa0, 0x07, 0x43,
-	0x36, 0x4d, 0x3c, 0x18, 0xb2, 0x29, 0xd6, 0xfa, 0x07, 0x2f, 0x9c, 0xa4, 0x1d, 0x4b, 0x11, 0x87,
-	0xc5, 0x17, 0x05, 0xba, 0x07, 0xa0, 0x4f, 0x38, 0xc1, 0x7c, 0xcc, 0x33, 0xb7, 0x05, 0x55, 0x63,
-	0x43, 0xde, 0x72, 0x5e, 0x14, 0xb2, 0xe3, 0x4a, 0xd6, 0x71, 0x18, 0x9b, 0xa4, 0xa9, 0x1c, 0x4f,
-	0xa5, 0xda, 0xe9, 0x7b, 0xd2, 0x53, 0xda, 0x9a, 0x5d, 0xf5, 0x4d, 0xff, 0x53, 0x80, 0xc6, 0xd9,
-	0xc7, 0x3e, 0x0b, 0xcf, 0xf9, 0x00, 0xe3, 0xb7, 0x0d, 0x95, 0x0e, 0xf7, 0x27, 0x61, 0x72, 0xa6,
-	0xa1, 0x70, 0xef, 0x09, 0x8f, 0xfc, 0xe4, 0x54, 0xfc, 0xc6, 0xa6, 0x78, 0x12, 0x33, 0x4f, 0xb2,
-	0xe3, 0xa9, 0x39, 0x38, 0xa5, 0xb1, 0xe8, 0xf5, 0xf7, 0x75, 0x30, 0x4a, 0xf2, 0xcb, 0xe2, 0x60,
-	0x6b, 0x39, 0xf7, 0x84, 0x7c, 0x3b, 0xf6, 0xf5, 0x7e, 0xd3, 0x5a, 0x6c, 0x1e, 0xf9, 0x29, 0xac,
-	0x65, 0xb4, 0xd2, 0xa3, 0xbb, 0xcb, 0x1c, 0x97, 0x38, 0x50, 0x3d, 0x65, 0xe1, 0x9b, 0xd0, 0x1b,
-	0x98, 0xee, 0x92, 0x90, 0xf4, 0x27, 0xb6, 0x73, 0x6a, 0x36, 0xf4, 0xf4, 0x6c, 0xd0, 0x49, 0x65,
-	0x28, 0xec, 0xd4, 0x69, 0x7b, 0xc4, 0x20, 0x6c, 0x42, 0x19, 0xc3, 0xaa, 0xbb, 0x4b, 0xbd, 0xab,
-	0x09, 0xfa, 0x43, 0xa8, 0xe3, 0x95, 0x5f, 0xbe, 0x6f, 0x47, 0x32, 0x4b, 0xda, 0xd2, 0x7e, 0x49,
-	0x27, 0x2d, 0x66, 0x99, 0xa5, 0xe5, 0x81, 0x2c, 0xb3, 0x25, 0xff, 0x3f, 0x59, 0x56, 0xb2, 0xb3,
-	0x8c, 0x02, 0x9c, 0x04, 0x72, 0xba, 0xe8, 0x4f, 0x21, 0xf3, 0xe7, 0xc7, 0x50, 0x47, 0x99, 0xce,
-	0xd0, 0xdc, 0xbb, 0x9a, 0xaa, 0x89, 0x8c, 0xa1, 0xe8, 0x9f, 0x0b, 0x96, 0x26, 0x41, 0x5e, 0xce,
-	0xfb, 0x44, 0x2d, 0x9f, 0x32, 0xb9, 0xaf, 0xe0, 0xd1, 0x9f, 0x0a, 0x99, 0xb9, 0x82, 0xfc, 0x6a,
-	0xde, 0x8e, 0xef, 0xe6, 0xec, 0x50, 0x62, 0x5f, 0xa1, 0x7c, 0x77, 0xa1, 0x86, 0xb5, 0x24, 0x4c,
-	0xe3, 0x8a, 0xd9, 0x9d, 0x29, 0x27, 0xfc, 0xa4, 0x3f, 0x82, 0xba, 0x59, 0x15, 0x63, 0x2c, 0x99,
-	0x98, 0x89, 0x71, 0x52, 0x6e, 0xf8, 0x4d, 0x7b, 0xb0, 0xda, 0x62, 0xf2, 0x4c, 0xa3, 0x0e, 0x74,
-	0x64, 0x07, 0xaa, 0x08, 0x32, 0x6e, 0x52, 0xbc, 0x53, 0x99, 0xe8, 0x69, 0x8f, 0xbb, 0x79, 0x98,
-	0x96, 0x39, 0x7e, 0x93, 0x2d, 0xa8, 0x88, 0xfe, 0x2d, 0xca, 0xea, 0x6e, 0x5e, 0x16, 0xfd, 0xdb,
-	0xb6, 0x4f, 0x5f, 0xcf, 0x2a, 0x55, 0x97, 0x39, 0xe2, 0xef, 0x82, 0xac, 0x88, 0x35, 0x65, 0x1f,
-	0x56, 0xb4, 0x0f, 0xa3, 0xbf, 0x84, 0x5d, 0xad, 0x41, 0xcd, 0xe4, 0x5e, 0xff, 0xf6, 0x8a, 0xc5,
-	0xc7, 0x53, 0x8d, 0x3b, 0x50, 0xe1, 0x32, 0x2b, 0xe9, 0xc5, 0xbd, 0x1b, 0x05, 0x39, 0x50, 0x16,
-	0x73, 0x1e, 0x9a, 0x6b, 0xda, 0xb6, 0x1b, 0xad, 0xd9, 0xc2, 0x79, 0xd8, 0x35, 0x52, 0xf4, 0x1c,
-	0x1a, 0x16, 0xfb, 0x53, 0x26, 0x00, 0xf9, 0x06, 0x6a, 0x1c, 0xb7, 0x64, 0x61, 0xa9, 0x72, 0x8d,
-	0x2c, 0xe8, 0x11, 0xac, 0x6b, 0xeb, 0xcc, 0x29, 0xff, 0x83, 0x41, 0xfb, 0x89, 0x8a, 0xa3, 0xbe,
-	0x0c, 0x3e, 0xa8, 0xe8, 0x66, 0xb7, 0x80, 0x86, 0xad, 0x24, 0xb7, 0xf0, 0x72, 0x5e, 0x12, 0x51,
-	0x4a, 0xc5, 0x53, 0x84, 0x39, 0x6c, 0xc3, 0x3a, 0xcc, 0x48, 0x19, 0x01, 0xfa, 0x0a, 0x2a, 0x9a,
-	0x43, 0x7e, 0x00, 0x75, 0xcd, 0xbb, 0x49, 0x5d, 0xaf, 0x69, 0x46, 0xdb, 0xc7, 0x8b, 0x18, 0x79,
-	0x37, 0x56, 0x0c, 0x2a, 0x23, 0x0f, 0x41, 0x28, 0x6d, 0xc3, 0xc6, 0xa9, 0x27, 0xbd, 0x2b, 0x16,
-	0x8f, 0x02, 0x21, 0x02, 0x8e, 0xa8, 0x13, 0x55, 0xc5, 0x93, 0x90, 0xdd, 0x58, 0x33, 0xa4, 0x86,
-	0x0c, 0x35, 0x7a, 0x96, 0x26, 0xc3, 0xdf, 0x0b, 0x8b, 0xba, 0x04, 0x39, 0x99, 0xaf, 0xb8, 0xa7,
-	0x96, 0x33, 0x0b, 0xe2, 0x5f, 0xa1, 0xf2, 0xfe, 0x51, 0x86, 0x4a, 0x67, 0xa8, 0x86, 0xfc, 0x1a,
-	0x14, 0xdb, 0x69, 0x5a, 0xe8, 0x5a, 0xe9, 0x0c, 0xdb, 0xe9, 0x70, 0xc2, 0x6f, 0x1c, 0x1e, 0x57,
-	0x5e, 0x2c, 0x71, 0x40, 0x18, 0x34, 0xad, 0x93, 0x63, 0x8e, 0x6b, 0xa1, 0x6d, 0xf3, 0x5e, 0x30,
-	0x7c, 0x07, 0xaa, 0x3d, 0x39, 0x51, 0x80, 0x5f, 0xcf, 0xa6, 0x84, 0xc4, 0xb1, 0x77, 0x34, 0x60,
-	0xad, 0x98, 0x4f, 0xc6, 0x6a, 0x20, 0x95, 0xba, 0x29, 0x8d, 0x08, 0xbc, 0x27, 0x27, 0xe7, 0x41,
-	0x34, 0xbc, 0x62, 0xb1, 0xe0, 0x91, 0x1a, 0x48, 0xa5, 0xee, 0x2c, 0x13, 0x35, 0xf4, 0xe4, 0xc4,
-	0x06, 0xbc, 0x29, 0x8d, 0x01, 0xe8, 0x61, 0x3e, 0x39, 0x75, 0x5d, 0xe2, 0x8a, 0x40, 0x6b, 0x8e,
-	0x7c, 0x3f, 0x66, 0x42, 0x38, 0xa0, 0xad, 0x31, 0xe4, 0xdc, 0xa0, 0x6d, 0x2c, 0x0c, 0x5a, 0x6b,
-	0x38, 0x36, 0x75, 0x75, 0x18, 0x52, 0xed, 0xbc, 0x65, 0xfd, 0x21, 0x0e, 0x41, 0xe6, 0xac, 0xaa,
-	0x45, 0x8b, 0x83, 0xb8, 0x5c, 0x51, 0x4a, 0xf1, 0x9a, 0xc6, 0xe5, 0x29, 0x03, 0xf5, 0x2a, 0xe2,
-	0x78, 0xea, 0xac, 0x6b, 0x8b, 0x0c, 0x89, 0xef, 0x8b, 0x0b, 0x26, 0xff, 0x98, 0x62, 0xbc, 0xb6,
-	0xef, 0x3c, 0x52, 0xca, 0xe7, 0xd9, 0x2a, 0x92, 0x26, 0xb3, 0x9d, 0x0d, 0x13, 0xc9, 0x24, 0xd3,
-	0x11, 0x5c, 0x78, 0x61, 0xa8, 0x1e, 0x6b, 0x44, 0xaf, 0x25, 0xb4, 0x02, 0x29, 0x9e, 0x5a, 0x79,
-	0xac, 0xef, 0x4c, 0x53, 0x68, 0xd3, 0x6f, 0x26, 0x1e, 0xff, 0xdd, 0x1f, 0x02, 0x67, 0x53, 0xfb,
-	0x6a, 0x48, 0xbc, 0x97, 0xce, 0x50, 0x2a, 0xe5, 0x6a, 0x48, 0x39, 0x5b, 0xfa, 0x5e, 0x66, 0x98,
-	0xe8, 0xf1, 0x39, 0xf7, 0x7c, 0x1d, 0xff, 0x6d, 0x25, 0x91, 0x31, 0xf0, 0xd4, 0x2e, 0x1b, 0x79,
-	0xf1, 0xd0, 0xd9, 0xd1, 0xf5, 0xa2, 0x29, 0xba, 0x67, 0xf2, 0x72, 0x39, 0xbe, 0xd8, 0x05, 0xe8,
-	0xc9, 0x89, 0xcf, 0xa2, 0xbc, 0xec, 0xa5, 0xd2, 0x5a, 0x15, 0x0b, 0xb9, 0x6d, 0xe7, 0x4a, 0x71,
-	0x2e, 0x57, 0xbe, 0x00, 0x80, 0x3d, 0xfb, 0x2b, 0xe0, 0x7b, 0xca, 0x14, 0x30, 0x39, 0x84, 0x6a,
-	0x8b, 0x49, 0x4c, 0x7d, 0x62, 0x77, 0x44, 0xeb, 0x2d, 0xef, 0xee, 0x2c, 0xf0, 0xcd, 0x7b, 0xf5,
-	0xd7, 0x00, 0x57, 0x5e, 0x2c, 0x98, 0x7a, 0xc5, 0x12, 0x5b, 0xcc, 0x7e, 0xfe, 0xba, 0xce, 0xe2,
-	0x82, 0x51, 0xf0, 0x02, 0xd6, 0x74, 0xe7, 0xc4, 0xc1, 0x8d, 0xaf, 0x1c, 0xf2, 0xc8, 0x7e, 0x53,
-	0xe0, 0xeb, 0xcf, 0xdd, 0xcc, 0x79, 0x08, 0xa9, 0x6e, 0x7e, 0xe4, 0xfb, 0x9d, 0xa1, 0x24, 0x76,
-	0x6b, 0xd5, 0x5d, 0xc2, 0x5d, 0x60, 0x09, 0x72, 0x04, 0xab, 0x78, 0x9f, 0x29, 0xc4, 0x9f, 0xb1,
-	0xd6, 0x7e, 0x47, 0xb8, 0x4b, 0x16, 0x04, 0x79, 0x0d, 0xcd, 0x16, 0x93, 0xd9, 0x6b, 0x7a, 0x27,
-	0x1f, 0xd4, 0xcd, 0x6a, 0x98, 0xc1, 0x85, 0x87, 0x00, 0x2d, 0x26, 0x0d, 0x58, 0x22, 0x5b, 0x79,
-	0x00, 0xea, 0xce, 0xcd, 0x65, 0x0b, 0xf2, 0x1c, 0x6a, 0x2d, 0x26, 0xb1, 0xc1, 0x09, 0xb2, 0x99,
-	0x03, 0x79, 0xee, 0xdc, 0x3c, 0x2e, 0x62, 0xd1, 0xe6, 0x15, 0x17, 0x32, 0x01, 0xc3, 0x33, 0x97,
-	0x6c, 0xc1, 0x7f, 0x37, 0x9f, 0x8f, 0xb8, 0xcf, 0x0c, 0xb7, 0x2c, 0x74, 0x5b, 0x0b, 0x11, 0xc2,
-	0xb1, 0xe2, 0x92, 0xc5, 0xc0, 0x19, 0x8f, 0x4d, 0x92, 0xcf, 0x6c, 0xcc, 0xca, 0xc2, 0xcd, 0x65,
-	0x0b, 0x72, 0x09, 0x1b, 0x2d, 0x26, 0x67, 0x07, 0x0c, 0xd9, 0xbd, 0x67, 0xf6, 0xdc, 0xb9, 0xf7,
-	0xad, 0x0a, 0x72, 0x0a, 0xae, 0x76, 0x65, 0xfe, 0x2d, 0xfa, 0x59, 0x99, 0xf7, 0x7b, 0xd8, 0xce,
-	0xd7, 0x42, 0xbe, 0x7b, 0xe0, 0x3d, 0xcc, 0xee, 0xdc, 0x07, 0x45, 0x04, 0x19, 0xc1, 0x37, 0x4b,
-	0x81, 0x15, 0xf9, 0x99, 0xb5, 0xff, 0x3e, 0xdc, 0xe6, 0x7e, 0xa2, 0x20, 0x66, 0x35, 0x64, 0x10,
-	0x92, 0x38, 0x0b, 0xdb, 0x0c, 0xb2, 0x74, 0x97, 0xad, 0x60, 0x86, 0x34, 0x6d, 0xac, 0x95, 0x13,
-	0x48, 0x77, 0x61, 0x6f, 0x06, 0xcb, 0xde, 0x24, 0xbb, 0x0d, 0x08, 0x5a, 0x94, 0x4d, 0xf1, 0x97,
-	0xbb, 0x7c, 0x0d, 0xad, 0x20, 0xb3, 0x7e, 0x7e, 0xce, 0xa5, 0xbe, 0xab, 0xa8, 0xff, 0x99, 0xdf,
-	0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x52, 0xc7, 0x2a, 0xe5, 0xe2, 0x14, 0x00, 0x00,
+	// 1770 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x73, 0x23, 0x49,
+	0x11, 0x0e, 0x49, 0xd6, 0x2b, 0x25, 0xdb, 0xe3, 0x1a, 0x3f, 0x7a, 0x1b, 0xb3, 0x78, 0x8b, 0x01,
+	0x3c, 0x1c, 0x7c, 0x98, 0x25, 0x96, 0x0d, 0xb3, 0xb1, 0xac, 0x5f, 0xab, 0x50, 0x84, 0x65, 0x1b,
+	0xc9, 0x1b, 0x04, 0x17, 0x1c, 0xbd, 0xea, 0x1a, 0xb9, 0x51, 0xab, 0xab, 0xdd, 0x55, 0x1a, 0x46,
+	0x77, 0x82, 0x03, 0x57, 0x08, 0x6e, 0xf0, 0x8f, 0xb8, 0x71, 0xe3, 0xcf, 0x10, 0x59, 0x55, 0xdd,
+	0x5d, 0x92, 0x5a, 0xf6, 0x0c, 0xc3, 0xdc, 0x3a, 0xb3, 0xb2, 0xb2, 0x32, 0xb3, 0xb2, 0x32, 0xbf,
+	0x6c, 0xd8, 0x94, 0x89, 0x17, 0x89, 0xd7, 0x3c, 0x99, 0x1c, 0xc5, 0x09, 0x97, 0x9c, 0x34, 0x33,
+	0x06, 0xfd, 0x1c, 0x5a, 0xdf, 0x09, 0x96, 0xf4, 0xd9, 0xc3, 0x94, 0x09, 0x49, 0x36, 0xa0, 0x1c,
+	0xf8, 0x4e, 0xe9, 0xa0, 0x74, 0xd8, 0xec, 0x97, 0x03, 0x9f, 0x6c, 0x43, 0x35, 0xbe, 0xe7, 0x11,
+	0x73, 0xca, 0x8a, 0xa5, 0x09, 0xfa, 0xef, 0x12, 0xb4, 0xf5, 0x2e, 0x11, 0xf3, 0x48, 0xb0, 0x77,
+	0xdb, 0x86, 0xdc, 0x84, 0x87, 0x4c, 0x38, 0x15, 0xcd, 0x55, 0x04, 0xd9, 0x85, 0x9a, 0x90, 0x9e,
+	0x9c, 0x0a, 0x67, 0xed, 0xa0, 0x74, 0x58, 0xe9, 0x1b, 0x8a, 0x1c, 0x40, 0x8b, 0x25, 0x71, 0x9f,
+	0x87, 0xec, 0x76, 0x16, 0x33, 0xa7, 0xaa, 0x16, 0x6d, 0x16, 0x71, 0xa1, 0x31, 0x15, 0x2c, 0xb9,
+	0xf2, 0x26, 0xcc, 0xa9, 0x29, 0x95, 0x19, 0x8d, 0x6b, 0xc3, 0x40, 0xce, 0xd4, 0x5a, 0x5d, 0xaf,
+	0xa5, 0x34, 0x9e, 0x38, 0x62, 0x91, 0xcf, 0x12, 0xa7, 0xa1, 0x4f, 0xd4, 0x14, 0x7d, 0x01, 0xed,
+	0x5b, 0x3e, 0x66, 0x51, 0x1a, 0x8c, 0x6d, 0xa8, 0x4a, 0xa4, 0x8d, 0x63, 0x9a, 0xa0, 0xff, 0x28,
+	0xc3, 0xba, 0x11, 0x33, 0xde, 0xef, 0x42, 0x0d, 0xa3, 0xd1, 0x4d, 0x23, 0x60, 0x28, 0xf4, 0x40,
+	0x45, 0x89, 0x87, 0xac, 0xeb, 0x0b, 0x13, 0x0b, 0x9b, 0x45, 0x5e, 0xc0, 0x3a, 0x92, 0x83, 0xe1,
+	0x3d, 0xe7, 0x21, 0xca, 0xe8, 0xc8, 0xcc, 0x33, 0xc9, 0x21, 0x6c, 0x22, 0xe3, 0x26, 0xe1, 0x6f,
+	0x82, 0x68, 0xa8, 0x74, 0xad, 0x29, 0xb9, 0x45, 0x36, 0xa1, 0xfa, 0x5e, 0xae, 0x93, 0x91, 0x17,
+	0xa1, 0x58, 0x55, 0x89, 0xcd, 0xf1, 0xd0, 0xaa, 0xc1, 0x4c, 0xa4, 0xda, 0x4d, 0xe0, 0x6c, 0x16,
+	0xf9, 0x14, 0x60, 0x30, 0x13, 0x66, 0x83, 0x89, 0x9e, 0xc5, 0x21, 0xfb, 0xd0, 0x54, 0x07, 0xab,
+	0x1b, 0x6e, 0xa8, 0xe5, 0x9c, 0x41, 0xeb, 0x50, 0xbd, 0x98, 0xc4, 0x72, 0x46, 0xbf, 0x80, 0xe6,
+	0x6d, 0xc2, 0xd8, 0x15, 0xf7, 0x99, 0x20, 0x2f, 0xa1, 0x1a, 0xe1, 0x87, 0x53, 0x3a, 0xa8, 0x1c,
+	0xb6, 0x5e, 0x3d, 0x3f, 0xca, 0x73, 0x32, 0x15, 0xea, 0x6b, 0x09, 0xfa, 0xd7, 0x12, 0x34, 0x52,
+	0x9e, 0x95, 0x59, 0x15, 0x95, 0x59, 0x04, 0xd6, 0x24, 0x7b, 0x2b, 0x4d, 0x30, 0xd5, 0x37, 0xc6,
+	0x3f, 0xf6, 0x12, 0x16, 0x49, 0x15, 0xbe, 0x4a, 0xdf, 0x50, 0xe4, 0x00, 0x2a, 0xd2, 0x1b, 0xa9,
+	0x58, 0xb5, 0x5e, 0x6d, 0xd8, 0x27, 0x7a, 0xa3, 0x3e, 0x2e, 0xe5, 0x56, 0x55, 0x9f, 0xb4, 0xea,
+	0x9f, 0x25, 0x78, 0x7e, 0x91, 0xc4, 0xbd, 0xb1, 0xbc, 0x62, 0xf2, 0xb7, 0x3c, 0x19, 0x9f, 0x33,
+	0xe9, 0x05, 0xe1, 0x7b, 0xa8, 0xf8, 0x40, 0x5f, 0x5a, 0x41, 0x74, 0xcf, 0x92, 0x40, 0x7a, 0xd1,
+	0x90, 0x99, 0xfb, 0xb7, 0x59, 0xf4, 0x0a, 0x76, 0x0b, 0xec, 0xeb, 0x33, 0x41, 0x7e, 0x01, 0xd5,
+	0x40, 0xb2, 0x49, 0x6a, 0xe2, 0xa7, 0x96, 0x89, 0x45, 0x3b, 0xb4, 0x30, 0xfd, 0xf9, 0x0a, 0x7d,
+	0x0f, 0xe4, 0x19, 0x54, 0x02, 0x5f, 0x98, 0x64, 0xc7, 0x4f, 0xfa, 0x12, 0x2a, 0xb7, 0xde, 0xa8,
+	0xc8, 0xc1, 0x08, 0x1f, 0xa0, 0x71, 0x10, 0xbf, 0x29, 0x85, 0xf6, 0x75, 0x2c, 0x03, 0x7c, 0x38,
+	0x12, 0x95, 0x11, 0x58, 0x1b, 0x72, 0x9f, 0x19, 0x6d, 0xea, 0x9b, 0xfe, 0xa5, 0x34, 0x27, 0x24,
+	0xc8, 0xd7, 0x50, 0x9f, 0x78, 0xf1, 0x65, 0x20, 0xa4, 0xc9, 0x9f, 0x17, 0x96, 0x0f, 0xb6, 0xe4,
+	0x51, 0x4f, 0x8b, 0x5d, 0x44, 0x32, 0x99, 0xf5, 0xd3, 0x4d, 0xee, 0x31, 0xb4, 0xed, 0x05, 0xf4,
+	0x60, 0xcc, 0x66, 0xa9, 0x07, 0x63, 0x36, 0xc3, 0xb7, 0xfe, 0xc6, 0x0b, 0xa7, 0x59, 0xc5, 0x52,
+	0xc4, 0x71, 0xf9, 0xcb, 0x12, 0x3d, 0x00, 0xd0, 0x27, 0x9c, 0x61, 0x3e, 0x16, 0x99, 0xdb, 0x81,
+	0xba, 0xb1, 0xa1, 0x68, 0xb9, 0x28, 0x0a, 0xf9, 0x71, 0x15, 0xeb, 0x38, 0x8c, 0x4d, 0x5a, 0x54,
+	0x4e, 0x67, 0x52, 0xed, 0xf4, 0x3d, 0xe9, 0x29, 0x6d, 0xed, 0xbe, 0xfa, 0xa6, 0xff, 0x29, 0x41,
+	0xeb, 0xe2, 0xed, 0x90, 0x85, 0x97, 0x7c, 0x84, 0xf1, 0xdb, 0x85, 0x5a, 0x8f, 0xfb, 0xd3, 0x30,
+	0x3d, 0xd3, 0x50, 0xb8, 0xf7, 0x8c, 0x47, 0x7e, 0x7a, 0x2a, 0x7e, 0x63, 0x51, 0x3c, 0x4b, 0x98,
+	0x27, 0xd9, 0xe9, 0xcc, 0x1c, 0x9c, 0xd1, 0xf8, 0xe8, 0xf5, 0xf7, 0x6d, 0x30, 0x49, 0xf3, 0xcb,
+	0xe2, 0x60, 0x69, 0xb9, 0xf4, 0x84, 0xfc, 0x2e, 0xf6, 0xf5, 0x7e, 0x53, 0x5a, 0x6c, 0x1e, 0xf9,
+	0x29, 0x6c, 0xe4, 0xb4, 0xd2, 0xa3, 0xab, 0xcb, 0x02, 0x97, 0x38, 0x50, 0x3f, 0x67, 0xe1, 0xb7,
+	0xa1, 0x37, 0x32, 0xd5, 0x25, 0x25, 0xe9, 0x4f, 0x6c, 0xe7, 0x54, 0x6f, 0x18, 0xe8, 0xde, 0xa0,
+	0x93, 0xca, 0x50, 0x58, 0xa9, 0xb3, 0xf2, 0x88, 0x41, 0xd8, 0x86, 0x2a, 0x86, 0x55, 0x57, 0x97,
+	0x66, 0x5f, 0x13, 0xf4, 0x87, 0xd0, 0xc4, 0x2b, 0xbf, 0x7e, 0xdd, 0x8d, 0x64, 0x9e, 0xb4, 0x95,
+	0xc3, 0x8a, 0x4e, 0x5a, 0xcc, 0x32, 0x4b, 0xcb, 0x13, 0x59, 0x66, 0x4b, 0xfe, 0x7f, 0xb2, 0xac,
+	0x62, 0x67, 0x19, 0x05, 0x38, 0x0b, 0xe4, 0x6c, 0xd9, 0x9f, 0x52, 0xee, 0xcf, 0x8f, 0xa1, 0x89,
+	0x32, 0xbd, 0xb1, 0xb9, 0x77, 0xd5, 0x55, 0x53, 0x19, 0x43, 0xd1, 0x3f, 0x97, 0x2c, 0x4d, 0x82,
+	0x7c, 0xb5, 0xe8, 0x13, 0xb5, 0x7c, 0xca, 0xe5, 0x3e, 0x82, 0x47, 0x7f, 0x2a, 0xe5, 0xe6, 0x0a,
+	0xf2, 0xab, 0x45, 0x3b, 0x3e, 0x5b, 0xb0, 0x43, 0x89, 0x7d, 0x84, 0xe7, 0xbb, 0x0f, 0x0d, 0x7c,
+	0x4b, 0xc2, 0x14, 0xae, 0x84, 0x3d, 0x98, 0xe7, 0x84, 0x9f, 0xf4, 0x47, 0xd0, 0x34, 0xab, 0x22,
+	0xc6, 0x27, 0x93, 0x30, 0x11, 0xa7, 0xcf, 0x0d, 0xbf, 0xe9, 0x00, 0xd6, 0x3b, 0x4c, 0x5e, 0x68,
+	0xd4, 0x81, 0x8e, 0xec, 0x41, 0x1d, 0x41, 0xc6, 0x5d, 0x86, 0x77, 0x6a, 0x53, 0xdd, 0xed, 0x71,
+	0x37, 0x0f, 0xb3, 0x67, 0x8e, 0xdf, 0x64, 0x07, 0x6a, 0x62, 0x78, 0x8f, 0xb2, 0xba, 0x9a, 0x57,
+	0xc5, 0xf0, 0xbe, 0xeb, 0xd3, 0x6f, 0xe6, 0x95, 0xaa, 0xcb, 0x9c, 0xf0, 0xef, 0x83, 0xfc, 0x11,
+	0x6b, 0xca, 0x3e, 0xac, 0x6c, 0x1f, 0x46, 0x7f, 0x09, 0xfb, 0x5a, 0x83, 0xea, 0xc9, 0x83, 0xe1,
+	0xfd, 0x0d, 0x4b, 0x4e, 0x67, 0x1a, 0x77, 0xa0, 0xc2, 0x55, 0x56, 0xd2, 0xab, 0x47, 0x37, 0x0a,
+	0x72, 0xa4, 0x2c, 0xe6, 0x3c, 0x34, 0xd7, 0xb4, 0x6b, 0x17, 0x5a, 0xb3, 0x85, 0xf3, 0xb0, 0x6f,
+	0xa4, 0xe8, 0x25, 0xb4, 0x2c, 0xf6, 0xbb, 0x74, 0x00, 0xf2, 0x09, 0x34, 0x38, 0x6e, 0xc9, 0xc3,
+	0x52, 0xe7, 0x1a, 0x59, 0xd0, 0x13, 0xd8, 0xd4, 0xd6, 0x99, 0x53, 0xfe, 0x07, 0x83, 0x0e, 0x53,
+	0x15, 0x27, 0x43, 0x19, 0xbc, 0x51, 0xd1, 0xcd, 0x6f, 0x01, 0x0d, 0x5b, 0x4b, 0x6f, 0xe1, 0xab,
+	0x45, 0x49, 0x44, 0x29, 0x35, 0x4f, 0x11, 0xe6, 0xb0, 0x2d, 0xeb, 0x30, 0x23, 0x65, 0x04, 0xe8,
+	0xd7, 0x50, 0xd3, 0x1c, 0xf2, 0x03, 0x68, 0x6a, 0xde, 0x5d, 0xe6, 0x7a, 0x43, 0x33, 0xba, 0x3e,
+	0x5e, 0xc4, 0xc4, 0xbb, 0xb3, 0x62, 0x50, 0x9b, 0x78, 0x08, 0x42, 0x69, 0x17, 0xb6, 0xce, 0x3d,
+	0xe9, 0xdd, 0xb0, 0x64, 0x12, 0x08, 0x11, 0x70, 0x44, 0x9d, 0xa8, 0x2a, 0x99, 0x86, 0xec, 0xce,
+	0xea, 0x21, 0x0d, 0x64, 0xa8, 0xd6, 0xb3, 0x32, 0x19, 0xfe, 0x56, 0x5a, 0xd6, 0x25, 0xc8, 0xd9,
+	0xe2, 0x8b, 0x7b, 0x69, 0x39, 0xb3, 0x24, 0xfe, 0x11, 0x5e, 0xde, 0xdf, 0xab, 0x50, 0xeb, 0x8d,
+	0x55, 0x93, 0xdf, 0x80, 0x72, 0x37, 0x4b, 0x0b, 0xfd, 0x56, 0x7a, 0xe3, 0x6e, 0xd6, 0x9c, 0xf0,
+	0x1b, 0x9b, 0xc7, 0x8d, 0x97, 0x48, 0x6c, 0x10, 0x06, 0x4d, 0xeb, 0xe4, 0x58, 0xe0, 0x5a, 0x68,
+	0xdb, 0xcc, 0x0b, 0x86, 0xef, 0x40, 0x7d, 0x20, 0xa7, 0x0a, 0xf0, 0xeb, 0xde, 0x94, 0x92, 0xd8,
+	0xf6, 0x4e, 0x46, 0xac, 0x93, 0xf0, 0x69, 0xac, 0x1a, 0x52, 0xa5, 0x9f, 0xd1, 0x88, 0xc0, 0x07,
+	0x72, 0x7a, 0x19, 0x44, 0xe3, 0x1b, 0x96, 0x08, 0x1e, 0xa9, 0x86, 0x54, 0xe9, 0xcf, 0x33, 0x51,
+	0xc3, 0x40, 0x4e, 0x6d, 0xc0, 0x9b, 0xd1, 0x18, 0x80, 0x01, 0xe6, 0x93, 0xd3, 0xd4, 0x4f, 0x5c,
+	0x11, 0x68, 0xcd, 0x89, 0xef, 0x27, 0x4c, 0x08, 0x07, 0xb4, 0x35, 0x86, 0x5c, 0x68, 0xb4, 0xad,
+	0xa5, 0x46, 0x6b, 0x35, 0xc7, 0xb6, 0x7e, 0x1d, 0x86, 0x54, 0x3b, 0xef, 0xd9, 0x70, 0x8c, 0x4d,
+	0x90, 0x39, 0xeb, 0x6a, 0xd1, 0xe2, 0x20, 0x2e, 0x57, 0x94, 0x52, 0xbc, 0xa1, 0x71, 0x79, 0xc6,
+	0x40, 0xbd, 0x8a, 0x38, 0x9d, 0x39, 0x9b, 0xda, 0x22, 0x43, 0xe2, 0x7c, 0x71, 0xc5, 0xe4, 0x1f,
+	0x33, 0x8c, 0xd7, 0xf5, 0x9d, 0x67, 0x4a, 0xf9, 0x22, 0x5b, 0x45, 0xd2, 0x64, 0xb6, 0xb3, 0x65,
+	0x22, 0x99, 0x66, 0x3a, 0x82, 0x0b, 0x2f, 0x0c, 0xd5, 0xb0, 0x46, 0xf4, 0x5a, 0x4a, 0x2b, 0x90,
+	0xe2, 0xa9, 0x95, 0xe7, 0xfa, 0xce, 0x34, 0x85, 0x36, 0xfd, 0x66, 0xea, 0xf1, 0xdf, 0xfd, 0x21,
+	0x70, 0xb6, 0xb5, 0xaf, 0x86, 0xc4, 0x7b, 0xe9, 0x8d, 0xa5, 0x52, 0xae, 0x9a, 0x94, 0xb3, 0xa3,
+	0xef, 0x65, 0x8e, 0x89, 0x1e, 0x5f, 0x72, 0xcf, 0xd7, 0xf1, 0xdf, 0x55, 0x12, 0x39, 0x03, 0x4f,
+	0xed, 0xb3, 0x89, 0x97, 0x8c, 0x9d, 0x3d, 0xfd, 0x5e, 0x34, 0x45, 0x0f, 0x4c, 0x5e, 0xae, 0xc6,
+	0x17, 0xfb, 0x00, 0x03, 0x39, 0xf5, 0x59, 0x54, 0x94, 0xbd, 0x54, 0x5a, 0xab, 0x62, 0x29, 0xb7,
+	0xed, 0x5c, 0x29, 0x2f, 0xe4, 0xca, 0x07, 0x00, 0x30, 0x44, 0x08, 0x17, 0x49, 0x6c, 0x86, 0x75,
+	0xcc, 0xba, 0x8b, 0x24, 0xce, 0x46, 0x4e, 0x4d, 0x20, 0x56, 0xcd, 0x64, 0x14, 0x18, 0xbd, 0x16,
+	0x99, 0x88, 0xfa, 0x7e, 0xf5, 0x2f, 0xc0, 0xa9, 0xcc, 0x94, 0x01, 0x72, 0x0c, 0xf5, 0x0e, 0x93,
+	0x28, 0x4f, 0xec, 0xba, 0x6a, 0xfd, 0x11, 0x70, 0xf7, 0x96, 0xf8, 0x66, 0xea, 0xfd, 0x35, 0xc0,
+	0x8d, 0x97, 0x08, 0xa6, 0x66, 0x61, 0x62, 0x8b, 0xd9, 0x43, 0xb4, 0xeb, 0x2c, 0x2f, 0x18, 0x05,
+	0x5f, 0xc2, 0x86, 0xae, 0xbf, 0xd8, 0xfe, 0x71, 0x56, 0x22, 0xcf, 0xec, 0xc9, 0x04, 0x67, 0x48,
+	0x77, 0xbb, 0x60, 0x9c, 0x52, 0x3d, 0xe1, 0xc4, 0xf7, 0x7b, 0x63, 0x49, 0xec, 0x02, 0xad, 0x6b,
+	0x8d, 0xbb, 0xc4, 0x12, 0xe4, 0x04, 0xd6, 0x31, 0x2b, 0xb2, 0x41, 0x61, 0xce, 0x5a, 0x7b, 0x1a,
+	0x71, 0x57, 0x2c, 0x08, 0xf2, 0x0d, 0xb4, 0x3b, 0x4c, 0xe6, 0x33, 0xf9, 0x5e, 0x31, 0x34, 0x9c,
+	0xd7, 0x30, 0x87, 0x2e, 0x8f, 0x01, 0x3a, 0x4c, 0x1a, 0xc8, 0x45, 0x76, 0x8a, 0x60, 0xd8, 0x83,
+	0x5b, 0xc8, 0x16, 0xe4, 0x0b, 0x68, 0x74, 0x98, 0xc4, 0x32, 0x29, 0xc8, 0x76, 0x01, 0x70, 0x7a,
+	0x70, 0x8b, 0xb8, 0x88, 0x68, 0xdb, 0x37, 0x5c, 0xc8, 0x14, 0x52, 0xcf, 0x5d, 0xb2, 0x35, 0x44,
+	0xb8, 0xc5, 0x7c, 0x44, 0x8f, 0xa6, 0x45, 0xe6, 0xa1, 0xdb, 0x59, 0x8a, 0x10, 0x36, 0x27, 0x97,
+	0x2c, 0x07, 0xce, 0x78, 0x6c, 0x9e, 0xca, 0xdc, 0xc6, 0xfc, 0x71, 0xb9, 0x85, 0x6c, 0x41, 0xae,
+	0x61, 0xab, 0xc3, 0xe4, 0x7c, 0x9b, 0x22, 0xfb, 0x8f, 0x74, 0xb0, 0x07, 0xf7, 0xb1, 0x55, 0x41,
+	0xce, 0xc1, 0xd5, 0xae, 0x2c, 0x4e, 0xb4, 0xef, 0x95, 0x79, 0xbf, 0x87, 0xdd, 0x62, 0x2d, 0xe4,
+	0xb3, 0x27, 0xa6, 0x6a, 0xf6, 0xe0, 0x3e, 0x29, 0x22, 0xc8, 0x04, 0x3e, 0x59, 0x09, 0xcf, 0xc8,
+	0xcf, 0xac, 0xfd, 0x8f, 0xa1, 0x3f, 0xf7, 0x1d, 0x05, 0x31, 0xab, 0x21, 0x07, 0xa2, 0xc4, 0x59,
+	0xda, 0x66, 0xf0, 0xa9, 0xbb, 0x6a, 0x05, 0x33, 0xa4, 0x6d, 0x23, 0xb6, 0x82, 0x40, 0xba, 0x4b,
+	0x7b, 0x73, 0x70, 0xf7, 0x6d, 0xba, 0xdb, 0x40, 0xa9, 0x65, 0xd9, 0x0c, 0xc5, 0xb9, 0xab, 0xd7,
+	0xd0, 0x0a, 0x32, 0xef, 0xe7, 0x7b, 0x5d, 0xea, 0x71, 0x1a, 0x05, 0x55, 0x08, 0x77, 0xe6, 0x6f,
+	0xc9, 0xd4, 0x42, 0xb7, 0x90, 0x2d, 0xbe, 0xaf, 0xa9, 0x3f, 0xaa, 0x9f, 0xff, 0x37, 0x00, 0x00,
+	0xff, 0xff, 0x2b, 0x26, 0x85, 0x3d, 0x64, 0x15, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2344,10 +2427,10 @@ const _ = grpc.SupportPackageIsVersion4
 type TransformClient interface {
 	GetUser(ctx context.Context, in *UserRequest, opts ...grpc.CallOption) (*UserResponse, error)
 	ParseToken(ctx context.Context, in *TokenRequest, opts ...grpc.CallOption) (*TokenResponse, error)
-	//获取erp 省、城市树
+	// 获取erp 省、城市树
 	GetErpCityTree(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*TreeNodes, error)
 	AddMkt(ctx context.Context, in *MktReq, opts ...grpc.CallOption) (*MktRes, error)
-	//获取erp  字典
+	// 获取erp  字典
 	LoadOptionset(ctx context.Context, in *OptionsetReq, opts ...grpc.CallOption) (*OptionsetRes, error)
 	GetSchoolIds(ctx context.Context, in *SchoolIdsReq, opts ...grpc.CallOption) (*SchoolIdsRes, error)
 	GetCityIds(ctx context.Context, in *CityIdsReq, opts ...grpc.CallOption) (*CityIdsRes, error)
@@ -2355,22 +2438,24 @@ type TransformClient interface {
 	PostExcelLog(ctx context.Context, in *ExcelLogReq, opts ...grpc.CallOption) (*ExcelLogRes, error)
 	GetErpOptionset(ctx context.Context, in *OptionCode, opts ...grpc.CallOption) (*Options, error)
 	GetStudent(ctx context.Context, in *StudentReq, opts ...grpc.CallOption) (*StudentRes, error)
-	//获取数据权限
+	// 获取数据权限
 	GetDataPermission(ctx context.Context, in *DataPermissionReq, opts ...grpc.CallOption) (*DataPermissionRes, error)
-	//获取erp 渠道细分树
+	// 获取erp 渠道细分树
 	GetErpMktNetWorkDetailTree(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*TreeNodes, error)
-	//获取erp 渠道细分树
+	// 获取erp 渠道细分树
 	GetErpMktNetWorkDetail(ctx context.Context, in *ErpMktNetWorkDetailReq, opts ...grpc.CallOption) (*ErpMktNetWorkDetailRes, error)
-	//获取erp 用户校区权限
+	// 获取erp 用户校区权限
 	GetErpOrganSchPerByUserId(ctx context.Context, in *GetErpOrganSchPerByUserIdReq, opts ...grpc.CallOption) (*GetErpOrganSchPerByUserIdRes, error)
-	//获取 erp 用户角色
+	// 获取 erp 用户角色
 	GetErpRole(ctx context.Context, in *GetErpRoleReq, opts ...grpc.CallOption) (*GetErpRoleRes, error)
-	//获取 erp 全部校区
+	// 获取 erp 全部校区
 	GetErpSchool(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*GetErpSchoolRes, error)
-	//获取 erp 活动
+	// 获取 erp 活动
 	GetErpActive(ctx context.Context, in *GetErpActiveReq, opts ...grpc.CallOption) (*GetErpActiveRes, error)
-	//获取erp 省、城、校区
+	// 获取erp 省、城、校区
 	GetErpOrganSchTree(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*TreeNodes, error)
+	// 查看erp用户是否正常
+	GetErpUser(ctx context.Context, in *ErpUserReq, opts ...grpc.CallOption) (*ErpUserRes, error)
 }
 
 type transformClient struct {
@@ -2552,14 +2637,23 @@ func (c *transformClient) GetErpOrganSchTree(ctx context.Context, in *Empty, opt
 	return out, nil
 }
 
+func (c *transformClient) GetErpUser(ctx context.Context, in *ErpUserReq, opts ...grpc.CallOption) (*ErpUserRes, error) {
+	out := new(ErpUserRes)
+	err := c.cc.Invoke(ctx, "/transform.Transform/GetErpUser", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // TransformServer is the server API for Transform service.
 type TransformServer interface {
 	GetUser(context.Context, *UserRequest) (*UserResponse, error)
 	ParseToken(context.Context, *TokenRequest) (*TokenResponse, error)
-	//获取erp 省、城市树
+	// 获取erp 省、城市树
 	GetErpCityTree(context.Context, *Empty) (*TreeNodes, error)
 	AddMkt(context.Context, *MktReq) (*MktRes, error)
-	//获取erp  字典
+	// 获取erp  字典
 	LoadOptionset(context.Context, *OptionsetReq) (*OptionsetRes, error)
 	GetSchoolIds(context.Context, *SchoolIdsReq) (*SchoolIdsRes, error)
 	GetCityIds(context.Context, *CityIdsReq) (*CityIdsRes, error)
@@ -2567,22 +2661,24 @@ type TransformServer interface {
 	PostExcelLog(context.Context, *ExcelLogReq) (*ExcelLogRes, error)
 	GetErpOptionset(context.Context, *OptionCode) (*Options, error)
 	GetStudent(context.Context, *StudentReq) (*StudentRes, error)
-	//获取数据权限
+	// 获取数据权限
 	GetDataPermission(context.Context, *DataPermissionReq) (*DataPermissionRes, error)
-	//获取erp 渠道细分树
+	// 获取erp 渠道细分树
 	GetErpMktNetWorkDetailTree(context.Context, *Empty) (*TreeNodes, error)
-	//获取erp 渠道细分树
+	// 获取erp 渠道细分树
 	GetErpMktNetWorkDetail(context.Context, *ErpMktNetWorkDetailReq) (*ErpMktNetWorkDetailRes, error)
-	//获取erp 用户校区权限
+	// 获取erp 用户校区权限
 	GetErpOrganSchPerByUserId(context.Context, *GetErpOrganSchPerByUserIdReq) (*GetErpOrganSchPerByUserIdRes, error)
-	//获取 erp 用户角色
+	// 获取 erp 用户角色
 	GetErpRole(context.Context, *GetErpRoleReq) (*GetErpRoleRes, error)
-	//获取 erp 全部校区
+	// 获取 erp 全部校区
 	GetErpSchool(context.Context, *Empty) (*GetErpSchoolRes, error)
-	//获取 erp 活动
+	// 获取 erp 活动
 	GetErpActive(context.Context, *GetErpActiveReq) (*GetErpActiveRes, error)
-	//获取erp 省、城、校区
+	// 获取erp 省、城、校区
 	GetErpOrganSchTree(context.Context, *Empty) (*TreeNodes, error)
+	// 查看erp用户是否正常
+	GetErpUser(context.Context, *ErpUserReq) (*ErpUserRes, error)
 }
 
 // UnimplementedTransformServer can be embedded to have forward compatible implementations.
@@ -2646,6 +2742,9 @@ func (*UnimplementedTransformServer) GetErpActive(ctx context.Context, req *GetE
 func (*UnimplementedTransformServer) GetErpOrganSchTree(ctx context.Context, req *Empty) (*TreeNodes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetErpOrganSchTree not implemented")
 }
+func (*UnimplementedTransformServer) GetErpUser(ctx context.Context, req *ErpUserReq) (*ErpUserRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetErpUser not implemented")
+}
 
 func RegisterTransformServer(s *grpc.Server, srv TransformServer) {
 	s.RegisterService(&_Transform_serviceDesc, srv)
@@ -2993,6 +3092,24 @@ func _Transform_GetErpOrganSchTree_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Transform_GetErpUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ErpUserReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TransformServer).GetErpUser(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/transform.Transform/GetErpUser",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TransformServer).GetErpUser(ctx, req.(*ErpUserReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Transform_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "transform.Transform",
 	HandlerType: (*TransformServer)(nil),
@@ -3073,6 +3190,10 @@ var _Transform_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetErpOrganSchTree",
 			Handler:    _Transform_GetErpOrganSchTree_Handler,
 		},
+		{
+			MethodName: "GetErpUser",
+			Handler:    _Transform_GetErpUser_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "transform.proto",

+ 42 - 32
transformclient/transform.go

@@ -14,48 +14,50 @@ import (
 )
 
 type (
-	CityMkRes                    = transform.CityMkRes
-	Empty                        = transform.Empty
-	ErpMktNetWorkDetailRes       = transform.ErpMktNetWorkDetailRes
+	BytesReq                     = transform.BytesReq
+	OptionCode                   = transform.OptionCode
 	CityMkReq                    = transform.CityMkReq
-	SchoolIdsReq                 = transform.SchoolIdsReq
-	MktRes                       = transform.MktRes
-	UserRequest                  = transform.UserRequest
-	UserResponse                 = transform.UserResponse
+	CityIdsRes                   = transform.CityIdsRes
+	StudentRes                   = transform.StudentRes
+	Empty                        = transform.Empty
 	OptionsetRes                 = transform.OptionsetRes
-	Options                      = transform.Options
-	GetErpRoleReq                = transform.GetErpRoleReq
-	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
-	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
 	GetErpSchoolRes              = transform.GetErpSchoolRes
-	TokenRequest                 = transform.TokenRequest
-	TreeNode                     = transform.TreeNode
-	OptionCode                   = transform.OptionCode
+	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
 	DataPermissionReq            = transform.DataPermissionReq
-	StudentRes                   = transform.StudentRes
-	SchoolIdsRes                 = transform.SchoolIdsRes
-	BytesReq                     = transform.BytesReq
-	BytesResp                    = transform.BytesResp
-	GetErpRoleRes                = transform.GetErpRoleRes
-	OrganSchool                  = transform.OrganSchool
-	ErpMktNetWorkDetailReq       = transform.ErpMktNetWorkDetailReq
+	UserRequest                  = transform.UserRequest
 	ExcelLogRes                  = transform.ExcelLogRes
-	ListOfInt                    = transform.ListOfInt
-	DataPermissionRes            = transform.DataPermissionRes
+	CityIdsReq                   = transform.CityIdsReq
+	ErpUserRes                   = transform.ErpUserRes
+	TreeNode                     = transform.TreeNode
+	CityMkRes                    = transform.CityMkRes
+	MktRes                       = transform.MktRes
 	StudentReq                   = transform.StudentReq
-	TokenResponse                = transform.TokenResponse
+	UserResponse                 = transform.UserResponse
+	OptionsetReq                 = transform.OptionsetReq
+	GetErpActiveRes              = transform.GetErpActiveRes
+	Tag                          = transform.Tag
 	ResponseByte                 = transform.ResponseByte
-	Active                       = transform.Active
+	ExcelLogReq                  = transform.ExcelLogReq
+	SchoolIdsReq                 = transform.SchoolIdsReq
+	SchoolIdsRes                 = transform.SchoolIdsRes
 	TreeNodes                    = transform.TreeNodes
-	Tag                          = transform.Tag
+	ErpMktNetWorkDetailRes       = transform.ErpMktNetWorkDetailRes
+	ErpMktNetWorkDetailReq       = transform.ErpMktNetWorkDetailReq
+	GetErpRoleRes                = transform.GetErpRoleRes
+	GetErpRoleReq                = transform.GetErpRoleReq
+	GetErpActiveReq              = transform.GetErpActiveReq
+	BytesResp                    = transform.BytesResp
+	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
+	OrganSchool                  = transform.OrganSchool
+	Active                       = transform.Active
 	MktReq                       = transform.MktReq
-	CityIdsRes                   = transform.CityIdsRes
+	TokenRequest                 = transform.TokenRequest
+	TokenResponse                = transform.TokenResponse
 	ErpMktNetWorkDetail          = transform.ErpMktNetWorkDetail
-	OptionsetReq                 = transform.OptionsetReq
-	ExcelLogReq                  = transform.ExcelLogReq
-	CityIdsReq                   = transform.CityIdsReq
-	GetErpActiveReq              = transform.GetErpActiveReq
-	GetErpActiveRes              = transform.GetErpActiveRes
+	ErpUserReq                   = transform.ErpUserReq
+	Options                      = transform.Options
+	ListOfInt                    = transform.ListOfInt
+	DataPermissionRes            = transform.DataPermissionRes
 
 	Transform interface {
 		GetUser(ctx context.Context, in *UserRequest) (*UserResponse, error)
@@ -87,6 +89,8 @@ type (
 		GetErpActive(ctx context.Context, in *GetErpActiveReq) (*GetErpActiveRes, error)
 		// 获取erp 省、城、校区
 		GetErpOrganSchTree(ctx context.Context, in *Empty) (*TreeNodes, error)
+		//  查看erp用户是否正常
+		GetErpUser(ctx context.Context, in *ErpUserReq) (*ErpUserRes, error)
 	}
 
 	defaultTransform struct {
@@ -204,3 +208,9 @@ func (m *defaultTransform) GetErpOrganSchTree(ctx context.Context, in *Empty) (*
 	client := transform.NewTransformClient(m.cli.Conn())
 	return client.GetErpOrganSchTree(ctx, in)
 }
+
+// 查看erp用户是否正常
+func (m *defaultTransform) GetErpUser(ctx context.Context, in *ErpUserReq) (*ErpUserRes, error) {
+	client := transform.NewTransformClient(m.cli.Conn())
+	return client.GetErpUser(ctx, in)
+}