add: 权限、菜单

.gitignore

@@ -0,0 +1,38 @@
+# ---> Go
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
+
+# local
+.idea
+/_
+/.cache
+.vscode/
+/logs/logx
+lastupdate.tmp
+main
+nohup.out
+ERP_user8200
+Makefile
+ofile

Makefile

@@ -0,0 +1,6 @@
+build:
+	@echo "+ build"
+	go build -o ERP_user8200 main.go
+build-linux:
+	@echo "+ build linux"
+	GOOS=linux GOARCH=amd64 go build -o ERP_user8200 main.go

Nats/Nats.go

@@ -28,8 +28,8 @@ func init() {
 
 func NatsInit() {
 	// 请求-响应， 响应 test3 消息。
-	_, _ = Nats.Subscribe("verification", func(m *nats.Msg) {
-		fmt.Printf("verification message: %s\n", string(m.Data))
+	_, _ = Nats.Subscribe("ERP_User_verification", func(m *nats.Msg) {
+		fmt.Printf("ERP_User_verification message: %v\n", string(m.Data))
 
 		type T_User struct {
 			T_uuid  string `xml:"T_uuid"`
@@ -48,9 +48,8 @@ func NatsInit() {
 		// 验证登录
 		b_, admin_r := Account.Verification(string(m.Data), "")
 		if !b_ {
-			fmt.Println("Unmarshal error")
 			t_R.Code = 201
-			t_R.Msg = "ToKey !!!"
+			t_R.Msg = "请重新登陆!"
 			b, _ := msgpack.Marshal(&t_R)
 			_ = Nats.Publish(m.Reply, b)
 			return
@@ -66,9 +65,9 @@ func NatsInit() {
 		b, _ := msgpack.Marshal(&t_R)
 		_ = Nats.Publish(m.Reply, b)
 	})
-	// 发布-订阅 模式，异步订阅 test1
-	_, _ = Nats.Subscribe("AddSysLogs", func(m *nats.Msg) {
-		fmt.Printf("AddSysLogs message: %s\n", string(m.Data))
+	// 发布-订阅 模式，异步订阅 系统日志
+	_, _ = Nats.Subscribe("ERP_AddSysLogs", func(m *nats.Msg) {
+		fmt.Printf("ERP_AddSysLogs message: %v\n", string(m.Data))
 
 		type T_S struct {
 			T_class string
@@ -88,9 +87,9 @@ func NatsInit() {
 		System.Add_SysLogs(t_S.T_class, t_S.T_title, t_S.T_txt)
 
 	})
-	// 发布-订阅 模式，异步订阅 test1
-	_, _ = Nats.Subscribe("AddUserLogs", func(m *nats.Msg) {
-		fmt.Printf("AddUserLogs message: %s\n", string(m.Data))
+	// 发布-订阅 模式，异步订阅 用户日志
+	_, _ = Nats.Subscribe("ERP_AddUserLogs", func(m *nats.Msg) {
+		fmt.Printf("ERP_AddUserLogs message: %v\n", string(m.Data))
 
 		type T_S struct {
 			T_uuid  string
@@ -110,10 +109,9 @@ func NatsInit() {
 		System.Add_UserLogs(t_S.T_uuid, t_S.T_class, t_S.T_title, t_S.T_txt)
 
 	})
-
-	// 发布-订阅 模式，异步订阅 test1
-	_, _ = Nats.Subscribe("AddNews", func(m *nats.Msg) {
-		fmt.Printf("AddNews message: %s\n", string(m.Data))
+	// 发布-订阅 模式，异步订阅 消息
+	_, _ = Nats.Subscribe("ERP_AddNews", func(m *nats.Msg) {
+		fmt.Printf("ERP_AddNews message: %v\n", string(m.Data))
 
 		type T_S struct {
 			T_uuid  string
@@ -129,7 +127,10 @@ func NatsInit() {
 			return
 		}
 
-		System.Add_News(System.News{T_uuid: t_S.T_uuid, T_Title: t_S.T_Title, T_Url: t_S.T_Url})
-
+		_, err = System.Add_News(System.News{T_uuid: t_S.T_uuid, T_Title: t_S.T_Title, T_Url: t_S.T_Url})
+		if err != nil {
+			System.Add_SysLogs("Nats", "Nats AddNews 添加失败", string(m.Data))
+			return
+		}
 	})
 }

Nats/NatsServer/NatsERP.go

@@ -0,0 +1,204 @@
+package NatsServer
+
+import (
+	"bzd_server/Nats"
+	"bzd_server/logs"
+	"bzd_server/models/Account"
+	"errors"
+	"fmt"
+	menulibs "git.baozhida.cn/ERP_libs/Menu"
+	powerlibs "git.baozhida.cn/ERP_libs/Power"
+	"git.baozhida.cn/ERP_libs/lib"
+	"github.com/vmihailenco/msgpack/v5"
+	"time"
+)
+
+func ERP_Read_Menu_List(prefix string) ([]menulibs.Menu, error) {
+	sysName := Account.Get_Sys_Name(prefix)
+	subj := fmt.Sprintf("%s_%s", prefix, "Read_Menu_List")
+	msg, err := Nats.Nats.Request(subj, []byte(""), 3*time.Second)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return nil, err
+	}
+
+	type T_R struct {
+		Code int16           `xml:"Code"`
+		Msg  string          `xml:"Msg"`
+		Data []menulibs.Menu `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return nil, err
+	}
+	fmt.Printf("ERP_Read_Menu_List: %+v\n", t_R)
+
+	return t_R.Data, nil
+}
+
+func ERP_Read_User_Bind_Menu_List(prefix string, T_power string) ([]menulibs.Menu, error) {
+	sysName := Account.Get_Sys_Name(prefix)
+	subj := fmt.Sprintf("%s_%s", prefix, "Read_User_Bind_Menu_List")
+	msg, err := Nats.Nats.Request(subj, []byte(T_power), 3*time.Second)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return nil, err
+	}
+
+	type T_R struct {
+		Code int16           `xml:"Code"`
+		Msg  string          `xml:"Msg"`
+		Data []menulibs.Menu `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return nil, err
+	}
+	fmt.Printf("ERP_Read_Menu_List: %+v\n", t_R)
+
+	return t_R.Data, nil
+}
+
+func ERP_Add_Power(prefix string, power powerlibs.Power) (id int, err error) {
+	sysName := Account.Get_Sys_Name(prefix)
+	subj := fmt.Sprintf("%s_%s", prefix, "Add_Power")
+
+	b, _ := msgpack.Marshal(&power)
+
+	msg, err := Nats.Nats.Request(subj, b, 3*time.Second)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return id, err
+	}
+
+	type T_R struct {
+		Code int16  `xml:"Code"`
+		Msg  string `xml:"Msg"`
+		Data int64  `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return
+	}
+	fmt.Printf("ERP_Add_Power: %+v\n", t_R)
+
+	if t_R.Code != 200 {
+		err = errors.New(t_R.Msg)
+		logs.Error(lib.FuncName(), sysName, err)
+		return id, err
+	}
+
+	return int(t_R.Data), nil
+}
+
+func ERP_Read_Power_ByT_id(prefix string, T_id string) (r powerlibs.Power, err error) {
+	sysName := Account.Get_Sys_Name(prefix)
+	subj := fmt.Sprintf("%s_%s", prefix, "Read_Power_ByT_id")
+
+	msg, err := Nats.Nats.Request(subj, []byte(T_id), 3*time.Second)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return
+	}
+
+	type T_R struct {
+		Code int16           `xml:"Code"`
+		Msg  string          `xml:"Msg"`
+		Data powerlibs.Power `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return
+	}
+	fmt.Printf("ERP_Read_Power_ByT_id: %+v\n", t_R)
+
+	if t_R.Code != 200 {
+		err = errors.New(t_R.Msg)
+		logs.Error(lib.FuncName(), sysName, err)
+		return r, err
+	}
+
+	return t_R.Data, nil
+}
+
+func ERP_Update_Power(prefix string, power powerlibs.Power) (id int64, err error) {
+	sysName := Account.Get_Sys_Name(prefix)
+	subj := fmt.Sprintf("%s_%s", prefix, "Update_Power")
+
+	b, _ := msgpack.Marshal(&power)
+
+	msg, err := Nats.Nats.Request(subj, b, 3*time.Second)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return id, err
+	}
+
+	type T_R struct {
+		Code int16  `xml:"Code"`
+		Msg  string `xml:"Msg"`
+		Data int64  `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return
+	}
+	fmt.Printf("ERP_Update_Power: %+v\n", t_R)
+
+	if t_R.Code != 200 {
+		err = errors.New(t_R.Msg)
+		logs.Error(lib.FuncName(), sysName, err)
+		return id, err
+	}
+
+	return t_R.Data, nil
+}
+
+func ERP_Delete_Power(prefix string, power powerlibs.Power) (id int64, err error) {
+	sysName := Account.Get_Sys_Name(prefix)
+	subj := fmt.Sprintf("%s_%s", prefix, "Delete_Power")
+
+	b, _ := msgpack.Marshal(&power)
+
+	msg, err := Nats.Nats.Request(subj, b, 3*time.Second)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return id, err
+	}
+
+	type T_R struct {
+		Code int16  `xml:"Code"`
+		Msg  string `xml:"Msg"`
+		Data int64  `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		logs.Error(lib.FuncName(), sysName, err)
+		return
+	}
+	fmt.Printf("ERP_Delete_Power: %+v\n", t_R)
+
+	if t_R.Code != 200 {
+		err = errors.New(t_R.Msg)
+		logs.Error(lib.FuncName(), sysName, err)
+		return id, err
+	}
+
+	return t_R.Data, nil
+}

Nats/NatsServer/NatsQiniu.go

@@ -0,0 +1,115 @@
+package NatsServer
+
+import (
+	"bzd_server/Nats"
+	"bzd_server/logs"
+	"context"
+	"fmt"
+	"github.com/qiniu/go-sdk/v7/auth/qbox"
+	"github.com/qiniu/go-sdk/v7/storage"
+	"github.com/vmihailenco/msgpack/v5"
+	"strings"
+	"time"
+)
+
+func Qiniu_UploadToken(T_suffix string, T_MimeLimit string) (string, bool) {
+	type Qiniu_UploadToken struct {
+		T_suffix    string
+		T_MimeLimit string
+	}
+
+	b, err := msgpack.Marshal(&Qiniu_UploadToken{
+		T_suffix:    T_suffix,
+		T_MimeLimit: T_MimeLimit,
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	// 请求-响应， 向 test3 发布一个 `help me` 请求数据，设置超时间3秒，如果有多个响应，只接收第一个收到的消息
+	msg, err := Nats.Nats.Request("Qiniu_UploadToken", b, 3*time.Second)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Printf("Qiniu_UploadToken : %s\n", string(msg.Data))
+		return string(msg.Data), true
+	}
+
+	return string(msg.Data), false
+}
+
+//func Qiniu_UploadFile(localFile string, name string) (string, bool) {
+//	logs.Println("Nats =>", lib.FuncName(), localFile, name)
+//	type Qiniu_UploadFile struct {
+//		File string
+//		Name string
+//	}
+//	RR := Qiniu_UploadFile{File: localFile, Name: name}
+//	println(":", RR.File)
+//	b, err := msgpack.Marshal(&RR)
+//	if err != nil {
+//		panic(err)
+//	}
+//
+//	// 请求-响应， 向 test3 发布一个 `help me` 请求数据，设置超时间3秒，如果有多个响应，只接收第一个收到的消息
+//	msg, err := lib.Nats.Request("Qiniu_UploadFile", b, 3*time.Second)
+//	if err != nil {
+//		fmt.Println(err)
+//	} else {
+//		fmt.Printf("Qiniu_UploadFile : %s\n", string(msg.Data))
+//		return string(msg.Data), true
+//	}
+//
+//	return string(msg.Data), false
+//}
+
+func Qiniu_UploadFile(localFile string, name string) (string, bool) {
+	logs.Println("Qiniu_UploadFile =>", localFile, name)
+
+	// 获取 七牛云的 配置信息
+	msg, err := Nats.Nats.Request("Qiniu_Token", []byte(""), 3*time.Second)
+	if err != nil {
+		return string(msg.Data), false
+	}
+	fmt.Printf("Qiniu_Token : %s\n", string(msg.Data))
+	Qiniu_cs := strings.Split(string(msg.Data), "|")
+	Qiniu_AccessKey := Qiniu_cs[0]
+	Qiniu_SecretKey := Qiniu_cs[1]
+	Qiniu_BUCKET := Qiniu_cs[2]
+	Qiniu_Url := Qiniu_cs[3]
+
+	// 开始上传 七牛云
+	Qiniu := qbox.NewMac(Qiniu_AccessKey, Qiniu_SecretKey)
+	// 自定义返回值结构体
+	type MyPutRet struct {
+		Key    string
+		Hash   string
+		Fsize  int
+		Bucket string
+		Name   string
+	}
+	//key := "your file save key"
+	// 使用 returnBody 自定义回复格式
+	putPolicy := storage.PutPolicy{
+		Scope:      Qiniu_BUCKET,
+		ReturnBody: `{"key":"$(key)","hash":"$(etag)","fsize":$(fsize),"bucket":"$(bucket)","name":"$(x:name)"}`,
+	}
+	//mac := qbox.NewMac(conf.Qiniu_AccessKey, conf.Qiniu_SecretKey)
+	upToken := putPolicy.UploadToken(Qiniu)
+	cfg := storage.Config{}
+	formUploader := storage.NewFormUploader(&cfg)
+	ret := MyPutRet{}
+	putExtra := storage.PutExtra{
+		Params: map[string]string{
+			"x:name": "github logo",
+		},
+	}
+	err = formUploader.PutFile(context.Background(), &ret, upToken, name, localFile, &putExtra)
+	if err != nil {
+		logs.Println("七牛云", "上传文件失败"+localFile, err.Error())
+		return "", false
+	}
+	fmt.Println(ret.Bucket, ret.Key, ret.Fsize, ret.Hash, ret.Name)
+	return Qiniu_Url + name, true
+
+}

Nats/NatsServer/NatsWx.go

@@ -0,0 +1,23 @@
+package NatsServer
+
+import (
+	"bzd_server/Nats"
+	"bzd_server/logs"
+	"fmt"
+	"git.baozhida.cn/ERP_libs/lib"
+	"time"
+)
+
+func Wx_GenerateQRCode(T_uuid string) (string, bool) {
+	logs.Println(" => Nats", lib.FuncName(), T_uuid)
+
+	// 请求-响应， 向 test3 发布一个 `help me` 请求数据，设置超时间3秒，如果有多个响应，只接收第一个收到的消息
+	msg, err := Nats.Nats.Request("Wx_GenerateQR", []byte(T_uuid), 3*time.Second)
+	if err != nil {
+		fmt.Println(err)
+		return "", false
+	}
+	fmt.Printf("Wx_GenerateQR : %s\n", string(msg.Data))
+	return string(msg.Data), true
+
+}

README.md

@@ -0,0 +1,10 @@
+# ERP_libs
+
+### 导入线上库
+git config --global url."git@git.baozhida.cn/ERP_libs".insteadOf "http://120.55.48.97:3000/bzd_zeng/ERP_libs"
+
+### 导入本地库
+go mod edit -replace git.baozhida.cn/ERP_libs=/Users/zoie/work/bzd_project/ERP/ERP_libs
+
+## 添加新系统
+app.conf ERP_Nats_prefix

Z_Build.bat

@@ -4,5 +4,7 @@ set GOOS=linux
 set GOPATH=C:\Users\SIKED\go
 set GO111MODULE=auto
 
-go build ERP_user.go
+go build main.go
+
+
 

conf/app.conf

@@ -5,13 +5,12 @@ Graceful = true
 EnableDocs = true
 copyrequestbody = true
 
+
 # Nats
 NatsServer_Url = "127.0.0.1:4222"
 
-
 # Mysql
 MysqlServer_UrlPort = "47.111.15.17:3306"
-# MysqlServer_UrlPort = "192.168.0.7:3306"
 MysqlServer_Database = "erp_user"
 MysqlServer_Username = "erp_user"
 MysqlServer_Password = "DxwTJra8k5rrMdRG"
@@ -25,4 +24,6 @@ Redis_password = ""
 Redis_dbNum = "1"
 
 
+FilterExcludeURL = /Login_verification
+FilterOnlyLoginCheckURL = /Menu/List,/User/Info,/User/Post,/Menu/User_List
 

conf/config.go

@@ -1,9 +1,12 @@
 package conf
 
-import beego "github.com/beego/beego/v2/server/web"
+import (
+	beego "github.com/beego/beego/v2/server/web"
+)
 
 var Page_size = 10
 var NatsServer_Url, _ = beego.AppConfig.String("NatsServer_Url")
+var RunMode, _ = beego.AppConfig.String("RunMode")
 
 // Mysql
 var MysqlServer_UrlPort, _ = beego.AppConfig.String("MysqlServer_UrlPort")
@@ -14,6 +17,18 @@ var MysqlServer_MaxIdleConnections, _ = beego.AppConfig.Int("MysqlServer_MaxIdle
 var MysqlServer_MaxOpenConnections, _ = beego.AppConfig.Int("MysqlServer_MaxOpenConnections")
 
 // Redis
-var Redis_address = "localhost:6379"
-var Redis_password = ""
-var Redis_dbNum = "10"
+var Redis_address, _ = beego.AppConfig.String("Redis_address")
+var Redis_password, _ = beego.AppConfig.String("Redis_password")
+var Redis_dbNum, _ = beego.AppConfig.String("Redis_dbNum")
+
+var FilterExcludeURL, _ = beego.AppConfig.String("FilterExcludeURL")
+var FilterOnlyLoginCheckURL, _ = beego.AppConfig.String("FilterOnlyLoginCheckURL")
+
+var (
+	ERP_Account_Sys = "ERP_ACCOUNT"
+	ERP_AMS_Sys     = "ERP_AMS"
+	ERP_Sys_List    = map[string]string{
+		ERP_Account_Sys: "账号管理",
+		ERP_AMS_Sys:     "考勤管理",
+	}
+)

controllers/Menu.go

@@ -0,0 +1,118 @@
+package controllers
+
+import (
+	"bzd_server/Nats/NatsServer"
+	"bzd_server/conf"
+	"bzd_server/logs"
+	"bzd_server/models/Account"
+	"fmt"
+	menulibs "git.baozhida.cn/ERP_libs/Menu"
+	"git.baozhida.cn/ERP_libs/lib"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type MenuController struct {
+	beego.Controller
+	User Account.User
+}
+
+func (c *MenuController) Prepare() {
+	c.User = *Account.User_r
+}
+
+// 列表 -
+func (c *MenuController) List() {
+	T_code := c.GetString("T_code")
+	sysName := Account.Get_Sys_Name(T_code)
+	if sysName == T_code {
+		// 不存在这个code
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_code Err！"}
+		c.ServeJSON()
+		return
+	}
+
+	var r_jsons lib.R_JSONS
+	var menu []menulibs.Menu
+	var err error
+	switch T_code {
+	case conf.ERP_Account_Sys:
+		menu, err = Account.Read_Menu_List()
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取用户系统菜单失败！"}
+			c.ServeJSON()
+			return
+		}
+	default:
+		menu, err = NatsServer.ERP_Read_Menu_List(T_code)
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("获取%s菜单失败！", Account.Get_Sys_Name(T_code))}
+			c.ServeJSON()
+			return
+		}
+	}
+
+	r_jsons.Data = menu
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: sysName + "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}
+
+// 列表 -
+func (c *MenuController) User_List() {
+
+	var r_jsons lib.R_JSONS
+
+	var menuList []menulibs.Menu
+
+	if r, is := Account.Redis_Menu_Get(c.User.T_power); is {
+		r_jsons.Data = r
+		c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+		c.ServeJSON()
+		return
+	}
+
+	power, err := Account.Read_Power_ByT_id(c.User.T_power)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "查询失败!"}
+		c.ServeJSON()
+		return
+	}
+	menu, err := Account.Read_User_Bind_Menu_List(power.T_menu)
+	sysName := Account.Get_Sys_Name(conf.ERP_Account_Sys)
+	if err != nil {
+		logs.Error(lib.FuncName(), Account.Get_Sys_Name(conf.ERP_Account_Sys), err)
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: sysName + "查询失败!"}
+		c.ServeJSON()
+		return
+	}
+
+	if len(menu) > 0 {
+		menuList = append(menuList, menu...)
+	}
+
+	// 获取其他系统菜单
+	for _, prefix := range Account.ERP_Sys_prefix {
+
+		// Nats 发送失败 重试3次
+		menu, err = NatsServer.ERP_Read_User_Bind_Menu_List(prefix, c.User.T_power)
+		sysName = Account.Get_Sys_Name(prefix)
+		if err != nil {
+			logs.Error(lib.FuncName(), sysName, err)
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: sysName + "查询失败!"}
+			c.ServeJSON()
+			return
+		}
+		if len(menu) > 0 {
+			menuList = append(menuList, menu...)
+		}
+
+	}
+
+	r_jsons.Data = menuList
+	Account.Redis_Munu_Set(c.User.T_power, menuList)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}

controllers/News.go

@@ -2,25 +2,24 @@ package controllers
 
 import (
 	"bzd_server/conf"
-	"bzd_server/lib"
 	"bzd_server/models/Account"
 	"bzd_server/models/System"
+	"git.baozhida.cn/ERP_libs/lib"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )
 
 type NewsController struct {
 	beego.Controller
+	User Account.User
+}
+
+func (c *NewsController) Prepare() {
+	c.User = *Account.User_r
 }
 
 // 列表 -
 func (c *NewsController) List() {
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
 	// 分页参数 初始化
 	page, _ := c.GetInt("page")
 	if page < 1 {
@@ -34,19 +33,11 @@ func (c *NewsController) List() {
 	// 查询
 	T_title := c.GetString("T_title")
 	T_Tag, _ := c.GetInt("T_Tag")
-	R_List, R_cnt := System.Read_News_List_1(admin_r.T_uuid, T_title, T_Tag, page, page_z)
+	R_List, R_cnt := System.Read_News_List(c.User.T_uuid, T_title, T_Tag, page, page_z)
 
-	// 封装 返回数据
-	type R_JSONS struct {
-		//必须的大写开头
-		Lite      []System.News_R
-		Num       int64
-		Page      int
-		Page_size int
-	}
-	var r_jsons R_JSONS
+	var r_jsons lib.R_JSONS
 	r_jsons.Num = R_cnt
-	r_jsons.Lite = R_List
+	r_jsons.Data = R_List
 	r_jsons.Page = page
 	r_jsons.Page_size = int(math.Ceil(float64(R_cnt) / float64(page_z)))
 
@@ -56,22 +47,20 @@ func (c *NewsController) List() {
 }
 
 func (c *NewsController) See() {
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
 
 	Id, _ := c.GetInt("Id")
 
 	if Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "e!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id Err!"}
 		c.ServeJSON()
 		return
 	}
 
-	System.Update_News_Tag_1(Id, admin_r.T_uuid)
+	if err := System.Update_News_Tag(Id, c.User.T_uuid); err != nil {
+		c.Data["json"] = lib.JSONS{Code: 200, Msg: "修改失败!"}
+		c.ServeJSON()
+		return
+	}
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()

controllers/Power.go

@@ -1,9 +1,16 @@
 package controllers
 
 import (
+	"bzd_server/Nats/NatsServer"
 	"bzd_server/conf"
-	"bzd_server/lib"
 	"bzd_server/models/Account"
+	"bzd_server/models/System"
+	"fmt"
+	menulibs "git.baozhida.cn/ERP_libs/Menu"
+	powerlibs "git.baozhida.cn/ERP_libs/Power"
+	"git.baozhida.cn/ERP_libs/lib"
+	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/adapter/orm"
 
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
@@ -11,6 +18,11 @@ import (
 
 type PowerController struct {
 	beego.Controller
+	User Account.User
+}
+
+func (c *PowerController) Prepare() {
+	c.User = *Account.User_r
 }
 
 // 列表 -
@@ -28,19 +40,11 @@ func (c *PowerController) List() {
 
 	// 查询
 	T_name := c.GetString("T_name")
-	R_List, R_cnt := Account.Read_Power_List_1(T_name, page, page_z)
+	R_List, R_cnt := Account.Read_Power_List(T_name, page, page_z)
 
-	// 封装 返回数据
-	type R_JSONS struct {
-		//必须的大写开头
-		Lite      []Account.Power_R
-		Num       int64
-		Page      int
-		Page_size int
-	}
-	var r_jsons R_JSONS
+	var r_jsons lib.R_JSONS
 	r_jsons.Num = R_cnt
-	r_jsons.Lite = R_List
+	r_jsons.Data = R_List
 	r_jsons.Page = page
 	r_jsons.Page_size = int(math.Ceil(float64(R_cnt) / float64(page_z)))
 
@@ -49,133 +53,337 @@ func (c *PowerController) List() {
 	return
 }
 
-func (c *PowerController) GetT() {
+func (c *PowerController) Get() {
+
+	type Data struct {
+		Power        powerlibs.Power_R
+		Menu         []menulibs.Menu
+		Menu_checked []int
+	}
+
+	var data Data
 
 	T_id := c.GetString("T_id")
+	T_code := c.GetString("T_code")
+	if len(T_code) == 0 {
+		T_code = conf.ERP_Account_Sys
+	}
 
 	if len(T_id) < 1 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 
-	R, err := Account.Read_Power_ByT_id(T_id)
-	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改!"}
-		c.ServeJSON()
-		return
+	sysName := Account.Get_Sys_Name(T_code)
+
+	var menu []menulibs.Menu
+	var power powerlibs.Power
+	var err error
+	switch T_code {
+	case conf.ERP_Account_Sys:
+		power, err = Account.Read_Power_ByT_id(T_id)
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "查询失败!"}
+			c.ServeJSON()
+			return
+		}
+		menu, err = Account.Read_Menu_List()
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取用户系统菜单失败！"}
+			c.ServeJSON()
+			return
+		}
+	default:
+		power, err = NatsServer.ERP_Read_Power_ByT_id(T_code, T_id)
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("获取%s权限失败！", sysName)}
+			c.ServeJSON()
+			return
+		}
+
+		menu, err = NatsServer.ERP_Read_Menu_List(T_code)
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("获取%s菜单失败！", sysName)}
+			c.ServeJSON()
+			return
+		}
+	}
+
+	data.Power = powerlibs.PowerToPower_R(power)
+	data.Menu = menu
+	if power.T_menu != "*" {
+		data.Menu_checked = lib.SplitStringToIntIds(power.T_menu, "M")
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Account.PowerToPower_R(R)}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: data}
 	c.ServeJSON()
 	return
 
 }
+
 func (c *PowerController) Add() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	if admin_r.T_power != "AAAAAAAA" {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
 
 	T_name := c.GetString("T_name")
+	rand_x := 0
+	T_id := ""
+	for true {
+		T_id = lib.GetRandstring(8, "", int64(rand_x))
+		_, err := Account.Read_Power_ByT_id(T_id)
+		if err != nil {
+			break
+		}
+		rand_x += 1
+	}
 
-	var_ := Account.Power{
+	var_ := powerlibs.Power{
+		T_id:   T_id,
 		T_name: T_name,
 	}
 
-	_, err := Account.Add_Power(var_)
+	id, err := Account.Add_Power(var_)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "添加失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
 		c.ServeJSON()
 		return
 	}
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	for _, prefix := range Account.ERP_Sys_prefix {
+		i := 3
+		for {
+			// Nats 发送失败 重试3次
+			_, err = NatsServer.ERP_Add_Power(prefix, var_)
+			if err == nil || i == 0 {
+				break
+			}
+			i--
+		}
+
+		if err != nil {
+			sysName := Account.Get_Sys_Name(prefix)
+			logs.Error(lib.FuncName(), sysName+"添加失败: ", err)
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: sysName + "添加失败!"}
+			c.ServeJSON()
+			return
+		}
+	}
+
+	System.Add_UserLogs_T(c.User.T_uuid, "权限", "新增", var_)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: id}
 	c.ServeJSON()
 	return
 
 }
 
 func (c *PowerController) Edit() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	if admin_r.T_power != "AAAAAAAA" {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
 
 	T_id := c.GetString("T_id")
 	T_name := c.GetString("T_name")
 
-	var_ := Account.Power{
-		T_id:   T_id,
-		T_name: T_name,
+	if len(T_id) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_id Err!"}
+		c.ServeJSON()
+		return
 	}
 
-	if len(T_id) < 1 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "修改失败!"}
+	var_, err := Account.Read_Power_ByT_id(T_id)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 
-	R, err := Account.Read_Power_ByT_id(var_.T_id)
+	var_.T_name = T_name
+
+	id, err := Account.Update_Power(var_)
 	if err != nil {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
-	var_.Id = R.Id
-	Account.Update_Power(var_, "T_name")
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	// 向除开用户系统的其他系统修改权限
+	// 查询新系统是否存在与用户系统powerT_id相同的power 存在=>修改 不存在=>添加
+	for _, prefix := range Account.ERP_Sys_prefix {
+		// Nats 发送失败 重试3次
+		i := 3
+		for {
+			_, err = NatsServer.ERP_Read_Power_ByT_id(prefix, T_id)
+			if err != nil {
+				if err.Error() == orm.ErrNoRows.Error() {
+					_, err = NatsServer.ERP_Add_Power(prefix, var_)
+					if err == nil || i == 0 {
+						break
+					}
+				} else {
+					c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
+					c.ServeJSON()
+					return
+				}
+			}
+
+			_, err = NatsServer.ERP_Update_Power(prefix, var_)
+			if err == nil || i == 0 {
+				break
+			}
+			i--
+		}
+
+		if err != nil {
+			sysName := Account.Get_Sys_Name(prefix)
+
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: sysName + "修改失败!"}
+			c.ServeJSON()
+			return
+		}
+	}
+
+	System.Add_UserLogs_T(c.User.T_uuid, "权限", "修改", var_)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: id}
 	c.ServeJSON()
 	return
 
 }
-func (c *PowerController) Del() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
+
+func (c *PowerController) Sys_List() {
+
+	type Sys struct {
+		T_sys  string
+		T_name string
+	}
+	var list []Sys
+	for k, v := range conf.ERP_Sys_List {
+		list = append(list, Sys{
+			T_sys:  k,
+			T_name: v,
+		})
+	}
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: list}
+	c.ServeJSON()
+	return
+
+}
+
+func (c *PowerController) Edit_Menu() {
+
+	T_id := c.GetString("T_id")
+	T_code := c.GetString("T_code")
+	T_menu := c.GetString("T_menu")
+
+	if len(T_id) == 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
-	if admin_r.T_power != "AAAAAAAA" {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "没有权限!"}
+
+	sysName := Account.Get_Sys_Name(T_code)
+	if sysName == T_code {
+		// 不存在这个code
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_code Err！"}
 		c.ServeJSON()
 		return
 	}
 
+	var_, err := Account.Read_Power_ByT_id(T_id)
+	var_.T_menu = T_menu
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
+		c.ServeJSON()
+		return
+	}
+	var id int64
+	switch T_code {
+	case conf.ERP_Account_Sys:
+		id, err = Account.Update_Power(var_)
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
+			c.ServeJSON()
+			return
+		}
+	default:
+		_, err = NatsServer.ERP_Read_Power_ByT_id(T_code, T_id)
+		if err != nil {
+			if err.Error() == orm.ErrNoRows.Error() {
+				_, err = NatsServer.ERP_Add_Power(T_code, var_)
+			} else {
+				c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
+				c.ServeJSON()
+				return
+			}
+		}
+
+		id, err = NatsServer.ERP_Update_Power(T_code, var_)
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("%s 修改失败!", sysName)}
+			c.ServeJSON()
+			return
+		}
+	}
+	Account.Redis_Menu_DelK(T_id)
+	System.Add_UserLogs_T(c.User.T_uuid, "权限", sysName+" 修改菜单", var_)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: sysName + " ok!", Data: id}
+	c.ServeJSON()
+	return
+
+}
+
+func (c *PowerController) Del() {
+
 	T_id := c.GetString("T_id")
 	if len(T_id) == 0 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "e!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	R, err := Account.Read_Power_ByT_id(T_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "e!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
+		c.ServeJSON()
+		return
+	}
+
+	id, err := Account.Delete_Power(R)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 		c.ServeJSON()
 		return
 	}
 
-	Account.Delete_Power(R)
+	for _, prefix := range Account.ERP_Sys_prefix {
+		i := 3
+		for {
+			R, err = NatsServer.ERP_Read_Power_ByT_id(prefix, T_id)
+			if err != nil {
+				if err.Error() == orm.ErrNoRows.Error() {
+					break
+				}
+				c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
+				c.ServeJSON()
+				return
+			}
+			// Nats 发送失败 重试3次
+			_, err = NatsServer.ERP_Delete_Power(prefix, R)
+			if err == nil || i == 0 {
+				break
+			}
+			i--
+		}
+
+		if err != nil {
+			name := Account.Get_Sys_Name(prefix)
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: name + " 修改失败!"}
+			c.ServeJSON()
+			return
+		}
+	}
+
+	System.Add_UserLogs_T(c.User.T_uuid, "权限", "删除", T_id)
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: id}
 	c.ServeJSON()
 	return
 

controllers/SysLogs.go

@@ -2,32 +2,24 @@ package controllers
 
 import (
 	"bzd_server/conf"
-	"bzd_server/lib"
 	"bzd_server/models/Account"
 	"bzd_server/models/System"
+	"git.baozhida.cn/ERP_libs/lib"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )
 
 type SysLogsController struct {
 	beego.Controller
+	User Account.User
+}
+
+func (c *SysLogsController) Prepare() {
+	c.User = *Account.User_r
 }
 
 // 列表 -
 func (c *SysLogsController) List() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	if admin_r.T_power != "AAAAAAAA" {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
-
 	// 分页参数 初始化
 	page, _ := c.GetInt("page")
 	if page < 1 {
@@ -41,19 +33,11 @@ func (c *SysLogsController) List() {
 	// 查询
 	T_class := c.GetString("T_class")
 	T_title := c.GetString("T_title")
-	R_List, R_cnt := System.Read_SysLogs_List_1(T_class, T_title, page, page_z)
+	R_List, R_cnt := System.Read_SysLogs_List(T_class, T_title, page, page_z)
 
-	// 封装 返回数据
-	type R_JSONS struct {
-		//必须的大写开头
-		Lite      []System.SysLogs_R
-		Num       int64
-		Page      int
-		Page_size int
-	}
-	var r_jsons R_JSONS
+	var r_jsons lib.R_JSONS
 	r_jsons.Num = R_cnt
-	r_jsons.Lite = R_List
+	r_jsons.Data = R_List
 	r_jsons.Page = page
 	r_jsons.Page_size = int(math.Ceil(float64(R_cnt) / float64(page_z)))
 
@@ -64,19 +48,6 @@ func (c *SysLogsController) List() {
 
 // 列表 -
 func (c *SysLogsController) List_DISTINCT_Class() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	if admin_r.T_power != "AAAAAAAA" {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
-
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: System.Read_SysLogs_Class()}
 	c.ServeJSON()
 	return

controllers/User.go

@@ -2,9 +2,9 @@ package controllers
 
 import (
 	"bzd_server/conf"
-	"bzd_server/lib"
 	"bzd_server/models/Account"
 	"bzd_server/models/System"
+	"git.baozhida.cn/ERP_libs/lib"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 	"time"
@@ -12,6 +12,13 @@ import (
 
 type UserController struct {
 	beego.Controller
+	User Account.User
+}
+
+func (c *UserController) Prepare() {
+	if Account.User_r != nil {
+		c.User = *Account.User_r
+	}
 }
 
 // 验证登录
@@ -19,18 +26,16 @@ func (c *UserController) Login_verification() {
 	Admin_user := c.GetString("bzd_username")
 	Admin_pass := c.GetString("bzd_password")
 
-	//println("Login_verification", Admin_user, Admin_pass)
 	err, user_r := Account.Read_User_verification(Admin_user, Admin_pass)
 
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "E!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "用户名或密码错误!"}
 	} else {
 		User_tokey := Account.Add_Tokey(user_r.T_uuid)
 		c.Ctx.SetCookie("User_tokey", User_tokey, time.Second*60*60)
 		c.Data["json"] = lib.JSONS{Code: 200, Msg: "OK!", Data: User_tokey}
 
-		System.Add_UserLogs(user_r.T_uuid, "用户", "用户登陆", "")
-
+		System.Add_UserLogs_T(user_r.T_uuid, "用户", "用户登陆", lib.GetUserLoginInfo(c.Ctx))
 	}
 
 	c.ServeJSON()
@@ -40,16 +45,8 @@ func (c *UserController) Login_verification() {
 
 // --------------------------------------------------------------------------------------------------------------
 
-// 列表 -
+// 用户列表
 func (c *UserController) List() {
-	// 验证登录
-	b_, _ := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-
 	// 分页参数 初始化
 	page, _ := c.GetInt("page")
 	if page < 1 {
@@ -63,19 +60,11 @@ func (c *UserController) List() {
 	// 查询
 	T_name := c.GetString("T_name")
 	T_power := c.GetString("T_power")
-	R_List, R_cnt := Account.Read_User_List_1(T_name, T_power, page, page_z)
-
-	// 封装 返回数据
-	type R_JSONS struct {
-		//必须的大写开头
-		Lite      []Account.User_R
-		Num       int64
-		Page      int
-		Page_size int
-	}
-	var r_jsons R_JSONS
+	R_List, R_cnt := Account.Read_User_List(T_name, T_power, page, page_z)
+
+	var r_jsons lib.R_JSONS
 	r_jsons.Num = R_cnt
-	r_jsons.Lite = R_List
+	r_jsons.Data = R_List
 	r_jsons.Page = page
 	r_jsons.Page_size = int(math.Ceil(float64(R_cnt) / float64(page_z)))
 
@@ -84,35 +73,15 @@ func (c *UserController) List() {
 	return
 }
 
-// 列表 -
+// 个人信息
 func (c *UserController) Info() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Account.UserToUser_R(admin_r)}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Account.UserToUser_R(c.User)}
 	c.ServeJSON()
 	return
 }
-func (c *UserController) Add() {
-
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	if admin_r.T_power != "AAAAAAAA" {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
 
+// 添加用户信息
+func (c *UserController) Add() {
 	T_power := c.GetString("T_power")
 	T_name := c.GetString("T_name")
 	T_user := c.GetString("T_user")
@@ -125,7 +94,7 @@ func (c *UserController) Add() {
 		T_pass:  T_pass,
 	}
 	if len(T_power) < 1 {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "失败!"}
+		c.Data["json"] = lib.JSONS{Code: 204, Msg: "权限异常!"}
 		c.ServeJSON()
 		return
 	}
@@ -157,6 +126,8 @@ func (c *UserController) Add() {
 		c.ServeJSON()
 		return
 	}
+	var_.T_pass = "******"
+	System.Add_UserLogs_T(c.User.T_uuid, "用户", "新增", var_)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
@@ -164,114 +135,132 @@ func (c *UserController) Add() {
 
 }
 
-func (c *UserController) Edit() {
+// 修改个人信息
+func (c *UserController) Post() {
 
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
+	T_name := c.GetString("T_name")
+	T_pass := c.GetString("T_pass")
+
+	user := c.User
+	if len(T_name) > 0 {
+		if len(T_name) < 3 {
+			c.Data["json"] = lib.JSONS{Code: 204, Msg: "名字格式不正确!"}
+			c.ServeJSON()
+			return
+		}
+		user.T_name = T_name
+	}
+
+	if len(T_pass) > 0 {
+		if len(T_pass) < 8 {
+			c.Data["json"] = lib.JSONS{Code: 206, Msg: "密码格式不正确!"}
+			c.ServeJSON()
+			return
+		}
+		user.T_pass = T_pass
 	}
 
+	if err := Account.Update_User(user, "T_power", "T_name", "T_user", "T_pass"); err != nil {
+		if len(T_pass) < 8 {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
+			c.ServeJSON()
+			return
+		}
+	}
+
+	user.T_pass = "******"
+	System.Add_UserLogs_T(c.User.T_uuid, "用户", "修改个人信息", user)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	c.ServeJSON()
+	return
+
+}
+
+// 修改用户信息
+func (c *UserController) Edit() {
+
 	T_uuid := c.GetString("T_uuid")
 	T_power := c.GetString("T_power")
 	T_name := c.GetString("T_name")
-	T_user := c.GetString("T_user")
 	T_pass := c.GetString("T_pass")
 
 	var err error
-	R := admin_r
-
-	// AAAAAAAAA
-	if len(T_uuid) > 0 || len(T_power) > 0 {
-		if admin_r.T_power == "AAAAAAAA" {
-			R, err = Account.Read_User_ByT_uuid(T_uuid)
-			if err != nil {
-				c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
-				c.ServeJSON()
-				return
-			}
-		} else {
-			c.Data["json"] = lib.JSONS{Code: 203, Msg: "没有权限!"}
+	var user Account.User
+
+	if len(T_uuid) > 0 {
+		user, err = Account.Read_User_ByT_uuid(T_uuid)
+		if err != nil {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_uuid Err!"}
 			c.ServeJSON()
 			return
 		}
-
 	}
 
 	if len(T_name) > 0 {
-		R.T_name = T_name
 		if len(T_name) < 3 {
-			c.Data["json"] = lib.JSONS{Code: 204, Msg: "名字 长度太短 < 3!"}
-			c.ServeJSON()
-			return
-		}
-	}
-	if len(T_user) > 0 {
-		R.T_user = T_user
-		if len(T_user) < 3 {
-			c.Data["json"] = lib.JSONS{Code: 205, Msg: "用户名 长度太短 < 3!"}
+			c.Data["json"] = lib.JSONS{Code: 204, Msg: "名字格式不正确!"}
 			c.ServeJSON()
 			return
 		}
+		user.T_name = T_name
 	}
+
 	if len(T_pass) > 0 {
-		R.T_pass = T_pass
 		if len(T_power) < 8 {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "密码太短了!"}
+			c.Data["json"] = lib.JSONS{Code: 206, Msg: "密码格式不正确!"}
 			c.ServeJSON()
 			return
 		}
+		user.T_pass = T_pass
 	}
 
 	if len(T_power) > 0 {
-		R.T_power = T_power
-
-		_, err := Account.Read_Power_ByT_id(T_power)
+		_, err = Account.Read_Power_ByT_id(T_power)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 208, Msg: "权限参数异常!"}
+			c.Data["json"] = lib.JSONS{Code: 208, Msg: "T_power Err!"}
 			c.ServeJSON()
 			return
 		}
+		user.T_power = T_power
+	}
+
+	if err = Account.Update_User(user, "T_power", "T_name", "T_pass"); err != nil {
+		c.Data["json"] = lib.JSONS{Code: 208, Msg: "修改失败!"}
+		c.ServeJSON()
+		return
 	}
 
-	Account.Update_User(R, "T_power", "T_name", "T_user", "T_pass")
+	user.T_pass = "******"
+	System.Add_UserLogs_T(c.User.T_uuid, "用户", "修改个人信息", user)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
 
 }
-func (c *UserController) Del() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-	if admin_r.T_power != "AAAAAAAA" {
-		c.Data["json"] = lib.JSONS{Code: 301, Msg: "没有权限!"}
-		c.ServeJSON()
-		return
-	}
 
+// 删除用户信息
+func (c *UserController) Del() {
 	T_uuid := c.GetString("T_uuid")
 	if len(T_uuid) == 0 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "e!"}
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_uuid Err!"}
 		c.ServeJSON()
 		return
 	}
 
-	R, err := Account.Read_User_ByT_uuid(T_uuid)
+	user, err := Account.Read_User_ByT_uuid(T_uuid)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "e!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_uuid Err!"}
 		c.ServeJSON()
 		return
 	}
 
-	Account.Delete_User(R)
+	if err = Account.Delete_User(user); err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
+		c.ServeJSON()
+		return
+	}
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()

controllers/UserLogs.go

@@ -2,26 +2,24 @@ package controllers
 
 import (
 	"bzd_server/conf"
-	"bzd_server/lib"
 	"bzd_server/models/Account"
 	"bzd_server/models/System"
+	"git.baozhida.cn/ERP_libs/lib"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )
 
 type UserLogsController struct {
 	beego.Controller
+	User Account.User
+}
+
+func (c *UserLogsController) Prepare() {
+	c.User = *Account.User_r
 }
 
 // 列表 -
 func (c *UserLogsController) List() {
-	// 验证登录
-	b_, admin_r := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
 
 	// 分页参数 初始化
 	page, _ := c.GetInt("page")
@@ -36,7 +34,7 @@ func (c *UserLogsController) List() {
 	// 查询
 	T_class := c.GetString("T_class")
 	T_title := c.GetString("T_title")
-	R_List, R_cnt := System.Read_UserLogs_List_1(admin_r.T_uuid, T_class, T_title, page, page_z)
+	R_List, R_cnt := System.Read_UserLogs_List(c.User.T_uuid, T_class, T_title, page, page_z)
 
 	// 封装 返回数据
 	type R_JSONS struct {
@@ -59,14 +57,6 @@ func (c *UserLogsController) List() {
 
 // 列表 -
 func (c *UserLogsController) List_DISTINCT_Class() {
-	// 验证登录
-	b_, _ := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !b_ {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "User_tokey Err!"}
-		c.ServeJSON()
-		return
-	}
-
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: System.Read_UserLogs_Class()}
 	c.ServeJSON()
 	return

go.mod

@@ -1,49 +1,50 @@
 module bzd_server
 
-go 1.17
-
-require (
-	github.com/beego/beego/v2 v2.0.1
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/go-sql-driver/mysql v1.6.0
-	github.com/golang/protobuf v1.4.2 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.3.3 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.7.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.10.0 // indirect
-	github.com/satori/go.uuid v1.2.0
-	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
-	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect
-	golang.org/x/mod v0.3.0 // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
-	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/protobuf v1.23.0 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
-)
+go 1.19
 
 require (
+	git.baozhida.cn/ERP_libs v0.0.0-00010101000000-000000000000
 	github.com/astaxie/beego v1.12.3
-	github.com/nats-io/nats.go v1.19.0
+	github.com/beego/beego/v2 v2.0.7
+	github.com/go-sql-driver/mysql v1.7.0
+	github.com/nats-io/nats.go v1.23.0
+	github.com/qiniu/go-sdk/v7 v7.14.0
+	github.com/satori/go.uuid v1.2.0
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 )
 
 require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/nats-io/nats-server/v2 v2.9.4 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/klauspost/compress v1.15.15 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/minio/highwayhash v1.0.2 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mssola/user_agent v0.6.0 // indirect
+	github.com/nats-io/jwt/v2 v2.3.0 // indirect
 	github.com/nats-io/nkeys v0.3.0 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	github.com/prometheus/procfs v0.1.3 // indirect
-	github.com/rogpeppe/go-internal v1.8.0 // indirect
+	github.com/phpdave11/gofpdi v1.0.14-0.20211212211723-1f10f9844311 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	github.com/signintech/gopdf v0.16.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace git.baozhida.cn/ERP_libs => /Users/zoie/work/bzd_project/ERP/ERP_libs

go.sum

@@ -1,16 +1,50 @@
 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=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
 github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ=
 github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
-github.com/beego/beego/v2 v2.0.1 h1:07a7Z0Ok5vbqyqh+q53sDPl9LdhKh0ZDy3gbyGrhFnE=
-github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI=
+github.com/beego/beego/v2 v2.0.7 h1:9KNnUM40tn3pbCOFfe6SJ1oOL0oTi/oBS/C/wCEdAXA=
+github.com/beego/beego/v2 v2.0.7/go.mod h1:f0uOEkmJWgAuDTlTxUdgJzwG3PDSIf3UWF3NpMohbFE=
 github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
 github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -20,14 +54,15 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
 github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
-github.com/coreos/etcd v3.3.25+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
 github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
 github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
@@ -38,60 +73,114 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
-github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
+github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw=
+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=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/validator/v10 v10.8.0/go.mod h1:9JhgTzTaE31GZDpH/HSvHiRJrJ3iKAgqqH0Bl/Ocjdk=
 github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
 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-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
+github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw=
+github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -102,40 +191,44 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
-github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/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=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
-github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
-github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mssola/user_agent v0.6.0 h1:uwPR4rtWlCHRFyyP9u2KOV0u8iQXmS7Z7feTrstQwk4=
+github.com/mssola/user_agent v0.6.0/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
 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/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI=
-github.com/nats-io/nats-server/v2 v2.9.4 h1:GvRgv1936J/zYUwMg/cqtYaJ6L+bgeIOIvPslbesdow=
-github.com/nats-io/nats-server/v2 v2.9.4/go.mod h1:AB6hAnGZDlYfqb7CTAm66ZKMZy9DpfierY1/PbpvI2g=
-github.com/nats-io/nats.go v1.19.0 h1:H6j8aBnTQFoVrTGB6Xjd903UMdE7jz6DS4YkmAqgZ9Q=
-github.com/nats-io/nats.go v1.19.0/go.mod h1:tLqubohF7t4z3du1QDPYJIQQyhb4wl6DhjxEajSI7UA=
+github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k=
+github.com/nats-io/nats-server/v2 v2.9.14 h1:n2GscWVgXpA14vQSRP/MM1SGi4wyazR9l19/gWxqgXQ=
+github.com/nats-io/nats.go v1.23.0 h1:lR28r7IX44WjYgdiKz9GmUeW0uh/m33uD3yEjLZ2cOE=
+github.com/nats-io/nats.go v1.23.0/go.mod h1:ki/Scsa23edbh8IRZbCuNXR9TDcbvfaSijKtaqQgw+Q=
 github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
 github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
+github.com/phpdave11/gofpdi v1.0.14-0.20211212211723-1f10f9844311 h1:zyWXQ6vu27ETMpYsEMAsisQ+GqJ4e1TPvSNfdOPF0no=
+github.com/phpdave11/gofpdi v1.0.14-0.20211212211723-1f10f9844311/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -145,20 +238,35 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U=
 github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
+github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk=
+github.com/qiniu/go-sdk/v7 v7.14.0 h1:6icihMTKHoKMmeU1mqtIoHUv7c1LrLjYm8wTQaYDqmw=
+github.com/qiniu/go-sdk/v7 v7.14.0/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w=
+github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
@@ -171,16 +279,19 @@ github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/
 github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
 github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s=
 github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
+github.com/signintech/gopdf v0.16.1 h1:p+JjxLsz4ploSmFAruCbYM3c7Hp+jEL3DWZm5SO8bAU=
+github.com/signintech/gopdf v0.16.1/go.mod h1:wrLtZoWaRNrS4hphED0oflFoa6IWkOu6M3nJjm4VbO4=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
@@ -189,107 +300,291 @@ github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
-go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
+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=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
-golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 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=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+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/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=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
+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/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 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=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 h1:1Bs6RVeBFtLZ8Yi1Hk07DiOqzvwLD/4hln4iahvFlag=
-golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+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-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+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=
 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=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+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.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.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/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -305,12 +600,21 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

lib/lib.go

@@ -1,18 +0,0 @@
-package lib
-
-func init() {
-
-}
-
-type JSONS struct {
-	//必须的大写开头
-	Code int16
-	Msg  string
-	Data interface{} // 泛型
-}
-
-// func_page 分页   [{3 1} {4 2} {4 3} {4 4} {4 5} {4 6} {4 7} {4 8} {4 9} {5 2}]-
-type Page_T struct {
-	A int
-	V int64
-}

lib/libString.go

@@ -1,29 +0,0 @@
-package lib
-
-import (
-	"math/rand"
-	"strings"
-	"time"
-)
-
-//#取得随机字符串：通过打乱slice来操作
-func GetRandstring(length int, char string, rand_x int64) string {
-	if length < 1 {
-		return ""
-	}
-
-	if len(char) <= 6 || len(char) <= length {
-		char = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-	}
-
-	charArr := strings.Split(char, "")
-	ran := rand.New(rand.NewSource(time.Now().Unix() + rand_x))
-
-	l := len(charArr)
-	for i := l - 1; i > 0; i-- {
-		r := ran.Intn(i)
-		charArr[r], charArr[i] = charArr[i], charArr[r]
-	}
-	rchar := charArr[:length]
-	return strings.Join(rchar, "")
-}

logs/LogPrintln.go

@@ -0,0 +1,65 @@
+package logs
+
+import (
+	"bzd_server/conf"
+	"github.com/astaxie/beego/logs"
+	"runtime"
+)
+
+var Logx *logs.BeeLogger
+var Test = true
+
+func init() {
+	Logx = logs.NewLogger()
+	Logx.SetLogger(logs.AdapterFile, `{"filename":"logs/Logx/Logx.log"}`)
+	Logx.EnableFuncCallDepth(true)
+	Logx.SetLogFuncCallDepth(3)
+	if conf.RunMode == "dev" {
+		Logx.SetLogger("console")
+	}
+	if runtime.GOOS == "windows" {
+		Test = true
+	} else {
+		Test = false
+	}
+}
+
+func Println(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+	Logx.Info(format, v...)
+}
+
+// Debug Log DEBUG level message.
+func Debug(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+	Logx.Debug(format, v...)
+}
+
+// Info Log ERROR level message.
+func Info(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+	Logx.Info(format, v...)
+}
+
+// Error Log ERROR level message.
+func Error(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+
+	Logx.Error(format, v...)
+}
+
+// Warning Log WARNING level message.
+func Warning(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+	Logx.Warning(format, v...)
+}

models/Account/Menu.go

@@ -0,0 +1,121 @@
+package Account
+
+import (
+	"bzd_server/conf"
+	"encoding/json"
+	"fmt"
+	menulibs "git.baozhida.cn/ERP_libs/Menu"
+	"git.baozhida.cn/ERP_libs/lib"
+	"github.com/astaxie/beego/cache"
+	_ "github.com/astaxie/beego/cache/redis"
+	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/adapter/orm"
+	"time"
+)
+
+var redisCache_API cache.Cache
+var redisCache_Menu cache.Cache
+
+func init() {
+	//注册模型
+	orm.RegisterModel(new(menulibs.Menu))
+	orm.RegisterModel(new(menulibs.API))
+
+	var err error
+
+	menuConfig := fmt.Sprintf(`{"key":"%s","conn":"%s","dbNum":"%s","password":"%s"}`,
+		"redis_User_Menu", conf.Redis_address, conf.Redis_dbNum, conf.Redis_password)
+	fmt.Println(menuConfig)
+	redisCache_Menu, err = cache.NewCache("redis", menuConfig)
+	if err != nil || redisCache_Menu == nil {
+		errMsg := "failed to init redis menu"
+		logs.Error(errMsg, err)
+		panic(errMsg)
+	}
+
+	apiConfig := fmt.Sprintf(`{"key":"%s","conn":"%s","dbNum":"%s","password":"%s"}`,
+		"redis_ERP_USER_API", conf.Redis_address, conf.Redis_dbNum, conf.Redis_password)
+	fmt.Println(apiConfig)
+	redisCache_API, err = cache.NewCache("redis", apiConfig)
+	if err != nil || redisCache_API == nil {
+		errMsg := "failed to init redis api"
+		logs.Error(errMsg, err)
+		panic(errMsg)
+	}
+}
+
+func Redis_Munu_Set(T_power_id string, r []menulibs.Menu) (err error) {
+	//json序列化
+	str, err := json.Marshal(r)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+
+	err = redisCache_Menu.Put(T_power_id, str, 24*time.Hour)
+	if err != nil {
+		logs.Error("set key:", T_power_id+",value:", str, err)
+	}
+	return
+}
+
+func Redis_Menu_Get(T_power_id string) (r []menulibs.Menu, is bool) {
+	if redisCache_Menu.IsExist(T_power_id) {
+		//println("找到key:",key)
+		v := redisCache_Menu.Get(T_power_id)
+
+		err := json.Unmarshal(v.([]byte), &r)
+		if err != nil {
+			logs.Error(lib.FuncName(), err)
+			return r, false
+		}
+		return r, true
+	}
+	return r, false
+}
+
+func Redis_Menu_DelK(T_power_id string) (err error) {
+	err = redisCache_Menu.Delete(T_power_id)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+	return
+}
+
+func Read_Menu_List() ([]menulibs.Menu, error) {
+	o := orm.NewOrm()
+	MenuDao := menulibs.NewMenu(o)
+	m, err := MenuDao.Read_Menu_List()
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return nil, err
+	}
+
+	return m, nil
+}
+
+// Read_User_Bind_Menu_List 获取用户绑定的菜单列表
+func Read_User_Bind_Menu_List(T_Menu string) ([]menulibs.Menu, error) {
+	o := orm.NewOrm()
+	MenuDao := menulibs.NewMenu(o)
+	m, err := MenuDao.Read_Menu_List_ByPower_T_Menu(T_Menu)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return nil, err
+	}
+
+	return m, nil
+}
+
+// 获取列表
+func Read_API_List_ByPower(T_power_id string, Menu_Bind string) (maps []menulibs.API) {
+	o := orm.NewOrm()
+	APIDao := menulibs.NewAPI(o, redisCache_API)
+	maps, err := APIDao.Read_API_List_ByPower(T_power_id, Menu_Bind)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+	return maps
+}

models/Account/Power.go

@@ -1,145 +1,84 @@
 package Account
 
 import (
-	"bzd_server/lib"
-	"fmt"
+	"bzd_server/logs"
+	menulibs "git.baozhida.cn/ERP_libs/Menu"
+	powerlibs "git.baozhida.cn/ERP_libs/Power"
+	"git.baozhida.cn/ERP_libs/lib"
 	"github.com/beego/beego/v2/adapter/orm"
-	orm2 "github.com/beego/beego/v2/client/orm"
-	"time"
 )
 
-type Power struct {
-	Id     int    `orm:"column(ID);size(11);auto;pk"`
-	T_id   string `orm:"size(8);null"`   //  权限ID
-	T_name string `orm:"size(256);null"` //  权限名称
-
-	T_State    int       `orm:"size(200);1"`                                           //  0删除  1 正常
-	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
-	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
-}
-type Power_R struct {
-	T_id   string `orm:"size(256);null"` //  权限ID
-	T_name string `orm:"size(256);null"` //  权限名称
-}
-
-func (t *Power) TableName() string {
-	return "Power" // 数据库名称   // ************** 替换 FormulaList **************
-}
-
 func init() {
 	//注册模型
-	orm.RegisterModel(new(Power))
-	//  初始化
-	go func() {
-		time.Sleep(3 * time.Second)
-		_, num := Read_Power_List_1("", 1, 10)
-		if num == 0 {
-			T_id, _ := Add_Power(Power{
-				T_name: "管理员",
-				T_id:   "AAAAAAAA",
-			})
-
-			Add_User(User{
-				T_power: T_id,
-				T_name:  "超级管理员",
-				T_user:  "admin",
-				T_pass:  "21232f297a57a5a743894a0e4a801fc3",
-			})
-
-		}
-	}()
-
-}
-
-func PowerToPower_R(r Power) (m Power_R) {
-	m.T_id = r.T_id
-	m.T_name = r.T_name
-	return
+	orm.RegisterModel(new(powerlibs.Power))
 }
 
 // 添加
-func Add_Power(r Power) (id string, err error) {
+func Add_Power(r powerlibs.Power) (id string, err error) {
 	o := orm.NewOrm()
-
-	//生成编号
-	rand_x := 0
-	if len(r.T_id) == 0 {
-		for true {
-			r.T_id = lib.GetRandstring(8, "", int64(rand_x)) // 1,336,336
-			err := o.Read(&r, "T_id")                        // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
-			if err != nil {
-				break
-			}
-			rand_x += 1
-		}
-	}
-
-	r.T_State = 1
-	_, err = o.Insert(&r)
+	powerDao := powerlibs.NewPower(o)
+	_, err = powerDao.Add_Power(r)
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
+		return id, err
 	}
 	return r.T_id, err
 }
 
 // 获取 ById
-func Read_Power_ByT_id(T_id string) (r Power, err error) {
+func Read_Power_ByT_id(T_id string) (r powerlibs.Power, err error) {
 	o := orm.NewOrm()
-	qs := o.QueryTable(new(Power))
-	err = qs.Filter("T_id", T_id).One(&r)
-	return r, err
+	powerDao := powerlibs.NewPower(o)
+	power, err := powerDao.Read_Power_ByT_id(T_id)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return r, err
+	}
+	return power, nil
 }
 
 // 修改
-func Update_Power(m Power, cols ...string) bool {
+func Update_Power(r powerlibs.Power) (id int64, err error) {
 	o := orm.NewOrm()
-	if num, err := o.Update(&m, cols...); err == nil {
-		fmt.Println("Number of records updated in database:", num)
-		return true
+	powerDao := powerlibs.NewPower(o)
+	id, err = powerDao.Update_Power(r)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
 	}
-	return false
+	APIDao := menulibs.NewAPI(o, redisCache_API)
+	APIDao.Redis_API_DelK(r.T_id)
+	return
 }
 
 // 删除
-func Delete_Power(v Power) bool {
+func Delete_Power(r powerlibs.Power) (id int64, err error) {
 	o := orm.NewOrm()
-	if num, err := o.Delete(&v); err == nil {
-		fmt.Println("Number of records deleted in database:", num)
-	} else {
-		return false
+	powerDao := powerlibs.NewPower(o)
+	id, err = powerDao.Delete_Power(r)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
 	}
-
-	return true
+	APIDao := menulibs.NewAPI(o, redisCache_API)
+	APIDao.Redis_API_DelK(r.T_id)
+	return
 }
 
 // 获取列表
-func Read_Power_List_1(T_name string, page int, page_z int) (r_ []Power_R, cnt int64) {
+func Read_Power_List(T_name string, page int, page_z int) (r_ []powerlibs.Power_R, cnt int64) {
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
-	qs := o.QueryTable(new(Power))
-	var offset int64
-	if page <= 1 {
-		offset = 0
-	} else {
-		offset = int64((page - 1) * page_z)
-	}
-
-	// 过滤
-	cond := orm.NewCondition()
-	cond1 := cond.And("T_State", 1) //.And("T_State", 1) .AndNot("status__in", 1).Or("profile__age__gt", 2000)
 
-	if len(T_name) > 0 {
-		//cond1.AndCond(cond.And("T_class", class))
-		cond1 = cond1.And("T_name__icontains", T_name)
+	powerDao := powerlibs.NewPower(o)
+	r_, err := powerDao.Read_Power_List(T_name, page, page_z)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
 	}
 
-	// 查询
-	var r []Power
-	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
-	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
-
-	for _, v := range r {
-		r_ = append(r_, PowerToPower_R(v))
+	cnt, err = powerDao.Read_Power_Count(T_name)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
 	}
 
 	return r_, cnt

models/Account/Sys.go

@@ -0,0 +1,29 @@
+package Account
+
+import (
+	"bzd_server/conf"
+	"bzd_server/logs"
+)
+
+var ERP_Sys_prefix = make([]string, 0)
+
+func init() {
+	if len(conf.ERP_Sys_List) > 0 {
+		logs.Println("=========== 初始化系统信息 =========")
+		for k, _ := range conf.ERP_Sys_List {
+			if k == conf.ERP_Account_Sys {
+				continue
+			}
+			// ERP_Sys_prefix ["ERP_AMS","ERP_"]
+			ERP_Sys_prefix = append(ERP_Sys_prefix, k)
+		}
+	}
+}
+
+func Get_Sys_Name(code string) string {
+	if v, ok := conf.ERP_Sys_List[code]; ok {
+		return v
+	} else {
+		return code
+	}
+}

models/Account/Tokey.go

@@ -2,7 +2,9 @@ package Account
 
 import (
 	"bzd_server/conf"
+	"bzd_server/logs"
 	"fmt"
+	"git.baozhida.cn/ERP_libs/lib"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	uuid "github.com/satori/go.uuid"
@@ -23,23 +25,23 @@ func init() {
 	redisCache_Tokey, err = cache.NewCache("redis", config)
 	if err != nil || redisCache_Tokey == nil {
 		errMsg := "failed to init redis"
-		fmt.Println(errMsg, err)
+		logs.Error(errMsg, err)
 	}
 }
 
 // ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
+// Redis_Set(m.T_sn,m) // Redis 更新缓存
 func Redis_Tokey_Set(key string, r string) (err error) {
 	err = redisCache_Tokey.Put(key, r, 24*time.Hour)
 	if err != nil {
-		fmt.Println("set key:", key, ",value:", r, err)
+		logs.Error("set key:", key, ",value:", r, err)
 	}
 	return
 }
 
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
+// if r,is :=Redis_Get(T_sn);is{
+// return r,nil
+// }
 func Redis_Tokey_Get(key string) (r string, is bool) {
 	if redisCache_Tokey.IsExist(key) {
 		//println("找到key:",key)
@@ -54,6 +56,9 @@ func Redis_Tokey_Get(key string) (r string, is bool) {
 
 func Redis_DelK(key string) (err error) {
 	err = redisCache_Tokey.Delete(key)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
 	return
 }
 
@@ -98,8 +103,10 @@ func Verification(GetCookie string, GetString string) (bool, User) {
 
 	user_r, err := Read_User_ByT_uuid(tokey)
 	if err != nil {
+		logs.Error(lib.FuncName(), err)
 		return false, User{}
 	}
+	User_r = &user_r
 	log.Println("登录 User_name 为：", user_r.T_name)
 	return true, user_r
 }

models/Account/User.go

@@ -1,9 +1,10 @@
 package Account
 
 import (
-	"bzd_server/lib"
 	"errors"
 	"fmt"
+	"git.baozhida.cn/ERP_libs/lib"
+	"github.com/astaxie/beego/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	"time"
@@ -11,11 +12,11 @@ import (
 
 type User struct {
 	Id      int    `orm:"column(ID);size(11);auto;pk"`
-	T_uuid  string `orm:"size(32);null"`  //
-	T_power string `orm:"size(8);0"`      // 权限ID
-	T_name  string `orm:"size(256);null"` //
-	T_user  string `orm:"size(256);null"` //
-	T_pass  string `orm:"size(256);null"` //
+	T_uuid  string `orm:"size(32);null"`      //
+	T_power string `orm:"size(8);defaulr(0)"` // 权限ID
+	T_name  string `orm:"size(256);null"`     //
+	T_user  string `orm:"size(256);null"`     //
+	T_pass  string `orm:"size(256);null"`     //
 
 	T_State    int       `orm:"size(200);1"`                                           //  0删除  1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
@@ -28,6 +29,8 @@ type User_R struct {
 	T_user  string //
 }
 
+var User_r *User
+
 func (t *User) TableName() string {
 	return "User" // 数据库名称   // ************** 替换 FormulaList **************
 }
@@ -51,7 +54,7 @@ func Read_User_verification(T_user string, T_pass string) (error, User) {
 	r := User{T_user: T_user, T_pass: T_pass}
 	err := o.Read(&r, "T_user", "T_pass") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return err, r
 }
@@ -79,43 +82,48 @@ func Add_User(r User) (id int64, err error) {
 	r.T_State = 1
 	id, err = o.Insert(&r)
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return id, err
 }
 
 // 获取 ById
-func Read_User_ByT_uuid(T_uuid string) (r User, e error) {
+func Read_User_ByT_uuid(T_uuid string) (r User, err error) {
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(User))
-	e = qs.Filter("T_uuid", T_uuid).One(&r)
+	err = qs.Filter("T_uuid", T_uuid).One(&r)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
 	return
 }
 
 // 修改
-func Update_User(m User, cols ...string) bool {
+func Update_User(m User, cols ...string) error {
 	o := orm.NewOrm()
-	if num, err := o.Update(&m, cols...); err == nil {
-		fmt.Println("Number of records updated in database:", num)
-		return true
+	num, err := o.Update(&m, cols...)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return err
 	}
-	return false
+	fmt.Println("Number of records updated in database:", num)
+	return nil
 }
 
 // 删除
-func Delete_User(v User) bool {
+func Delete_User(v User) error {
 	o := orm.NewOrm()
-	if num, err := o.Delete(&v); err == nil {
-		fmt.Println("Number of records deleted in database:", num)
-	} else {
-		return false
+	num, err := o.Delete(&v)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return err
 	}
-
-	return true
+	fmt.Println("Number of records deleted in database:", num)
+	return nil
 }
 
 // 获取列表
-func Read_User_List_1(T_name string, T_power string, page int, page_z int) (r_ []User_R, cnt int64) {
+func Read_User_List(T_name string, T_power string, page int, page_z int) (r_ []User_R, cnt int64) {
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 	qs := o.QueryTable(new(User))
@@ -140,8 +148,18 @@ func Read_User_List_1(T_name string, T_power string, page int, page_z int) (r_ [
 
 	// 查询
 	var r []User
-	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
-	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	_, err := qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
+
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+
+	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
 
 	for _, v := range r {
 		r_ = append(r_, UserToUser_R(v))

models/System/News.go

@@ -54,7 +54,7 @@ func Add_News(r News) (id int64, err error) {
 }
 
 // 获取列表
-func Read_News_List_1(T_uuid string, T_Title string, T_Tag int, page int, page_z int) (r_ []News_R, cnt int64) {
+func Read_News_List(T_uuid string, T_Title string, T_Tag int, page int, page_z int) (r_ []News_R, cnt int64) {
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 	qs := o.QueryTable(new(News))
@@ -89,7 +89,7 @@ func Read_News_List_1(T_uuid string, T_Title string, T_Tag int, page int, page_z
 }
 
 // 修改 排序
-func Update_News_Tag_1(Id int, T_uuid string) (err error) {
+func Update_News_Tag(Id int, T_uuid string) (err error) {
 	o := orm.NewOrm()
 	v := News{Id: Id}
 

models/System/SysLogs.go

@@ -1,7 +1,10 @@
 package System
 
 import (
+	"bzd_server/logs"
+	"encoding/json"
 	"fmt"
+	"git.baozhida.cn/ERP_libs/lib"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	"time"
@@ -46,11 +49,28 @@ func SysLogsToSysLogs_R(r SysLogs) (m SysLogs_R) {
 func Add_SysLogs(SysLogs_class string, SysLogs_title string, SysLogs_txt string) {
 	o := orm.NewOrm()
 	m := SysLogs{T_class: SysLogs_class, T_title: SysLogs_title, T_txt: SysLogs_txt}
-	o.Insert(&m)
+	_, err := o.Insert(&m)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
+}
+
+// 添加  System.Add_SysLogs("MqttServer","参数请求 [Rt_Parameter]","base")
+func Add_SysLogs_T(SysLogs_class string, SysLogs_title string, Logs_Txt_T interface{}) {
+	o := orm.NewOrm()
+	jsonStu, err := json.Marshal(Logs_Txt_T)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
+	m := SysLogs{T_class: SysLogs_class, T_title: SysLogs_title, T_txt: string(jsonStu)}
+	_, err = o.Insert(&m)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
 }
 
 // 获取列表
-func Read_SysLogs_List_1(SysLogs_class string, SysLogs_title string, page int, page_z int) (r_ []SysLogs_R, cnt int64) {
+func Read_SysLogs_List(SysLogs_class string, SysLogs_title string, page int, page_z int) (r_ []SysLogs_R, cnt int64) {
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 	qs := o.QueryTable(new(SysLogs))

models/System/UserLogs.go

@@ -1,7 +1,10 @@
 package System
 
 import (
+	"bzd_server/logs"
+	"encoding/json"
 	"fmt"
+	"git.baozhida.cn/ERP_libs/lib"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	"time"
@@ -44,11 +47,27 @@ func UserLogsToUserLogs_R(r UserLogs) (m UserLogs_R) {
 func Add_UserLogs(T_uuid string, UserLogs_class string, UserLogs_title string, UserLogs_txt string) {
 	o := orm.NewOrm()
 	m := UserLogs{T_uuid: T_uuid, T_class: UserLogs_class, T_title: UserLogs_title, T_txt: UserLogs_txt}
-	o.Insert(&m)
+	_, err := o.Insert(&m)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
+}
+
+func Add_UserLogs_T(Logs_uuid string, Logs_class string, Logs_Title string, Logs_Txt_T interface{}) {
+	o := orm.NewOrm()
+	jsonStu, err := json.Marshal(Logs_Txt_T)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
+	m := UserLogs{T_uuid: Logs_uuid, T_class: Logs_class, T_title: Logs_Title, T_txt: string(jsonStu)}
+	_, err = o.Insert(&m)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
 }
 
 // 获取列表
-func Read_UserLogs_List_1(T_uuid string, UserLogs_class string, UserLogs_title string, page int, page_z int) (r_ []UserLogs_R, cnt int64) {
+func Read_UserLogs_List(T_uuid string, UserLogs_class string, UserLogs_title string, page int, page_z int) (r_ []UserLogs_R, cnt int64) {
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 	qs := o.QueryTable(new(UserLogs))

routers/User.go

@@ -14,16 +14,19 @@ func init() {
 	//-----------用户管理
 	beego.Router("/User/List", &controllers.UserController{}, "*:List") //
 	beego.Router("/User/Info", &controllers.UserController{}, "*:Info") //
+	beego.Router("/User/Post", &controllers.UserController{}, "*:Post") //
 	beego.Router("/User/Add", &controllers.UserController{}, "*:Add")   //
 	beego.Router("/User/Edit", &controllers.UserController{}, "*:Edit") //
 	beego.Router("/User/Del", &controllers.UserController{}, "*:Del")   //
 
 	//-----------权限管理
-	beego.Router("/Power/List", &controllers.PowerController{}, "*:List") //
-	beego.Router("/Power/Get", &controllers.PowerController{}, "*:GetT")  //
-	beego.Router("/Power/Add", &controllers.PowerController{}, "*:Add")   //
-	beego.Router("/Power/Edit", &controllers.PowerController{}, "*:Edit") //
-	beego.Router("/Power/Del", &controllers.PowerController{}, "*:Del")   //
+	beego.Router("/Power/List", &controllers.PowerController{}, "*:List")           //
+	beego.Router("/Power/Get", &controllers.PowerController{}, "*:Get")             //
+	beego.Router("/Power/Add", &controllers.PowerController{}, "*:Add")             //
+	beego.Router("/Power/Edit", &controllers.PowerController{}, "*:Edit")           //
+	beego.Router("/Power/Sys_List", &controllers.PowerController{}, "*:Sys_List")   //
+	beego.Router("/Power/Edit_Menu", &controllers.PowerController{}, "*:Edit_Menu") //
+	beego.Router("/Power/Del", &controllers.PowerController{}, "*:Del")             //
 
 	//-----------系统日志管理
 	beego.Router("/SysLogs/List", &controllers.SysLogsController{}, "*:List")                          //
@@ -37,4 +40,8 @@ func init() {
 	beego.Router("/News/List", &controllers.NewsController{}, "*:List") //
 	beego.Router("/News/See", &controllers.NewsController{}, "*:See")   //
 
+	//-----------菜单
+	beego.Router("/Menu/List", &controllers.MenuController{}, "*:List")           // 菜单列表
+	beego.Router("/Menu/User_List", &controllers.MenuController{}, "*:User_List") // 用户绑定菜单列表
+
 }

routers/filter.go

@@ -0,0 +1,76 @@
+package routers
+
+import (
+	"bzd_server/conf"
+	"bzd_server/logs"
+	"bzd_server/models/Account"
+	"git.baozhida.cn/ERP_libs/lib"
+	"github.com/beego/beego/v2/server/web/context"
+	"strings"
+)
+
+var (
+	filterExcludeURLMap        = make(map[string]int) // 不鉴权的URL
+	filterOnlyLoginCheckURLMap = make(map[string]int) // 只鉴权登录的URL
+)
+
+func init() {
+	//初始化配置 不鉴权的URL和只鉴权登录的URL
+	logs.Println("=========== 初始化路由筛选信息 =========")
+
+	excludeUrl := conf.FilterExcludeURL
+	if len(excludeUrl) > 0 {
+		excludeUrlSlice := strings.Split(excludeUrl, ",")
+		if len(excludeUrlSlice) > 0 {
+			for _, v := range excludeUrlSlice {
+				filterExcludeURLMap[v] = 1
+			}
+		}
+	}
+	checkLoginUrl := conf.FilterOnlyLoginCheckURL
+	if len(checkLoginUrl) > 0 {
+		checkLoginUrlSlice := strings.Split(checkLoginUrl, ",")
+		if len(checkLoginUrlSlice) > 0 {
+			for _, v := range checkLoginUrlSlice {
+				filterOnlyLoginCheckURLMap[v] = 1
+			}
+		}
+	}
+}
+
+func RBACFilter(ctx *context.Context) {
+	//判断URL是否排除
+	if _, ok := filterExcludeURLMap[ctx.Request.URL.Path]; ok {
+		return
+	}
+	b_, admin_r := Account.Verification(ctx.GetCookie("User_tokey"), ctx.Input.Query("User_tokey"))
+	if !b_ {
+		ctx.Output.JSON(lib.JSONS{Code: 201, Msg: "请重新登陆!"}, true, false)
+		return
+	}
+	//判断是否只验证登录的URL
+	if _, ok := filterOnlyLoginCheckURLMap[ctx.Request.URL.Path]; b_ && ok {
+		return
+	}
+
+	power, _ := Account.Read_Power_ByT_id(admin_r.T_power)
+
+	if power.T_menu == "*" {
+		return
+	}
+
+	api := Account.Read_API_List_ByPower(power.T_id, power.T_menu)
+	flag := false
+	for _, v := range api {
+		if v.T_uri == ctx.Request.URL.Path {
+			flag = true
+			break
+		}
+	}
+	if !flag {
+		data := lib.JSONS{Code: 202, Msg: "无权访问!"}
+		ctx.Output.JSON(data, true, false)
+		return
+	}
+
+}

routers/router.go

@@ -0,0 +1,13 @@
+package routers
+
+import (
+	errorlibs "git.baozhida.cn/ERP_libs/Error"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+func init() {
+
+	beego.ErrorController(&errorlibs.ErrorController{})
+	//过滤器，拦截所有请求
+	beego.InsertFilter("/*", beego.BeforeRouter, RBACFilter)
+}

run.sh

@@ -1,2 +1,2 @@
 #无日志输出
-nohup ./Cold_server >/dev/null 2>&1 &
+nohup ./ERP_user8200 >/dev/null 2>&1 &