update: 修改表名

.gitignore

@@ -120,7 +120,9 @@ fabric.properties
 /_
 /.cache
 .vscode/
-/logs/Mqtt
+/logs/logx
 lastupdate.tmp
 ColdVerify_server
+ColdVerify_server6300
 ofile
+Makefile

ColdVerify_server.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"bzd_server/conf"
-	_ "bzd_server/routers"
+	"ColdVerify_server/conf"
+	_ "ColdVerify_server/routers"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	beego "github.com/beego/beego/v2/server/web"

Makefile

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

README.md

@@ -0,0 +1,5 @@
+# ColdVerify_server
+
+冷链验证报告系统
+
+GOOS=linux GOARCH=amd64 go build ColdVerify_server.go

controllers/Account.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/Account"
-	"bzd_server/models/System"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
+	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	uuid "github.com/satori/go.uuid"
 	"math"
@@ -98,7 +98,9 @@ func (c *AccountController) List() {
 	T_name := c.GetString("T_name")
 
 	var cnt int
-	List, cnt := Account.Read_Admin_List(T_name, page, page_z)
+	PowerList := Account.Read_Power_List_ALL_1()
+	PowerMap := Account.UserPowerListToPowerMap(PowerList)
+	List, cnt := Account.Read_Admin_List(T_name, page, page_z, PowerMap)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
 	r_jsons.Page = page
@@ -271,7 +273,7 @@ func (c *AccountController) UserPower_List_All() {
 		return
 	}
 	var r_jsons lib.R_JSONS
-	r_jsons.List = Account.Read_Power_List_ALL_1()
+	r_jsons.List = Account.Read_Power_List_ALL_Admin_Power(User_r.T_power)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
 	c.ServeJSON()
 	return

controllers/Certificate.go

@@ -1,12 +1,13 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/Certificate"
-	"bzd_server/models/System"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Certificate"
+	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
+	"strings"
 )
 
 type CertificateController struct {
@@ -203,7 +204,7 @@ func (c *CertificateController) Pdf_Add() {
 		T_State:          1,
 	}
 
-	if _, is := Certificate.Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time); is {
+	if _, err := Certificate.Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time); err == nil {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "重复添加!"}
 		c.ServeJSON()
 		return
@@ -232,7 +233,7 @@ func (c *CertificateController) Pdf_Up() {
 		return
 	}
 
-	_, err := c.GetInt("Id")
+	Id, err := c.GetInt("Id")
 	if err != nil {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
 		c.ServeJSON()
@@ -255,13 +256,20 @@ func (c *CertificateController) Pdf_Up() {
 		return
 	}
 
-	r, is := Certificate.Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time)
-	if !is {
+	_, err = Certificate.Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time)
+	if !strings.Contains(err.Error(), "no row found") || err == nil {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "数据已存在!"}
 		c.ServeJSON()
 		return
 	}
 
+	r, is := Certificate.Read_CertificatePdf_ById(Id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
+		c.ServeJSON()
+		return
+	}
+
 	if len(T_release_time) > 0 {
 		r.T_release_time = T_release_time
 	}

controllers/Device.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/Device"
-	"bzd_server/models/System"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Device"
+	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )

controllers/DeviceClass.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/Device"
-	"bzd_server/models/System"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Device"
+	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )

controllers/Logs.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/System"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )

controllers/Task.go

@@ -1,11 +1,11 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/Account"
-	"bzd_server/models/System"
-	"bzd_server/models/Task"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
+	"ColdVerify_server/models/System"
+	"ColdVerify_server/models/Task"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )
@@ -132,7 +132,7 @@ func (c *TaskController) Add() {
 	T_uuid := c.GetString("T_uuid") // 用户uuid
 	T_VerifyTemplate_id := c.GetString("T_VerifyTemplate_id")
 	T_deadline := c.GetString("T_deadline")
-	T_scheme := c.GetString("T_T_scheme")
+	T_scheme := c.GetString("T_scheme")
 	T_collection := c.GetString("T_collection")
 	T_reporting := c.GetString("T_reporting")
 	T_delivery := c.GetString("T_delivery")
@@ -354,11 +354,10 @@ func (c *TaskController) Logs_List() {
 
 	T_task_id := c.GetString("T_task_id")
 
-	//AdminList := Account.Read_Admin_List_ALL()
-	//AdminMap := Account.AdminListToAdminMap(AdminList)
+	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
 
 	var cnt int
-	List, cnt := Task.Read_TaskLogs_List(T_task_id, page, page_z)
+	List, cnt := Task.Read_TaskLogs_List(T_task_id, AdminMap, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
 	r_jsons.Page = page

controllers/TaskData.go

@@ -1,12 +1,12 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/logs"
-	"bzd_server/models/Device"
-	"bzd_server/models/System"
-	"bzd_server/models/Task"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
+	"ColdVerify_server/models/Device"
+	"ColdVerify_server/models/System"
+	"ColdVerify_server/models/Task"
 	"fmt"
 	beego "github.com/beego/beego/v2/server/web"
 	"github.com/signintech/gopdf"

controllers/Template.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/System"
-	"bzd_server/models/Template"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/System"
+	"ColdVerify_server/models/Template"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )

controllers/UpFile.go

@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
 	"crypto/md5"
 	"fmt"
 	beego "github.com/beego/beego/v2/server/web"

controllers/User.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/models/Account"
-	"bzd_server/models/System"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
+	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )
@@ -88,12 +88,14 @@ func (c *UserController) Add() {
 		return
 	}
 
+	T_power, _ := c.GetInt("T_power")
 	T_name := c.GetString("T_name")
 	T_user := c.GetString("T_user")
 	T_pass := c.GetString("T_pass")
 	T_passstr := c.GetString("T_passstr")
 
 	var_ := Account.User{
+		T_power:   T_power,
 		T_user:    T_user,
 		T_name:    T_name,
 		T_pass:    T_pass,
@@ -125,6 +127,7 @@ func (c *UserController) Up() {
 		return
 	}
 
+	T_power, T_power_err := c.GetInt("T_power")
 	T_name := c.GetString("T_name")
 	T_pass := c.GetString("T_pass")
 	T_passstr := c.GetString("T_passstr")
@@ -139,6 +142,9 @@ func (c *UserController) Up() {
 	}
 
 	// .......
+	if T_power_err == nil {
+		r.T_power = T_power
+	}
 	if len(T_name) > 0 {
 		r.T_name = T_name
 	}
@@ -153,7 +159,7 @@ func (c *UserController) Up() {
 	}
 
 	// .......
-	if !Account.Update_User(r, "T_name", "T_pass", "T_passstr", "T_Show") {
+	if !Account.Update_User(r, "T_power", "T_name", "T_pass", "T_passstr", "T_Show") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return

controllers/VerifyTemplate.go

@@ -1,12 +1,14 @@
 package controllers
 
 import (
-	"bzd_server/lib"
-	"bzd_server/models/System"
-	"bzd_server/models/Task"
-	"bzd_server/models/VerifyTemplate"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/models/System"
+	"ColdVerify_server/models/Task"
+	"ColdVerify_server/models/VerifyTemplate"
 	"encoding/json"
 	beego "github.com/beego/beego/v2/server/web"
+	"math"
 )
 
 type VerifyTemplateController struct {
@@ -23,9 +25,28 @@ func (c *VerifyTemplateController) List() {
 		return
 	}
 
+	var r_jsons lib.R_JSONS
+	page, _ := c.GetInt("page")
+	if page < 1 {
+		page = 1
+	}
+	page_z, _ := c.GetInt("page_z")
+	if page_z < 1 {
+		page_z = conf.Page_size
+	}
+
 	T_name := c.GetString("T_name")
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: VerifyTemplate.Read_VerifyTemplate_List(T_name)}
+	var cnt int64
+	List, cnt := VerifyTemplate.Read_VerifyTemplate_List(T_name, page, page_z)
+	page_size := math.Ceil(float64(cnt) / float64(page_z))
+	r_jsons.List = List
+	r_jsons.Page = page
+	r_jsons.Page_size = int(page_size)
+	r_jsons.Pages = lib.Func_page(int64(page), int64(page_size))
+	r_jsons.Num = int(cnt)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
 	c.ServeJSON()
 	return
 }
@@ -144,9 +165,27 @@ func (c *VerifyTemplateController) Map_List() {
 		return
 	}
 
+	var r_jsons lib.R_JSONS
+	page, _ := c.GetInt("page")
+	if page < 1 {
+		page = 1
+	}
+	page_z, _ := c.GetInt("page_z")
+	if page_z < 1 {
+		page_z = conf.Page_size
+	}
+
 	T_VerifyTemplate_id := c.GetString("T_VerifyTemplate_id")
 
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: VerifyTemplate.Read_VerifyTemplateMap_List(T_VerifyTemplate_id)}
+	var cnt int64
+	List, cnt := VerifyTemplate.Read_VerifyTemplateMap_List(T_VerifyTemplate_id, page, page_z)
+	page_size := math.Ceil(float64(cnt) / float64(page_z))
+	r_jsons.List = List
+	r_jsons.Page = page
+	r_jsons.Page_size = int(page_size)
+	r_jsons.Pages = lib.Func_page(int64(page), int64(page_size))
+	r_jsons.Num = int(cnt)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
 	c.ServeJSON()
 	return
 }
@@ -208,6 +247,7 @@ func (c *VerifyTemplateController) Map_Up() {
 	T_text := c.GetString("T_text")
 	T_label, T_label_err := c.GetInt("T_label")
 	T_sort, T_sort_err := c.GetInt("T_sort")
+	T_source, T_source_err := c.GetInt("T_source")
 
 	T_id := c.GetString("T_id")
 
@@ -234,9 +274,12 @@ func (c *VerifyTemplateController) Map_Up() {
 	if T_sort_err == nil {
 		r.T_sort = T_sort
 	}
+	if T_source_err == nil {
+		r.T_source = T_source
+	}
 
 	// .......
-	if !VerifyTemplate.Update_VerifyTemplateMap(r, "T_name", "T_label", "T_text", "T_field", "T_sort") {
+	if !VerifyTemplate.Update_VerifyTemplateMap(r, "T_name", "T_label", "T_text", "T_field", "T_sort", "T_source") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
@@ -384,6 +427,16 @@ func (c *VerifyTemplateController) Time_List() {
 		return
 	}
 
+	var r_jsons lib.R_JSONS
+	page, _ := c.GetInt("page")
+	if page < 1 {
+		page = 1
+	}
+	page_z, _ := c.GetInt("page_z")
+	if page_z < 1 {
+		page_z = conf.Page_size
+	}
+
 	T_VerifyTemplateMap_id := c.GetString("T_VerifyTemplateMap_id")
 	r, is := VerifyTemplate.Read_VerifyTemplateMap(T_VerifyTemplateMap_id)
 	if !is {
@@ -391,7 +444,16 @@ func (c *VerifyTemplateController) Time_List() {
 		c.ServeJSON()
 		return
 	}
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: VerifyTemplate.Read_VerifyTemplateTime_List(T_VerifyTemplateMap_id, r)}
+
+	var cnt int64
+	List, cnt := VerifyTemplate.Read_VerifyTemplateTime_List(T_VerifyTemplateMap_id, r, page, page_z)
+	page_size := math.Ceil(float64(cnt) / float64(page_z))
+	r_jsons.List = List
+	r_jsons.Page = page
+	r_jsons.Page_size = int(page_size)
+	r_jsons.Pages = lib.Func_page(int64(page), int64(page_size))
+	r_jsons.Num = int(cnt)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
 	c.ServeJSON()
 	return
 }
@@ -407,6 +469,7 @@ func (c *VerifyTemplateController) Time_Add() {
 	}
 
 	T_VerifyTemplateMap_id := c.GetString("T_VerifyTemplateMap_id")
+	T_tag := c.GetString("T_tag")
 	T_step_name := c.GetString("T_step_name")
 	T_min_time, _ := c.GetInt("T_min_time")
 	T_max_time, _ := c.GetInt("T_max_time")
@@ -415,6 +478,7 @@ func (c *VerifyTemplateController) Time_Add() {
 
 	var_ := VerifyTemplate.VerifyTemplateTime{
 		T_VerifyTemplateMap_id: T_VerifyTemplateMap_id,
+		T_tag:                  T_tag,
 		T_step_name:            T_step_name,
 		T_min_time:             T_min_time,
 		T_max_time:             T_max_time,
@@ -447,6 +511,7 @@ func (c *VerifyTemplateController) Time_Up() {
 	}
 
 	//T_VerifyTemplateMap_id := c.GetString("T_VerifyTemplateMap_id")
+	T_tag := c.GetString("T_tag")
 	T_step_name := c.GetString("T_step_name")
 	T_min_time, T_min_time_err := c.GetInt("T_min_time")
 	T_max_time, T_max_time_err := c.GetInt("T_max_time")
@@ -462,6 +527,9 @@ func (c *VerifyTemplateController) Time_Up() {
 		return
 	}
 
+	if len(T_tag) > 0 {
+		r.T_tag = T_tag
+	}
 	if len(T_step_name) > 0 {
 		r.T_step_name = T_step_name
 	}
@@ -481,7 +549,7 @@ func (c *VerifyTemplateController) Time_Up() {
 		r.T_sort = T_sort
 	}
 
-	if !VerifyTemplate.Update_VerifyTemplateTime(r, "T_step_name", "T_min_time", "T_max_time", "T_text", "T_sort") {
+	if !VerifyTemplate.Update_VerifyTemplateTime(r, "T_tag", "T_step_name", "T_min_time", "T_max_time", "T_text", "T_sort") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return

go.mod

@@ -1,68 +1,43 @@
-module bzd_server
+module ColdVerify_server
 
-go 1.17
-
-require (
-	github.com/alibabacloud-go/darabonba-openapi v0.1.14
-	github.com/alibabacloud-go/dysmsapi-20170525/v2 v2.0.8
-	github.com/alibabacloud-go/dyvmsapi-20170525/v2 v2.1.1
-	github.com/alibabacloud-go/tea v1.1.17
-	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
-	github.com/tidwall/gjson v1.12.1
-	golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
-	golang.org/x/mod v0.3.0 // indirect
-	golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
-	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // 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.18
 
 require (
 	github.com/astaxie/beego v1.12.3
-	github.com/qiniu/go-sdk/v7 v7.11.1
-	github.com/signintech/gopdf v0.12.0
-	github.com/xuri/excelize/v2 v2.6.0
-	github.com/yosssi/gmq v0.0.1
+	github.com/beego/beego/v2 v2.0.7
+	github.com/go-sql-driver/mysql v1.7.0
+	github.com/qiniu/go-sdk/v7 v7.14.0
+	github.com/satori/go.uuid v1.2.0
+	github.com/signintech/gopdf v0.15.1
+	github.com/xuri/excelize/v2 v2.7.0
 )
 
 require (
-	github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.2 // indirect
-	github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect
-	github.com/alibabacloud-go/endpoint-util v1.1.0 // indirect
-	github.com/alibabacloud-go/openapi-util v0.0.10 // indirect
-	github.com/alibabacloud-go/tea-utils v1.4.3 // indirect
-	github.com/aliyun/credentials-go v1.1.2 // indirect
+	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/json-iterator/go v1.1.10 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // 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.5.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/phpdave11/gofpdi v1.0.11 // indirect
-	github.com/prometheus/procfs v0.1.3 // 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/richardlehane/mscfb v1.0.4 // indirect
-	github.com/richardlehane/msoleps v1.0.1 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/tjfoc/gmsm v1.3.2 // indirect
-	github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 // indirect
+	github.com/richardlehane/msoleps v1.0.3 // indirect
+	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
 	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
-	gopkg.in/ini.v1 v1.56.0 // indirect
-
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/text v0.6.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
 )

go.sum

@@ -1,46 +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/alibabacloud-go/alibabacloud-gateway-spi v0.0.2 h1:/c6fLTlYKFd44Bx36A/cNuKekFzMqEPRc0QCLOC2Nok=
-github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.2/go.mod h1:sCavSAvdzOjul4cEqeVtvlSaSScfNsTQ+46HwlTL1hc=
-github.com/alibabacloud-go/darabonba-openapi v0.1.11/go.mod h1:MPJMxv7HYrFm5m9uOZWkDYsAWyZztEgnBRfk9Fg0eIU=
-github.com/alibabacloud-go/darabonba-openapi v0.1.14 h1:3bQEoqeO0ZvSor1n5uqkb4TiFNAd8XMFYeGFll75L/c=
-github.com/alibabacloud-go/darabonba-openapi v0.1.14/go.mod h1:w4CosR7O/kapCtEEMBm3JsQqWBU/CnZ2o0pHorsTWDI=
-github.com/alibabacloud-go/darabonba-string v1.0.0/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA=
-github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 h1:NqugFkGxx1TXSh/pBcU00Y6bljgDPaFdh5MUSeJ7e50=
-github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6pb/Qy8c+lqua8cFpEy7g39NRRqOWc3rOwAy8m5Y2BY=
-github.com/alibabacloud-go/dysmsapi-20170525/v2 v2.0.8 h1:KXMiCg99Jx7B6V+DlRFbWwL9UCGippE5z1wGzhyimiA=
-github.com/alibabacloud-go/dysmsapi-20170525/v2 v2.0.8/go.mod h1:8aL6tSyQIWJygF7W/Vqxdf/QDbN2S+u57k36bEA8hD8=
-github.com/alibabacloud-go/dyvmsapi-20170525/v2 v2.1.1 h1:H/7br9z1bxF93mKo8YSbg4+KYWhPp/ht2BNgWA7zfBo=
-github.com/alibabacloud-go/dyvmsapi-20170525/v2 v2.1.1/go.mod h1:P+OKazJXlBImmn2gF0QF2qeb88rUqhfYF9NYG6FUQXw=
-github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgTSHBbVfZlzf6b5Q=
-github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE=
-github.com/alibabacloud-go/openapi-util v0.0.9/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
-github.com/alibabacloud-go/openapi-util v0.0.10 h1:wzTQc6ZSHhCI1FybUITHE26451zLgQAmYdTaMOUmoqE=
-github.com/alibabacloud-go/openapi-util v0.0.10/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
-github.com/alibabacloud-go/tea v1.1.0/go.mod h1:IkGyUSX4Ba1V+k4pCtJUc6jDpZLFph9QMy2VUPTwukg=
-github.com/alibabacloud-go/tea v1.1.7/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
-github.com/alibabacloud-go/tea v1.1.8/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
-github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
-github.com/alibabacloud-go/tea v1.1.15/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
-github.com/alibabacloud-go/tea v1.1.17 h1:05R5DnaJXe9sCNIe8KUgWHC/z6w/VZIwczgUwzRnul8=
-github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
-github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE=
-github.com/alibabacloud-go/tea-utils v1.3.9/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE=
-github.com/alibabacloud-go/tea-utils v1.4.3 h1:8SzwmmRrOnQ09Hf5a9GyfJc0d7Sjv6fmsZoF4UDbFjo=
-github.com/alibabacloud-go/tea-utils v1.4.3/go.mod h1:KNcT0oXlZZxOXINnZBs6YvgOd5aYp9U67G+E3R8fcQw=
+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/aliyun/credentials-go v1.1.2 h1:qU1vwGIBb3UJ8BwunHDRFtAhS6jnQLnde/yk0+Ih2GY=
-github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw=
 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=
@@ -50,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=
@@ -68,16 +73,25 @@ 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=
@@ -85,54 +99,86 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
-github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-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 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+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/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=
@@ -144,33 +190,29 @@ 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/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 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/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
-github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+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 h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 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 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 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/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 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/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.11 h1:wsBNx+3S0wy1dEp6fzv281S74ogZGgIdYWV2PugWgho=
 github.com/phpdave11/gofpdi v1.0.11/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
@@ -183,28 +225,40 @@ 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.11.1 h1:/LZ9rvFS4p6SnszhGv11FNB1+n4OZvBCwFg7opH5Ovs=
-github.com/qiniu/go-sdk/v7 v7.11.1/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w=
+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/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
-github.com/richardlehane/msoleps v1.0.1 h1:RfrALnSNXzmXLbGct/P2b4xkFz4e8Gmj/0Vj9M9xC1o=
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN0AQoVM=
+github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 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=
@@ -217,170 +271,322 @@ 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.12.0 h1:WxwRsrSqU1j3HAlafDYz4jSvLNUGDd6DAb9IrWbTc3U=
-github.com/signintech/gopdf v0.12.0/go.mod h1:a+E8HlIuBwghPyoo7UaoB5UaL7zklDzmYVIAHoW/Rlw=
+github.com/signintech/gopdf v0.15.1 h1:8lFdW+UX0oUkrADJv5HmhyhRP9YzMvJzkw7iSNX/35U=
+github.com/signintech/gopdf v0.15.1/go.mod h1:a+E8HlIuBwghPyoo7UaoB5UaL7zklDzmYVIAHoW/Rlw=
 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/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.1.0 h1:MkTeG1DMwsrdH7QtLXy5W+fUxWq+vmb6cLmyJ7aRtF0=
-github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+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/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 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/tidwall/gjson v1.12.1 h1:ikuZsLdhr8Ws0IdROXUS1Gi4v9Z4pGqpX/CvJkxvfpo=
-github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM=
-github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
-github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 h1:3X7aE0iLKJ5j+tz58BpvIZkXNV7Yq4jC93Z/rbN2Fxk=
-github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/excelize/v2 v2.6.0 h1:m/aXAzSAqxgt74Nfd+sNzpzVKhTGl7+S9nbG4A57mF4=
-github.com/xuri/excelize/v2 v2.6.0/go.mod h1:Q1YetlHesXEKwGFfeJn7PfEZz2IvHb6wdOeYjBxVcVs=
+github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 h1:6932x8ltq1w4utjmfMPVj09jdMlkY0aiA6+Skbtl3/c=
+github.com/xuri/efp v0.0.0-20220603152613-6918739fd470/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.7.0 h1:Hri/czwyRCW6f6zrCDWXcXKshlq4xAZNpNOpdfnFhEw=
+github.com/xuri/excelize/v2 v2.7.0/go.mod h1:ebKlRoS+rGyLMyUx3ErBECXs/HNYqyj+PbkkKRK5vSI=
 github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Qsdt4+M5+ltca05dA5bG2M=
 github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
-github.com/yosssi/gmq v0.0.1 h1:GhlDVaAQoi3Mvjul/qJXXGfL4JBeE0GQwbWp3eIsja8=
-github.com/yosssi/gmq v0.0.1/go.mod h1:mReykazh0U1JabvuWh1PEbzzJftqOQWsjr0Lwg5jL1Y=
+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.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 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.0.0-20220408190544-5352b0902921 h1:iU7T1X1J6yxDr0rda54sWGkHgOp5XJrqm79gcNlC2VM=
-golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+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/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+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/image v0.0.0-20220902085622-e7cb96979f69 h1:Lj6HJGCSn5AjxRAH2+r35Mir4icalbqku+CLUtjnvXY=
+golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
 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.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 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 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-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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+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/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 h1:EN5+DfgmRMvRUrMGERW2gQl3Vc+Z7ZMnI/xdEpPSf0c=
-golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+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.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+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-20200317015054-43a5402ce75a/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-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
+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-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/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-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-20200509044756-6aff5f38e54f/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-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 h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
 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.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/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/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+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/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-20190328211700-ab21143f2384/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-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-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/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 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=
@@ -390,20 +596,27 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ini.v1 v1.56.0 h1:DPMeDvGTM54DXbPkVIZsp19fp/I2K7zwA/itHYHKo8Y=
-gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 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/Qiniu.go

@@ -4,9 +4,9 @@ package lib
 
 // 存储相关功能的引入包只有这两个，后面不再赘述
 import (
-	"bzd_server/conf"
-	"bzd_server/logs"
-	"bzd_server/models/System"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/logs"
+	"ColdVerify_server/models/System"
 	"context"
 	"github.com/qiniu/go-sdk/v7/auth/qbox"
 	"github.com/qiniu/go-sdk/v7/storage"
@@ -16,6 +16,7 @@ import (
 )
 
 var Qiniu *qbox.Mac
+
 //var (
 //	//BUCKET是你在存储空间的名称
 //	accessKey = "-8ezB_d-8-eUFTMvhOGbGzgeQRPeKQnaQ3DBcUxo"
@@ -25,6 +26,7 @@ var Qiniu *qbox.Mac
 func init() {
 	Qiniu = qbox.NewMac(conf.Qiniu_AccessKey, conf.Qiniu_SecretKey)
 }
+
 //if !lib.Pload_qiniu("ofile/"+timeStr+".xlsx","ofile/"+timeStr+".xlsx"){
 //c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
 //c.ServeJSON()
@@ -42,7 +44,6 @@ func Pload_qiniu(localFile string, name string) bool {
 		Name   string
 	}
 
-
 	//key := "your file save key"
 	// 使用 returnBody 自定义回复格式
 	putPolicy := storage.PutPolicy{
@@ -71,7 +72,7 @@ func Pload_qiniu(localFile string, name string) bool {
 
 func UploadToken(T_suffix string) string {
 	Tokey := strconv.FormatInt(time.Now().Unix(), 10) + uuid.NewV4().String()
-	if len(T_suffix) == 0{
+	if len(T_suffix) == 0 {
 		T_suffix = ".png"
 	}
 	putPolicy := storage.PutPolicy{
@@ -82,9 +83,9 @@ func UploadToken(T_suffix string) string {
 		//{"key":"github-x.png","hash":"FqKXVdTvIx_mPjOYdjDyUSy_H1jr","fsize":6091,"bucket":"if-pbl","name":"github logo"}
 		//{"key":"` + conf.Oss + `/$(key)","hash":"$(etag)","fsize":$(fsize),"bucket":"$(bucket)","name":"$(x:name)"}
 		ForceSaveKey: true,
-		SaveKey:      "UpImage/" + Tokey + "." +T_suffix,
+		SaveKey:      "UpImage/" + Tokey + "." + T_suffix,
 		//FsizeLimit:   1024 * 1024 * 1,
-		MimeLimit:    "image/*;application/pdf",
+		MimeLimit: "image/*;application/pdf",
 	}
 
 	upToken := putPolicy.UploadToken(Qiniu)

lib/lib.go

@@ -1,7 +1,7 @@
 package lib
 
 import (
-	"bzd_server/models/Account"
+	"ColdVerify_server/models/Account"
 	"encoding/json"
 	"fmt"
 	"github.com/signintech/gopdf"

logs/LogPrintln.go

@@ -12,7 +12,7 @@ var Test = true
 
 func init() {
 	logx = logs.NewLogger()
-	logx.SetLogger(logs.AdapterFile, `{"filename":"logs/Mqtt/Mqtt.log"}`)
+	logx.SetLogger(logs.AdapterFile, `{"filename":"logs/logx/logx.log"}`)
 
 	if runtime.GOOS == "windows" {
 		Test = true

models/Account/Admin.go

@@ -1,11 +1,10 @@
 package Account
 
 import (
-	"bzd_server/logs"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
-	"strconv"
 	"time"
 )
 
@@ -17,22 +16,21 @@ type Admin struct {
 	T_user  string `orm:"size(256);null"`      // 用户名
 	T_pass  string `orm:"size(256);null"`      // 密码
 
-	T_State    int       `orm:"size(200);;default(1)"`                                 //  0删除  1 正常
+	T_State    int       `orm:"size(200);default(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 Admin_ struct {
+type Admin_R struct {
 	T_uuid       string `orm:"column(t_uuid)"`
 	T_power      int    `orm:"column(t_power)"`      // 权限
 	T_power_name string `orm:"column(t_power_name)"` // 权限
 	T_name       string `orm:"column(t_name)"`       // 姓名
 	T_user       string `orm:"column(t_user)"`       // 用户名
-	T_pass       string `orm:"column(t_pass)"`       // 用户名
 }
 
 func (t *Admin) TableName() string {
-	return "Admin" // 数据库名称   // ************** 替换 FormulaList **************
+	return "admin" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -40,6 +38,14 @@ func init() {
 	orm.RegisterModel(new(Admin))
 
 }
+func AdminToAdmin_R(T Admin, powerMap map[int]string) (T_r Admin_R) {
+	T_r.T_uuid = T.T_uuid
+	T_r.T_power = T.T_power
+	T_r.T_name = T.T_name
+	T_r.T_user = T.T_user
+	T_r.T_power_name = powerMap[T.T_power]
+	return T_r
+}
 
 // 获取 ByT_user
 func Read_Admin_ByT_user(T_user string) (e error, r Admin) {
@@ -79,7 +85,7 @@ func Read_Admin_verification(T_user string, T_pass string) (error, Admin) {
 }
 
 // 获取列表
-func Read_Admin_List(T_name string, page int, page_z int) ([]Admin_, int) {
+func Read_Admin_List(T_name string, page int, page_z int, powerMap map[int]string) ([]Admin_R, int) {
 
 	o := orm.NewOrm()
 	var offset int
@@ -88,33 +94,21 @@ func Read_Admin_List(T_name string, page int, page_z int) ([]Admin_, int) {
 	} else {
 		offset = (page - 1) * page_z
 	}
-	var maps_z []orm2.ParamsList
-	var maps []Admin_
+	qs := o.QueryTable(new(Admin))
+	var r []Admin
+	cond := orm.NewCondition()
+	cond1 := cond.And("T_State", 1).AndCond(cond.Or("T_name__icontains", T_name).Or("T_user__icontains", T_name))
+	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
+	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
 
-	// 获取总条数
-	sql := "SELECT COUNT(ID) FROM Admin WHERE t__state=1"
-	if len(T_name) > 0 {
-		sql = sql + " AND t_name LIKE \"%" + T_name + "%\" OR t_user LIKE \"%" + T_name + "%\""
-	}
-	fmt.Println(sql)
-	_, err := o.Raw(sql).ValuesList(&maps_z)
-	if err != nil {
-		return maps, 0
-	}
-	if len(maps_z) == 0 {
-		return maps, 0
-	}
-	sql = "SELECT * FROM Admin a LEFT JOIN (SELECT id AS t_power,t_name AS t_power_name FROM UserPower WHERE t__state=1) p ON p.t_power=a.t_power WHERE t__state=1"
-	if len(T_name) > 0 {
-		sql = sql + " AND t_name LIKE \"%" + T_name + "%\" OR t_user LIKE \"%" + T_name + "%\""
+	// 转换
+	var Admin_r []Admin_R
+	for _, v := range r {
+		Admin_r = append(Admin_r, AdminToAdmin_R(v, powerMap))
 	}
 
-	sql = sql + " ORDER BY a.id DESC LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(page_z)
-	fmt.Println(sql)
-	_, err = o.Raw(sql).QueryRows(&maps)
+	return Admin_r, int(cnt)
 
-	cnt, _ := strconv.Atoi(maps_z[0][0].(string))
-	return maps, cnt
 }
 
 // 修改

models/Account/Power.go

@@ -1,7 +1,7 @@
 package Account
 
 import (
-	"bzd_server/conf"
+	"ColdVerify_server/conf"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	"time"
@@ -14,13 +14,13 @@ type UserPower struct {
 	Logs_Sys_r  int `orm:"size(2);;default(0)"` //  系统日志
 	Logs_User_r int `orm:"size(2);;default(0)"` //  用户日志
 
-	T_State    int       `orm:"size(200);;default(1)"`                                 //  0删除  1 正常
+	T_State    int       `orm:"size(200);default(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 第一次保存时才设置时间
 }
 
 func (t *UserPower) TableName() string {
-	return "UserPower" // 数据库名称   // ************** 替换 FormulaList **************
+	return "user_power" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -77,12 +77,12 @@ func Read_Power_List_ALL_1() (maps []UserPower) {
 }
 
 // 获取列表
-func Read_Power_List_ALL_Power_Administration(Power_Administration int) (maps []UserPower) {
+func Read_Power_List_ALL_Admin_Power(T_power int) (maps []UserPower) {
 
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(UserPower))
 
-	qs.Filter("T_State", 1).OrderBy("Id").All(&maps)
+	qs.Filter("T_State", 1).Filter("Id__gte", T_power).OrderBy("Id").All(&maps)
 
 	return maps
 }

models/Account/Tokey.go

@@ -1,7 +1,7 @@
 package Account
 
 import (
-	"bzd_server/conf"
+	"ColdVerify_server/conf"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"

models/Account/User.go

@@ -1,7 +1,7 @@
 package Account
 
 import (
-	"bzd_server/logs"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -17,24 +17,24 @@ type User struct {
 	T_name     string    `orm:"size(256);null"`                                        // 某某公司名称
 	T_user     string    `orm:"size(256);null"`                                        // 登录用户名
 	T_pass     string    `orm:"size(256);null"`                                        // 密码 MD5
-	T_passstr  string    `orm:"size(256);null"`                                        //  密码明文
-	T_Show     int       `orm:"size(200);default(1)"`                                  //  0隐藏  1公开
-	T_State    int       `orm:"size(200);default(1)"`                                  //  0删除  1正常
+	T_passstr  string    `orm:"size(256);null"`                                        // 密码明文
+	T_Show     int       `orm:"size(200);default(1)"`                                  // 0隐藏  1公开
+	T_State    int       `orm:"size(200);default(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 User_R struct {
-	T_uuid    string `orm:"size(256);null"` //
-	T_power   int    `orm:"size(2);0"`      // 权限
-	T_name    string `orm:"size(256);null"` //  某某公司名称
-	T_user    string `orm:"size(256);null"` // 登录用户名
-	T_passstr string `orm:"size(256);null"` //  密码明文
-	T_Show    int    `orm:"size(200);1"`    //  0  1
-	T_State   int    `orm:"size(200);1"`    //  0  1
+	T_uuid    string //
+	T_power   int    // 权限
+	T_name    string // 某某公司名称
+	T_user    string // 登录用户名
+	T_passstr string // 密码明文
+	T_Show    int    //  0  1
+	T_State   int    //  0  1
 }
 
 func (t *User) TableName() string {
-	return "User" // 数据库名称   // ************** 替换 FormulaList **************
+	return "user" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {

models/Certificate/Certificate.go

@@ -1,7 +1,7 @@
 package Certificate
 
 import (
-	"bzd_server/logs"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -14,7 +14,7 @@ type Certificate struct {
 	Id   int    `orm:"column(ID);size(11);auto;pk"`
 	T_sn string `orm:"size(256);null"` // 证书编号
 
-	T_State    int       `orm:"size(200);;default(1)"`                                 //  0删除  1 正常
+	T_State    int       `orm:"size(200);default(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 第一次保存时才设置时间
 }
@@ -23,7 +23,7 @@ type Certificate_R struct {
 }
 
 func (t *Certificate) TableName() string {
-	return "Certificate" // 数据库名称   // ************** 替换 FormulaList **************
+	return "certificate" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -111,7 +111,7 @@ func Update_Certificate(m Certificate, cols ...string) bool {
 }
 
 type Certificate_ struct {
-	Id             int
+	Id             int    `orm:"column(ID)"`
 	T_sn           string // 编号
 	T_release_time string `orm:"column(t_release_time)"` // 发布时间
 	T_failure_time string `orm:"column(t_failure_time)"` // 失效时间
@@ -133,7 +133,7 @@ func Read_Certificate_List(T_sn, Time_start, Time_end string, page int, page_z i
 	var maps []Certificate_
 
 	// 获取总条数
-	sql := "SELECT COUNT(ID) FROM Certificate WHERE t__state=1"
+	sql := "SELECT COUNT(ID) FROM certificate WHERE t__state=1"
 	if len(T_sn) > 0 {
 		sql = sql + " AND t_sn like \"%" + T_sn + "%\""
 	}
@@ -145,7 +145,9 @@ func Read_Certificate_List(T_sn, Time_start, Time_end string, page int, page_z i
 	if len(maps_z) == 0 {
 		return maps, 0
 	}
-	sql = "SELECT * FROM Certificate AS c LEFT JOIN (SELECT any_value(t_release_time) t_release_time,any_value(t_failure_time) t_failure_time,any_value(t_pdf) t_pdf,t__certificate_sn FROM (SELECT DISTINCT * FROM `CertificatePdf` WHERE t__state=1 ORDER BY id DESC) f GROUP BY t__certificate_sn) AS pdf ON pdf.t__certificate_sn=c.t_sn WHERE t__state=1"
+	//sql = "SELECT * FROM Certificate AS c LEFT JOIN (SELECT any_value(t_release_time) t_release_time,any_value(t_failure_time) t_failure_time,any_value(t_pdf) t_pdf,t__certificate_sn FROM (SELECT DISTINCT * FROM `CertificatePdf` WHERE t__state=1 ORDER BY id DESC) f GROUP BY t__certificate_sn) AS pdf ON pdf.t__certificate_sn=c.t_sn WHERE t__state=1"
+	sql = "SELECT * FROM certificate AS c LEFT JOIN (SELECT t_release_time,t_failure_time,t_pdf,t__certificate_sn FROM (SELECT DISTINCT * FROM `certificate_pdf` WHERE t__state=1 ORDER BY id DESC) f GROUP BY t__certificate_sn) AS pdf ON pdf.t__certificate_sn=c.t_sn WHERE t__state=1"
+
 	if len(T_sn) > 0 {
 		sql = sql + " AND t_sn like \"%" + T_sn + "%\""
 	}

models/Certificate/CertificatePdf.go

@@ -1,12 +1,11 @@
 package Certificate
 
 import (
-	"bzd_server/logs"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
-	"strings"
 	"time"
 )
 
@@ -17,7 +16,7 @@ type CertificatePdf struct {
 	T_failure_time   string `orm:"column(t_failure_time);type(timestamp);null;"` // 失效时间
 	T_pdf            string `orm:"size(256);null"`                               // pdf链接
 
-	T_State    int       `orm:"size(200);;default(1)"`                                 //  0删除  1 正常
+	T_State    int       `orm:"size(200);default(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 第一次保存时才设置时间
 }
@@ -30,7 +29,7 @@ type CertificatePdf_R struct {
 }
 
 func (t *CertificatePdf) TableName() string {
-	return "CertificatePdf" // 数据库名称   // ************** 替换 FormulaList **************
+	return "certificate_pdf" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -64,16 +63,12 @@ func Read_CertificatePdf_ById(id int) (r CertificatePdf, is bool) {
 }
 
 // 获取 By
-func Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time string) (r CertificatePdf, is bool) {
+func Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time string) (r CertificatePdf, err error) {
 
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(CertificatePdf))
-	err := qs.Filter("T_Certificate_sn", T_Certificate_sn).Filter("T_release_time", T_release_time).Filter("T_failure_time", T_failure_time).Filter("T_State", 1).One(&r)
-	if err != nil && !strings.Contains(err.Error(), "no row found") {
-		return r, false
-	}
-
-	return r, true
+	err = qs.Filter("T_Certificate_sn", T_Certificate_sn).Filter("T_release_time", T_release_time).Filter("T_failure_time", T_failure_time).Filter("T_State", 1).One(&r)
+	return r, err
 }
 
 // 添加

models/Device/Device.go

@@ -1,8 +1,8 @@
 package Device
 
 import (
-	"bzd_server/conf"
-	"bzd_server/logs"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/logs"
 	orm2 "github.com/beego/beego/v2/client/orm"
 
 	"encoding/json"
@@ -42,7 +42,7 @@ type Device struct {
 }
 
 func (t *Device) TableName() string {
-	return "Device" // 数据库名称   // ************** 替换 FormulaList **************
+	return "device" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 var redisCache_Device cache.Cache

models/Device/DeviceClass.go

@@ -1,8 +1,8 @@
 package Device
 
 import (
-	"bzd_server/conf"
-	"bzd_server/logs"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
@@ -11,11 +11,12 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"time"
 )
+
 // 模板
 type DeviceClass struct {
-	Id int `orm:"column(ID);size(11);auto;pk"`
-	T_uuid  string `orm:"size(256);null"`  // 管理员 UUID
-	T_name  string `orm:"size(256);null"`  // 标题
+	Id     int    `orm:"column(ID);size(11);auto;pk"`
+	T_uuid string `orm:"size(256);null"` // 管理员 UUID
+	T_name string `orm:"size(256);null"` // 标题
 
 	T_State    int       `orm:"size(2);1"`                                             // 0 删除   1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
@@ -23,7 +24,7 @@ type DeviceClass struct {
 }
 
 func (t *DeviceClass) TableName() string {
-	return "DeviceClass" // 数据库名称   // ************** 替换 FormulaList **************
+	return "device_class" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 var redisCache_DeviceClass cache.Cache
@@ -97,7 +98,6 @@ func Read_DeviceClass_ById(id int) (r DeviceClass, is bool) {
 func Add_DeviceClass(r DeviceClass) (id int64, is bool) {
 	o := orm.NewOrm()
 
-
 	id, err := o.Insert(&r)
 	if err != nil {
 		logs.Println(err)
@@ -129,12 +129,11 @@ func Delete_DeviceClass_(v DeviceClass) bool {
 		return false
 	}
 
-
 	return true
 }
 
 // 修改
-func Update_DeviceClass(m DeviceClass,cols ...string) bool {
+func Update_DeviceClass(m DeviceClass, cols ...string) bool {
 	o := orm.NewOrm()
 	if num, err := o.Update(&m, cols...); err == nil {
 		fmt.Println("Number of records updated in database:", num)
@@ -145,7 +144,7 @@ func Update_DeviceClass(m DeviceClass,cols ...string) bool {
 }
 
 // 获取列表
-func Read_DeviceClass_List(T_uuid string, T_name string,  page int, page_z int) (r []DeviceClass, cnt int64) {
+func Read_DeviceClass_List(T_uuid string, T_name string, page int, page_z int) (r []DeviceClass, cnt int64) {
 
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
@@ -164,8 +163,3 @@ func Read_DeviceClass_List(T_uuid string, T_name string,  page int, page_z int)
 	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	return r, cnt
 }
-
-
-
-
-

models/Device/DeviceClassList.go

@@ -1,8 +1,8 @@
 package Device
 
 import (
-	"bzd_server/conf"
-	"bzd_server/logs"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/logs"
 	orm2 "github.com/beego/beego/v2/client/orm"
 
 	"encoding/json"
@@ -29,7 +29,7 @@ type DeviceClassList struct {
 }
 
 func (t *DeviceClassList) TableName() string {
-	return "DeviceClassList" // 数据库名称   // ************** 替换 FormulaList **************
+	return "device_class_list" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 var redisCache_DeviceClassList cache.Cache

models/Device/DeviceData.go

@@ -1,8 +1,8 @@
 package Device
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
 
 	"encoding/json"
 	"fmt"
@@ -29,7 +29,7 @@ type DeviceData struct {
 }
 
 func (t *DeviceData) TableName() string {
-	return "DeviceData" // 数据库名称   // ************** 替换 FormulaList **************
+	return "device_data" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 var redisCache_DeviceData cache.Cache
@@ -87,8 +87,7 @@ func RedisDeviceData_Get(key string) (r DeviceData_New, is bool) {
 func CREATE_DeviceData(SN string) bool {
 	o := orm.NewOrm()
 
-
-	sql := "CREATE TABLE IF NOT EXISTS `Z_DeviceData_" + SN + "` ( " +
+	sql := "CREATE TABLE IF NOT EXISTS `z_device_data_" + SN + "` ( " +
 		"  `ID` int(11) NOT NULL AUTO_INCREMENT," +
 		"	`t_id` int(11) NULL DEFAULT NULL," +
 		"	`t_t` float(6, 1) NULL DEFAULT NULL," +
@@ -127,7 +126,7 @@ func CREATE_DeviceData(SN string) bool {
 //	//  查看是否 有记录
 //	var maps_z []orm2.ParamsList
 //
-//	sql := "SELECT COUNT(ID) FROM Z_DeviceData_" + SN + " WHERE t_time = '" + t_time + "' AND t_id = " + t_id
+//	sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " WHERE t_time = '" + t_time + "' AND t_id = " + t_id
 //	//fmt.Println(sql)
 //	_, err := o.Raw(sql).ValuesList(&maps_z)
 //
@@ -142,7 +141,7 @@ func CREATE_DeviceData(SN string) bool {
 //		return true
 //	}
 //	// 开始插入数据
-//	sql = "INSERT INTO Z_DeviceData_" + SN + " (`t_id`, `t_t`, `t_rh`, `t_time`) VALUES (" + t_id + ", " + t_t + ", " + t_rh + ", '" + t_time + "')"
+//	sql = "INSERT INTO z_device_data_" + SN + " (`t_id`, `t_t`, `t_rh`, `t_time`) VALUES (" + t_id + ", " + t_t + ", " + t_rh + ", '" + t_time + "')"
 //	//  这里有时间优化  用于一次 prepare 多次 exec，以提高批量执行的速度
 //	//fmt.Println(sql)
 //	res, err := o.Raw(sql).Exec()
@@ -158,16 +157,16 @@ func CREATE_DeviceData(SN string) bool {
 //}
 
 type DeviceData_ struct {
-	T_id      int     `orm:"column(t_id);size(10);null"`           // ID
-	T_t       float32 `orm:"column(t_t);size(10);null"`            // 温度
-	T_rh      float32 `orm:"column(t_rh);size(10);null"`           // 湿度
-	T_time    string  `orm:"column(t_time);type(timestamp);null;"` // 采集时间
+	T_id   int     `orm:"column(t_id);size(10);null"`           // ID
+	T_t    float32 `orm:"column(t_t);size(10);null"`            // 温度
+	T_rh   float32 `orm:"column(t_rh);size(10);null"`           // 湿度
+	T_time string  `orm:"column(t_time);type(timestamp);null;"` // 采集时间
 }
 type DeviceData_New struct {
-	T_id      int       `orm:"column(t_id);size(10);null"`           // ID
-	T_t       float32   `orm:"column(t_t);size(10);null"`            // 温度
-	T_rh      float32   `orm:"column(t_rh);size(10);null"`           // 湿度
-	T_time    time.Time `orm:"column(t_time);type(timestamp);null;"` // 采集时间
+	T_id   int       `orm:"column(t_id);size(10);null"`           // ID
+	T_t    float32   `orm:"column(t_t);size(10);null"`            // 温度
+	T_rh   float32   `orm:"column(t_rh);size(10);null"`           // 湿度
+	T_time time.Time `orm:"column(t_time);type(timestamp);null;"` // 采集时间
 }
 
 //
@@ -195,7 +194,7 @@ func Read_DeviceSensorData_ById_List(SN string, T_id int, Time_start_ string, Ti
 		sql_time += " t_time <= '" + Time_end_ + "' AND "
 	}
 
-	sql := "SELECT COUNT(ID) FROM Z_DeviceData_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id)
+	sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id)
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
@@ -205,7 +204,7 @@ func Read_DeviceSensorData_ById_List(SN string, T_id int, Time_start_ string, Ti
 		return maps, 0
 	}
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql = "SELECT t_name,t_id,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM Z_DeviceData_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
+	sql = "SELECT t_name,t_id,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_device_data_" + SN + " WHERE " + sql_time + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
 	if page_z != 9999 {
 		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
 	}
@@ -233,7 +232,6 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
 		offset = page * pagez
 	}
 
-
 	sql_time := ""
 
 	if len(Time_start_) > 1 && len(Time_end_) > 1 {
@@ -242,7 +240,7 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
 		sql_time += " t_time <= '" + Time_end_ + "' "
 	}
 
-	sql := "SELECT COUNT(ID) FROM Z_DeviceData_" + SN + " " + sql_time
+	sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " " + sql_time
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
@@ -252,7 +250,7 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
 		return maps, 0
 	}
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql = "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM Z_DeviceData_" + SN + " " + sql_time + " ORDER BY t_time DESC "
+	sql = "SELECT t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_device_data_" + SN + " " + sql_time + " ORDER BY t_time DESC "
 	if page_z != 9999 {
 		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
 	}
@@ -266,7 +264,7 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
 }
 
 //
-func Read_DeviceSensorData_List_z(SN string, Time_start_ string) ( int) {
+func Read_DeviceSensorData_List_z(SN string, Time_start_ string) int {
 	o := orm.NewOrm()
 	var maps_z []orm2.ParamsList
 
@@ -277,13 +275,13 @@ func Read_DeviceSensorData_List_z(SN string, Time_start_ string) ( int) {
 		//sql_time += " t_time <= '" + Time_end_ + "' AND "
 	}
 
-	sql := "SELECT COUNT(ID) FROM Z_DeviceData_" + SN + " " + sql_time
+	sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " " + sql_time
 	fmt.Println(sql)
 	o.Raw(sql).ValuesList(&maps_z)
 
 	//value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", cnt), 64)
 	key, _ := strconv.Atoi(maps_z[0][0].(string))
-	return  key
+	return key
 }
 
 // 获取最新数据
@@ -299,7 +297,7 @@ func Read_DeviceSensorData_ById_New(SN string, T_id int) (DeviceData_New, bool)
 	}
 
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql := "SELECT t_id,t_t,t_rh,t_time  FROM Z_DeviceData_" + SN + " WHERE " + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
+	sql := "SELECT t_id,t_t,t_rh,t_time  FROM z_device_data_" + SN + " WHERE " + " t_id = " + strconv.Itoa(T_id) + " ORDER BY t_time DESC "
 	sql = sql + " LIMIT 0,1 "
 
 	fmt.Println(sql)
@@ -355,8 +353,8 @@ func Read_DeviceData_ById_Year_List(SN string) []orm2.ParamsList {
 
 	var maps_z []orm2.ParamsList
 
-	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM Z_DeviceData_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
-	sql := "SELECT DATE_FORMAT(t_time,\"%m\") AS m ,DATE_FORMAT(t_time,\"%d\") AS d FROM Z_DeviceData_" + SN + "  WHERE t_time > '" + strconv.Itoa(time.Now().Year()) + "-0-0 00:00:00' GROUP BY DATE_FORMAT(t_time,\"%m\");"
+	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_device_data_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
+	sql := "SELECT DATE_FORMAT(t_time,\"%m\") AS m ,DATE_FORMAT(t_time,\"%d\") AS d FROM z_device_data_" + SN + "  WHERE t_time > '" + strconv.Itoa(time.Now().Year()) + "-0-0 00:00:00' GROUP BY DATE_FORMAT(t_time,\"%m\");"
 	fmt.Println(sql)
 	num, err := o.Raw(sql).ValuesList(&maps_z)
 	if err == nil && num > 0 {
@@ -374,8 +372,8 @@ func Read_DeviceData_ById_Month_List(SN string) []orm2.ParamsList {
 
 	time_x := currentTime.Format("2006-01") + "-00 00:00:00"
 
-	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM Z_DeviceData_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
-	sql := "SELECT DATE_FORMAT(t_time,\"%d\") AS d FROM Z_DeviceData_" + SN + "  WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%d\");"
+	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_device_data_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
+	sql := "SELECT DATE_FORMAT(t_time,\"%d\") AS d FROM z_device_data_" + SN + "  WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%d\");"
 	fmt.Println(sql)
 	o.Raw(sql).ValuesList(&maps_z)
 
@@ -391,8 +389,8 @@ func Read_DeviceSensorData_ById_Day_List(SN string) []orm2.ParamsList {
 
 	time_x := currentTime.Format("2006-01-02") + " 00:00:00"
 
-	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM Z_DeviceData_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
-	sql := "SELECT DATE_FORMAT(t_time,\"%H\") AS m FROM Z_DeviceData_" + SN + "  WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%H\");"
+	//sql = "SELECT t_name,t_t,t_rh,t_tl,t_tu,t_rhl,t_rhu,t_site,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time  FROM z_device_data_"+SN+" WHERE "+sql_time+" t_id = "+ strconv.Itoa(T_id) +" ORDER BY t_time DESC "
+	sql := "SELECT DATE_FORMAT(t_time,\"%H\") AS m FROM z_device_data_" + SN + "  WHERE t_time > '" + time_x + "' GROUP BY DATE_FORMAT(t_time,\"%H\");"
 	fmt.Println(sql)
 	o.Raw(sql).ValuesList(&maps_z)
 
@@ -411,7 +409,7 @@ func Read_DeviceSensorData_List_GROUP_BY_t_time(SN string, Time_start_ string, T
 		sql_time += " t_time >= '" + Time_start_ + "' AND " + " t_time <= '" + Time_end_ + "' "
 	}
 
-	sql := "SELECT DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM Z_DeviceData_" + SN + " WHERE " + sql_time + "   GROUP BY t_time  ORDER BY t_time DESC "
+	sql := "SELECT DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_time FROM z_device_data_" + SN + " WHERE " + sql_time + "   GROUP BY t_time  ORDER BY t_time DESC "
 	fmt.Println(sql)
 	o.Raw(sql).ValuesList(&maps_z)
 	return maps_z

models/System/Logs.go

@@ -21,7 +21,7 @@ type L_JSON struct {
 }
 
 func (t *Logs) TableName() string {
-	return "Logs" // 数据库名称   // ************** 替换 FormulaList **************
+	return "logs" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {

models/System/News.go

@@ -7,17 +7,17 @@ import (
 )
 
 type News struct {
-	Id         int    `orm:"column(ID);size(11);auto;pk"`
-	Admin_uuid string `orm:"size(256);null"` //
-	News_Title string `orm:"size(256);null"` // 标题
-	News_Url string `orm:"size(256);null"` // 地址
-	News_Tag int    `orm:"size(2);null"`  //  标记 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 第一次保存时才设置时间
+	Id         int       `orm:"column(ID);size(11);auto;pk"`
+	Admin_uuid string    `orm:"size(256);null"`                                        //
+	News_Title string    `orm:"size(256);null"`                                        // 标题
+	News_Url   string    `orm:"size(256);null"`                                        // 地址
+	News_Tag   int       `orm:"size(2);null"`                                          //  标记 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 第一次保存时才设置时间
 }
 
 func (t *News) TableName() string {
-	return "News" // 数据库名称   // ************** 替换 FormulaList **************
+	return "news" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -25,11 +25,12 @@ func init() {
 	orm.RegisterModel(new(News))
 
 }
+
 // 获取 ById
 func Read_AdminNews_all_1(Admin_uuid string) (r []News) {
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(News))
-	qs.Filter("Admin_uuid",Admin_uuid).Filter("News_Tag",1).All(&r)
+	qs.Filter("Admin_uuid", Admin_uuid).Filter("News_Tag", 1).All(&r)
 	return r
 }
 
@@ -38,7 +39,7 @@ func Update_AdminNews_News_Tag_2(Id int) (err error) {
 	o := orm.NewOrm()
 	v := News{Id: Id}
 
-	if err = o.Read(&v,"Id","Admin_uuid"); err == nil {
+	if err = o.Read(&v, "Id", "Admin_uuid"); err == nil {
 		var num int64
 		v.News_Tag = 2
 		if num, err = o.Update(&v, "News_Tag"); err == nil {
@@ -48,5 +49,3 @@ func Update_AdminNews_News_Tag_2(Id int) (err error) {
 
 	return
 }
-
-

models/System/UserLogs.go

@@ -20,7 +20,7 @@ type UserLogs struct {
 }
 
 func (t *UserLogs) TableName() string {
-	return "UserLogs" // 数据库名称   // ************** 替换 FormulaList **************
+	return "user_logs" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {

models/Task/Task.go

@@ -1,9 +1,9 @@
 package Task
 
 import (
-	"bzd_server/conf"
-	"bzd_server/lib"
-	"bzd_server/logs"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
@@ -56,8 +56,8 @@ type Task_R struct {
 	T_Show     int    // 公开/隐藏
 	T_Visit    int    // 浏览量
 	T_State    int    // 0    1
-	CreateTime time.Time
-	UpdateTime time.Time
+	CreateTime string
+	UpdateTime string
 }
 
 type Task_ struct {
@@ -68,12 +68,15 @@ type Task_ struct {
 	T_name              string // 标题
 	T_VerifyTemplate_id string // 任务模板id
 	T_deadline          string // 截止时间
+	T_scheme            string // 实施方案 负责人UUID
 	T_collection        string // 数据采集 负责人UUID
 	T_reporting         string // 报告编写 负责人UUID
 	T_delivery          string // 交付审核 负责人UUID
+	T_scheme_state      int    // 实施方案 状态 0 未完成 1 已完成
 	T_collection_state  int    // 数据采集 状态 0 未完成 1 已完成
 	T_reporting_state   int    // 报告编写 状态 0 未完成 1 已完成
 	T_delivery_state    int    // 交付审核 状态 0 未完成 1 已完成
+	T_scheme_name       string // 实施方案 负责人姓名
 	T_collection_name   string // 数据采集 负责人姓名
 	T_reporting_name    string // 报告编写 负责人姓名
 	T_delivery_name     string // 交付审核 负责人姓名
@@ -89,7 +92,7 @@ type Task_ struct {
 }
 
 func (t *Task) TableName() string {
-	return "Task" // 数据库名称   // ************** 替换 FormulaList **************
+	return "task" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 var redisCache_Task cache.Cache
@@ -123,8 +126,8 @@ func TaskToTask_R(T Task) (T_r Task_R) {
 	T_r.T_Show = T.T_Show
 	T_r.T_State = T.T_State
 	T_r.T_Visit = T.T_Visit
-	T_r.UpdateTime = T.UpdateTime
-	T_r.CreateTime = T.CreateTime
+	T_r.UpdateTime = T.UpdateTime.Format("2006-01-02 15:04:05")
+	T_r.CreateTime = T.CreateTime.Format("2006-01-02 15:04:05")
 
 	//......
 	return T_r
@@ -138,12 +141,15 @@ func TaskToTask_(T Task, userMap, adminMap map[string]string) (T_ Task_) {
 	T_.T_name = T.T_name
 	T_.T_VerifyTemplate_id = T.T_VerifyTemplate_id
 	T_.T_deadline = T.T_deadline
+	T_.T_scheme = T.T_scheme
 	T_.T_collection = T.T_collection
 	T_.T_reporting = T.T_reporting
 	T_.T_delivery = T.T_delivery
+	T_.T_scheme_state = T.T_scheme_state
 	T_.T_collection_state = T.T_collection_state
 	T_.T_reporting_state = T.T_reporting_state
 	T_.T_delivery_state = T.T_delivery_state
+	T_.T_scheme_name = adminMap[T.T_scheme]
 	T_.T_collection_name = adminMap[T.T_collection]
 	T_.T_reporting_name = adminMap[T.T_reporting]
 	T_.T_delivery_name = adminMap[T.T_delivery]
@@ -234,8 +240,8 @@ func Add_Task(r Task) (string, bool) {
 	// 生成编号
 	rand_x := 0
 	for true {
-		r.T_task_id = lib.GetRandstring(12, "", int64(rand_x)) // 1,336,336
-		err := o.Read(&r, "T_task_id")                         // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
+		r.T_task_id = lib.GetRandstring(12, "abcdefghijklmnopqrstuvwxyz0123456789", int64(rand_x)) // 1,336,336
+		err := o.Read(&r, "T_task_id")                                                             // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 		if err != nil {
 			break
 		}

models/Task/TaskData.go

@@ -1,7 +1,7 @@
 package Task
 
 import (
-	"bzd_server/logs"
+	"ColdVerify_server/logs"
 	"fmt"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
@@ -24,7 +24,7 @@ type TaskData struct {
 }
 
 func (t *TaskData) TableName() string {
-	return "TaskData" // 数据库名称   // ************** 替换 FormulaList **************
+	return "task_data" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -35,10 +35,10 @@ func init() {
 func CREATE_TaskData(T_task_id string) bool {
 	o := orm.NewOrm()
 
-	sql := "DROP TABLE `Z_TaskData_" + T_task_id + "`"
+	sql := "DROP TABLE `z_task_data_" + T_task_id + "`"
 	o.Raw(sql).Exec()
 
-	sql = "CREATE TABLE IF NOT EXISTS `Z_TaskData_" + T_task_id + "` ( " +
+	sql = "CREATE TABLE IF NOT EXISTS `z_task_data_" + T_task_id + "` ( " +
 		"  `ID` int(11) NOT NULL AUTO_INCREMENT," +
 		"	`t_sn` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL," +
 		"	`t_id` int(11) NULL DEFAULT NULL," +
@@ -67,7 +67,7 @@ func Truncate_TaskData(T_task_id string) bool {
 
 	o := orm.NewOrm()
 
-	sql := "truncate table Z_TaskData_" + T_task_id
+	sql := "truncate table z_task_data_" + T_task_id
 	logs.Println(sql)
 	o.Raw(sql).Exec()
 
@@ -82,7 +82,7 @@ func Import_TaskData(Sn string, T_id int, T_task_id string, Time_start string, T
 	o := orm.NewOrm()
 
 	// 开始插入数据
-	sql := "insert into Z_TaskData_" + T_task_id + "(t_id,t_t,t_rh,t_time) select t_id,t_t,t_rh,t_time from Z_DeviceData_" + Sn
+	sql := "insert into z_task_data_" + T_task_id + "(t_id,t_t,t_rh,t_time) select t_id,t_t,t_rh,t_time from z_device_data_" + Sn
 	sql = sql + " WHERE t_time >= '" + Time_start + "' AND t_time <= '" + Time_end + "'"
 	//  这里有时间优化  用于一次 prepare 多次 exec，以提高批量执行的速度
 	logs.Println(sql)
@@ -93,9 +93,9 @@ func Import_TaskData(Sn string, T_id int, T_task_id string, Time_start string, T
 	}
 
 	// 强行替换  ID
-	sql = "UPDATE Z_TaskData_" + T_task_id + " SET `t_sn` = '" + Sn + "',`t_id` = " + strconv.Itoa(T_id) + " WHERE `t_sn` IS NULL"
+	sql = "UPDATE z_task_data_" + T_task_id + " SET `t_sn` = '" + Sn + "',`t_id` = " + strconv.Itoa(T_id) + " WHERE `t_sn` IS NULL"
 	// 设备 ID
-	//sql = "UPDATE Z_TaskData_"+T_task_id+" SET `t_sn` = '"+Sn+"' WHERE `t_sn` IS NULL"
+	//sql = "UPDATE z_task_data_"+T_task_id+" SET `t_sn` = '"+Sn+"' WHERE `t_sn` IS NULL"
 	logs.Println(sql)
 	o.Raw(sql).Exec()
 
@@ -147,7 +147,7 @@ func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_
 		sql_condition += " AND t_sn = '" + SN + "'"
 	}
 
-	sql := "SELECT COUNT(ID) FROM Z_TaskData_" + T_task_id + " WHERE 1=1" + sql_condition
+	sql := "SELECT COUNT(ID) FROM z_task_data_" + T_task_id + " WHERE 1=1" + sql_condition
 
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
@@ -159,7 +159,7 @@ func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_
 	}
 
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql = "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_times,t_time FROM Z_TaskData_" + T_task_id + " WHERE 1=1" + sql_condition + " ORDER BY t_time DESC "
+	sql = "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_times,t_time FROM z_task_data_" + T_task_id + " WHERE 1=1" + sql_condition + " ORDER BY t_time DESC "
 	if page_z != 9999 {
 		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
 	}
@@ -183,7 +183,7 @@ func Read_TaskData_ById_List_(T_task_id string, SN string, T_id int) []TaskData_
 	sql_condition += " t_sn LIKE '%" + SN + "%' "
 
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql := "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i') AS t_times,t_time  FROM Z_TaskData_" + T_task_id + " WHERE " + sql_condition + " ORDER BY t_time "
+	sql := "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i') AS t_times,t_time  FROM z_task_data_" + T_task_id + " WHERE " + sql_condition + " ORDER BY t_time "
 
 	fmt.Println(sql)
 	o.Raw(sql).QueryRows(&maps)
@@ -197,7 +197,7 @@ func Read_TaskData_ById_ClassList(T_task_id string) []TaskDataClass_ {
 	var maps []TaskDataClass_
 
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql := "SELECT DISTINCT t_sn,t_id FROM Z_TaskData_" + T_task_id + " ORDER BY t_id "
+	sql := "SELECT DISTINCT t_sn,t_id FROM z_task_data_" + T_task_id + " ORDER BY t_id "
 
 	fmt.Println(sql)
 	o.Raw(sql).QueryRows(&maps)
@@ -212,12 +212,12 @@ func Add_TaskData(T_task_id string, T_sn string, T_id string, T_t string, T_rh s
 
 	// 开始插入数据
 	//
-	//sql := "INSERT INTO Z_TaskData_" + T_task_id + " (`t_sn`, `t_id`, `t_time`) " +
+	//sql := "INSERT INTO z_task_data_" + T_task_id + " (`t_sn`, `t_id`, `t_time`) " +
 	//	"VALUES ('" + T_sn + "', " + T_id + ", '" + T_time + "') " +
 	//	"ON DUPLICATE KEY UPDATE t_t=" + T_t + ", t_rh="+ T_rh +";"
 
 	// 去重复数据
-	//sql := "DELETE FROM Z_TaskData_" + T_task_id + "  WHERE " + " t_id = " + T_id + " AND "+ " t_sn = '"+T_sn+"' " + "AND t_time = '" + T_time + "'  "
+	//sql := "DELETE FROM z_task_data_" + T_task_id + "  WHERE " + " t_id = " + T_id + " AND "+ " t_sn = '"+T_sn+"' " + "AND t_time = '" + T_time + "'  "
 	//
 	////  这里有时间优化  用于一次 prepare 多次 exec，以提高批量执行的速度
 	//fmt.Println(sql)
@@ -228,7 +228,7 @@ func Add_TaskData(T_task_id string, T_sn string, T_id string, T_t string, T_rh s
 	//}
 	//res.RowsAffected()
 
-	sql := "INSERT INTO Z_TaskData_" + T_task_id + " (`t_sn`, `t_id`, `t_t`, `t_rh`, `t_time`) " +
+	sql := "INSERT INTO z_task_data_" + T_task_id + " (`t_sn`, `t_id`, `t_t`, `t_rh`, `t_time`) " +
 		"VALUES ('" + T_sn + "', " + T_id + ", " + T_t + "," + T_rh + ", '" + T_time + "')"
 
 	fmt.Println(sql)
@@ -263,7 +263,7 @@ func Up_TaskData(T_task_id string, Id string, T_t string, T_rh string, T_time st
 	}
 
 	// 开始插入数据 UPDATE `cold_verify`.`Z_TaskData_d8qMyeXLzIxn` SET `t_t` = 20.2 WHERE `ID` = 69
-	sql := "UPDATE Z_TaskData_" + T_task_id + " " + SET_str + " WHERE ID = " + Id
+	sql := "UPDATE z_task_data_" + T_task_id + " " + SET_str + " WHERE ID = " + Id
 	//  这里有时间优化  用于一次 prepare 多次 exec，以提高批量执行的速度
 	//fmt.Println(sql)
 	res, err := o.Raw(sql).Exec()
@@ -283,7 +283,7 @@ func Del_TaskData(T_task_id string, Id string) bool {
 	o := orm.NewOrm()
 
 	// 开始插入数据 UPDATE `cold_verify`.`Z_TaskData_d8qMyeXLzIxn` SET `t_t` = 20.2 WHERE `ID` = 69
-	sql := "DELETE FROM Z_TaskData_" + T_task_id + " WHERE ID = " + Id
+	sql := "DELETE FROM z_task_data_" + T_task_id + " WHERE ID = " + Id
 	//  这里有时间优化  用于一次 prepare 多次 exec，以提高批量执行的速度
 	logs.Println(sql)
 	res, err := o.Raw(sql).Exec()
@@ -303,7 +303,7 @@ func Del_TaskData_t_id(T_task_id string, Id string) bool {
 	o := orm.NewOrm()
 
 	// 开始插入数据 UPDATE `cold_verify`.`Z_TaskData_d8qMyeXLzIxn` SET `t_t` = 20.2 WHERE `ID` = 69
-	sql := "DELETE FROM Z_TaskData_" + T_task_id + " WHERE t_id = " + Id
+	sql := "DELETE FROM z_task_data_" + T_task_id + " WHERE t_id = " + Id
 	//  这里有时间优化  用于一次 prepare 多次 exec，以提高批量执行的速度
 	logs.Println(sql)
 	res, err := o.Raw(sql).Exec()

models/Task/TaskLogs.go

@@ -7,7 +7,6 @@ import (
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
-	"strconv"
 	"time"
 )
 
@@ -24,7 +23,7 @@ type TaskLogs struct {
 }
 
 func (t *TaskLogs) TableName() string {
-	return "TaskLogs" // 数据库名称   // ************** 替换 FormulaList **************
+	return "task_logs" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -33,14 +32,25 @@ func init() {
 
 }
 
-type TaskLogs_ struct {
+type TaskLogs_R struct {
 	T_uuid     string // 操作用户uuid
 	T_name     string // 操作用户name
 	T_task_id  string // 任务ID
-	Logs_class string //
+	Logs_class string // 分类
 	Logs_Title string // 标题
 	Logs_Txt   string // 详情
-	CreateTime time.Time
+	CreateTime string
+}
+
+func TaskLogsToTaskLogs_R(T TaskLogs, adminMap map[string]string) (T_r TaskLogs_R) {
+	T_r.T_uuid = T.T_uuid
+	T_r.T_name = adminMap[T.T_uuid]
+	T_r.T_task_id = T.T_task_id
+	T_r.Logs_class = T.Logs_class
+	T_r.Logs_Title = T.Logs_Title
+	T_r.Logs_Txt = T.Logs_Txt
+	T_r.CreateTime = T.CreateTime.Format("2006-01-02 15:04:05")
+	return T_r
 }
 
 func Add_TaskLogs_T(T_uuid string, T_task_id string, Logs_class string, Logs_Title string, Logs_Txt_T interface{}) {
@@ -54,7 +64,7 @@ func Add_TaskLogs_T(T_uuid string, T_task_id string, Logs_class string, Logs_Tit
 }
 
 // 获取列表
-func Read_TaskLogs_List(T_task_id string, page int, page_z int) ([]TaskLogs_, int) {
+func Read_TaskLogs_List(T_task_id string, adminMap map[string]string, page int, page_z int) ([]TaskLogs_R, int) {
 
 	o := orm.NewOrm()
 	var offset int
@@ -63,29 +73,19 @@ func Read_TaskLogs_List(T_task_id string, page int, page_z int) ([]TaskLogs_, in
 	} else {
 		offset = (page - 1) * page_z
 	}
+	qs := o.QueryTable(new(TaskLogs))
+	var r []TaskLogs
+	cond := orm.NewCondition()
+	cond1 := cond.And("T_task_id", T_task_id)
 
-	var maps_z []orm2.ParamsList
-	var maps []TaskLogs_
-
-	// 获取总条数
-	sql := "SELECT COUNT(ID) FROM TaskLogs WHERE  t_task_id=" + "\"" + T_task_id + "\""
+	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-CreateTime").All(&r)
+	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
 
-	fmt.Println(sql)
-	_, err := o.Raw(sql).ValuesList(&maps_z)
-	if err != nil {
-		return maps, 0
-	}
-	if len(maps_z) == 0 {
-		return maps, 0
+	// 转换
+	var TaskLogsList []TaskLogs_R
+	for _, v := range r {
+		TaskLogsList = append(TaskLogsList, TaskLogsToTaskLogs_R(v, adminMap))
 	}
-	sql = "SELECT * FROM TaskLogs t " +
-		"LEFT JOIN (SELECT t_uuid, t_name FROM `Admin`) c ON c.t_uuid=t.t_uuid " +
-		"WHERE t.t_task_id=" + "\"" + T_task_id + "\""
-
-	sql = sql + " ORDER BY t.create_time DESC LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(page_z)
-	fmt.Println(sql)
-	_, err = o.Raw(sql).QueryRows(&maps)
 
-	cnt, _ := strconv.Atoi(maps_z[0][0].(string))
-	return maps, cnt
+	return TaskLogsList, int(cnt)
 }

models/Template/Template.go

@@ -1,8 +1,8 @@
 package Template
 
 import (
-	"bzd_server/conf"
-	"bzd_server/logs"
+	"ColdVerify_server/conf"
+	"ColdVerify_server/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
@@ -37,13 +37,12 @@ type Template_R struct {
 }
 
 func (t *Template) TableName() string {
-	return "Template" // 数据库名称   // ************** 替换 FormulaList **************
+	return "template" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 var redisCache_Template cache.Cache
 
 func init() {
-	return
 	//注册模型
 	orm.RegisterModel(new(Template))
 

models/VerifyTemplate/VerifyTemplate.go

@@ -1,8 +1,8 @@
 package VerifyTemplate
 
 import (
-	"bzd_server/lib"
-	"bzd_server/logs"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -30,7 +30,7 @@ type VerifyTemplate_R struct {
 }
 
 func (t *VerifyTemplate) TableName() string {
-	return "VerifyTemplate" // 数据库名称   // ************** 替换 FormulaList **************
+	return "verify_template" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -124,23 +124,29 @@ func Update_VerifyTemplate(m VerifyTemplate, cols ...string) bool {
 }
 
 // 获取列表
-func Read_VerifyTemplate_List(T_name string) []VerifyTemplate_R {
+func Read_VerifyTemplate_List(T_name string, page int, page_z int) ([]VerifyTemplate_R, int64) {
 
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 	var r []VerifyTemplate
 	qs := o.QueryTable(new(VerifyTemplate))
+	var offset int64
+	if page <= 1 {
+		offset = 0
+	} else {
+		offset = int64((page - 1) * page_z)
+	}
 
 	cond := orm.NewCondition()
 	cond1 := cond.And("T_name__icontains", T_name) // .AndNot("status__in", 1).Or("profile__age__gt", 2000)
 
-	qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
-
+	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
+	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
 	// 转换
 	var VerifyTemplate_r []VerifyTemplate_R
 	for _, v := range r {
 		VerifyTemplate_r = append(VerifyTemplate_r, VerifyTemplateToVerifyTemplate_R(v))
 	}
 
-	return VerifyTemplate_r
+	return VerifyTemplate_r, cnt
 }

models/VerifyTemplate/VerifyTemplateMap.go

@@ -1,8 +1,8 @@
 package VerifyTemplate
 
 import (
-	"bzd_server/lib"
-	"bzd_server/logs"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -37,16 +37,17 @@ type VerifyTemplateMap struct {
 }
 
 type VerifyTemplateMap_R struct {
-	T_id     string // 标题
-	T_source int    //
-	T_label  int    //
-	T_name   string // 标题
-	T_field  string // 标题
-	T_text   string // 标题
+	T_id     string
+	T_source int    // 数据类型
+	T_label  int    // 来源
+	T_name   string // 标签名称
+	T_field  string // 标签
+	T_text   string // 描述
+	T_sort   int    // 排序
 }
 
 func (t *VerifyTemplateMap) TableName() string {
-	return "VerifyTemplateMap" // 数据库名称   // ************** 替换 FormulaList **************
+	return "verify_template_map" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -64,6 +65,7 @@ func VerifyTemplateMapToVerifyTemplateMap_R(T VerifyTemplateMap) (T_r VerifyTemp
 	T_r.T_name = T.T_name
 	T_r.T_field = T.T_field
 	T_r.T_text = T.T_text
+	T_r.T_sort = T.T_sort
 
 	//......
 	return T_r
@@ -143,17 +145,23 @@ func Update_VerifyTemplateMap(m VerifyTemplateMap, cols ...string) bool {
 }
 
 // 获取列表
-func Read_VerifyTemplateMap_List(T_VerifyTemplate_id string) []VerifyTemplateMap_R {
+func Read_VerifyTemplateMap_List(T_VerifyTemplate_id string, page int, page_z int) ([]VerifyTemplateMap_R, int64) {
 
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 	var r []VerifyTemplateMap
 	qs := o.QueryTable(new(VerifyTemplateMap))
-
+	var offset int64
+	if page <= 1 {
+		offset = 0
+	} else {
+		offset = int64((page - 1) * page_z)
+	}
 	cond := orm.NewCondition()
 	cond1 := cond.And("T_VerifyTemplate_id", T_VerifyTemplate_id) // .AndNot("status__in", 1).Or("profile__age__gt", 2000)
 
-	qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-T_sort").All(&r)
+	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-T_sort").All(&r)
+	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
 
 	// 转换
 	var VerifyTemplateMap_r []VerifyTemplateMap_R
@@ -161,7 +169,7 @@ func Read_VerifyTemplateMap_List(T_VerifyTemplate_id string) []VerifyTemplateMap
 		VerifyTemplateMap_r = append(VerifyTemplateMap_r, VerifyTemplateMapToVerifyTemplateMap_R(v))
 	}
 
-	return VerifyTemplateMap_r
+	return VerifyTemplateMap_r, cnt
 }
 
 func Read_VerifyTemplateMap_List_For_Data(T_VerifyTemplate_id string, T_source int) []VerifyTemplateMap {

models/VerifyTemplate/VerifyTemplateMapData.go

@@ -1,7 +1,7 @@
 package VerifyTemplate
 
 import (
-	"bzd_server/logs"
+	"ColdVerify_server/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
@@ -31,7 +31,7 @@ type VerifyTemplateMapData_R struct {
 }
 
 func (t *VerifyTemplateMapData) TableName() string {
-	return "VerifyTemplateMapData" // 数据库名称   // ************** 替换 FormulaList **************
+	return "verify_template_map_data" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 // 多字段索引

models/VerifyTemplate/VerifyTemplateTime.go

@@ -1,8 +1,8 @@
 package VerifyTemplate
 
 import (
-	"bzd_server/lib"
-	"bzd_server/logs"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -15,6 +15,7 @@ type VerifyTemplateTime struct {
 	Id                     int    `orm:"column(ID);size(11);auto;pk"`
 	T_id                   string `orm:"size(256);null"`
 	T_VerifyTemplateMap_id string `orm:"size(256);null"`     // 标题
+	T_tag                  string `orm:"size(256);null"`     // 对应标签
 	T_step_name            string `orm:"size(256);null"`     // 步骤名称
 	T_min_time             int    `orm:"size(256);"`         // 最小时间
 	T_max_time             int    `orm:"size(256);"`         // 最大时间
@@ -29,6 +30,7 @@ type VerifyTemplateTime_R struct {
 	T_id                     string // 标签id
 	T_VerifyTemplateMap_id   string // 标签id
 	T_VerifyTemplateMap_Name string // 标签名称
+	T_tag                    string // 步骤名称
 	T_step_name              string // 步骤名称
 	T_min_time               int    // 最小时间
 	T_max_time               int    // 最大时间
@@ -38,7 +40,7 @@ type VerifyTemplateTime_R struct {
 }
 
 func (t *VerifyTemplateTime) TableName() string {
-	return "VerifyTemplateTime" // 数据库名称   // ************** 替换 FormulaList **************
+	return "verify_template_time" // 数据库名称   // ************** 替换 FormulaList **************
 }
 
 func init() {
@@ -51,6 +53,7 @@ func VerifyTemplateTimeToVerifyTemplateTime_R(T VerifyTemplateTime, Map VerifyTe
 	T_r.T_id = T.T_id
 	T_r.T_VerifyTemplateMap_id = T.T_VerifyTemplateMap_id
 	T_r.T_VerifyTemplateMap_Name = Map.T_name
+	T_r.T_tag = T.T_tag
 	T_r.T_step_name = T.T_step_name
 	T_r.T_min_time = T.T_min_time
 	T_r.T_max_time = T.T_max_time
@@ -134,17 +137,23 @@ func Update_VerifyTemplateTime(m VerifyTemplateTime, cols ...string) bool {
 }
 
 // 获取列表
-func Read_VerifyTemplateTime_List(T_VerifyTemplateMap_id string, Map VerifyTemplateMap) []VerifyTemplateTime_R {
+func Read_VerifyTemplateTime_List(T_VerifyTemplateMap_id string, Map VerifyTemplateMap, page int, page_z int) ([]VerifyTemplateTime_R, int64) {
 
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 	var r []VerifyTemplateTime
 	qs := o.QueryTable(new(VerifyTemplateTime))
-
+	var offset int64
+	if page <= 1 {
+		offset = 0
+	} else {
+		offset = int64((page - 1) * page_z)
+	}
 	cond := orm.NewCondition()
 	cond1 := cond.And("T_VerifyTemplateMap_id", T_VerifyTemplateMap_id)
 
-	qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-T_sort").All(&r)
+	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-T_sort").All(&r)
+	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
 
 	// 转换
 	var VerifyTemplateTime_r []VerifyTemplateTime_R
@@ -152,5 +161,5 @@ func Read_VerifyTemplateTime_List(T_VerifyTemplateMap_id string, Map VerifyTempl
 		VerifyTemplateTime_r = append(VerifyTemplateTime_r, VerifyTemplateTimeToVerifyTemplateTime_R(v, Map))
 	}
 
-	return VerifyTemplateTime_r
+	return VerifyTemplateTime_r, cnt
 }

routers/Account.go

@@ -1,7 +1,7 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )
 

routers/Certificate.go

@@ -1,7 +1,7 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )
 

routers/Device.go

@@ -1,34 +1,32 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
 func init() {
 
 	// 设备分类
-	beego.Router("/DeviceClass/List", &controllers.DeviceClassController{}, "*:List")           // 获取未读消息
-	beego.Router("/DeviceClass/Get", &controllers.DeviceClassController{}, "*:Get")           // 获取未读消息
-	beego.Router("/DeviceClass/Add", &controllers.DeviceClassController{}, "*:Add") // 获取未读消息
-	beego.Router("/DeviceClass/Up", &controllers.DeviceClassController{}, "*:Up") // 获取未读消息
-	beego.Router("/DeviceClass/Del", &controllers.DeviceClassController{}, "*:Del")   // 获取未读消息
+	beego.Router("/DeviceClass/List", &controllers.DeviceClassController{}, "*:List") // 设备分类列表
+	beego.Router("/DeviceClass/Get", &controllers.DeviceClassController{}, "*:Get")   // 获取设备分类
+	beego.Router("/DeviceClass/Add", &controllers.DeviceClassController{}, "*:Add")   // 添加设备分类
+	beego.Router("/DeviceClass/Up", &controllers.DeviceClassController{}, "*:Up")     // 编辑设备分类
+	beego.Router("/DeviceClass/Del", &controllers.DeviceClassController{}, "*:Del")   // 删除设备分类
 
 	// 设备分类 - 设备列表
-	beego.Router("/DeviceClassList/List", &controllers.DeviceClassController{}, "*:List_List")           // 获取未读消息
-	beego.Router("/DeviceClassList/Add", &controllers.DeviceClassController{}, "*:List_Add") // 获取未读消息
-	beego.Router("/DeviceClassList/Up", &controllers.DeviceClassController{}, "*:List_Up") // 获取未读消息
-	beego.Router("/DeviceClassList/Del", &controllers.DeviceClassController{}, "*:List_Del")   // 获取未读消息
+	beego.Router("/DeviceClassList/List", &controllers.DeviceClassController{}, "*:List_List") // 设备分类列表
+	beego.Router("/DeviceClassList/Add", &controllers.DeviceClassController{}, "*:List_Add")   // 添加设备分类列表
+	beego.Router("/DeviceClassList/Up", &controllers.DeviceClassController{}, "*:List_Up")     // 编辑设备分类列表
+	beego.Router("/DeviceClassList/Del", &controllers.DeviceClassController{}, "*:List_Del")   // 删除设备分类列表
 
 	// - 设备管理
-	beego.Router("/Device/List", &controllers.DeviceController{}, "*:List")           // 获取未读消息
-	beego.Router("/Device/Add", &controllers.DeviceController{}, "*:Add") // 获取未读消息
-	beego.Router("/Device/Up", &controllers.DeviceController{}, "*:Up") // 获取未读消息
-	beego.Router("/Device/Del", &controllers.DeviceController{}, "*:Del")   // 获取未读消息
-
-
-	beego.Router("/Device/Class", &controllers.DeviceController{}, "*:Device_Class")           // 获取未读消息
-	beego.Router("/Device/Data", &controllers.DeviceController{}, "*:Device_Data")           // 获取未读消息
+	beego.Router("/Device/List", &controllers.DeviceController{}, "*:List") // 设别列表
+	beego.Router("/Device/Add", &controllers.DeviceController{}, "*:Add")   // 添加设别
+	beego.Router("/Device/Up", &controllers.DeviceController{}, "*:Up")     // 编辑设别
+	beego.Router("/Device/Del", &controllers.DeviceController{}, "*:Del")   // 删除设别
 
+	beego.Router("/Device/Class", &controllers.DeviceController{}, "*:Device_Class") // 设备分类
+	beego.Router("/Device/Data", &controllers.DeviceController{}, "*:Device_Data")   // 设备数据
 
 }

routers/Logs.go

@@ -1,11 +1,11 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
 func init() {
-	beego.Router("/Logs/List", &controllers.LogsController{}, "*:List")         //
-	beego.Router("/UserLogs/List", &controllers.LogsController{}, "*:UserLogs") //
+	beego.Router("/Logs/List", &controllers.LogsController{}, "*:List")         //日志列表
+	beego.Router("/UserLogs/List", &controllers.LogsController{}, "*:UserLogs") //用户日志列表
 }

routers/Task.go

@@ -1,42 +1,41 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
 func init() {
 
-	beego.Router("/UpFileToken", &controllers.UpFileController{}, "*:ConfigUpFileToken") // *全部；  get,post:
+	beego.Router("/UpFileToken", &controllers.UpFileController{}, "*:ConfigUpFileToken") // 上传文件
 
-	beego.Router("/Task/List", &controllers.TaskController{}, "*:List") //
-
-	beego.Router("/Task/Get", &controllers.TaskController{}, "*:Get") //
-	beego.Router("/Task/Add", &controllers.TaskController{}, "*:Add") //
-	beego.Router("/Task/Up", &controllers.TaskController{}, "*:Up")   //
-	beego.Router("/Task/Del", &controllers.TaskController{}, "*:Del") //
+	beego.Router("/Task/List", &controllers.TaskController{}, "*:List") // 任务列表
+	beego.Router("/Task/Get", &controllers.TaskController{}, "*:Get")   // 获取任务
+	beego.Router("/Task/Add", &controllers.TaskController{}, "*:Add")   // 添加任务
+	beego.Router("/Task/Up", &controllers.TaskController{}, "*:Up")     // 编辑任务
+	beego.Router("/Task/Del", &controllers.TaskController{}, "*:Del")   // 删除任务
 
 	// 日志
 	beego.Router("/TaskLogs/List", &controllers.TaskController{}, "*:Logs_List")
 
 	// 提取数据
 	beego.Router("/TaskData/Extract_TaskData", &controllers.TaskDataController{}, "*:Extract_TaskData")
-	beego.Router("/TaskData/TaskDataClass_List", &controllers.TaskDataController{}, "*:TaskDataClass_List")
-	beego.Router("/TaskData/List", &controllers.TaskDataController{}, "*:TaskData_List")
-	beego.Router("/TaskData/Add", &controllers.TaskDataController{}, "*:TaskData_Add")         //
-	beego.Router("/TaskData/AddS", &controllers.TaskDataController{}, "*:TaskData_AddS")       //
-	beego.Router("/TaskData/Up", &controllers.TaskDataController{}, "*:TaskData_Up")           //
-	beego.Router("/TaskData/Del", &controllers.TaskDataController{}, "*:TaskData_Del")         //
-	beego.Router("/TaskData/DelTid", &controllers.TaskDataController{}, "*:TaskData_Del_t_id") //
+	beego.Router("/TaskData/TaskDataClass_List", &controllers.TaskDataController{}, "*:TaskDataClass_List") // 任务数据分类列表
+	beego.Router("/TaskData/List", &controllers.TaskDataController{}, "*:TaskData_List")                    // 任务数据列表
+	beego.Router("/TaskData/Add", &controllers.TaskDataController{}, "*:TaskData_Add")                      // 添加任务数据
+	beego.Router("/TaskData/AddS", &controllers.TaskDataController{}, "*:TaskData_AddS")                    // 批量添加任务数据
+	beego.Router("/TaskData/Up", &controllers.TaskDataController{}, "*:TaskData_Up")                        // 编辑任务数据
+	beego.Router("/TaskData/Del", &controllers.TaskDataController{}, "*:TaskData_Del")                      // 删除任务数据
+	beego.Router("/TaskData/DelTid", &controllers.TaskDataController{}, "*:TaskData_Del_t_id")              // 根据id删除任务数据
 
-	beego.Router("/TaskData/Export_Data_Excel", &controllers.TaskDataController{}, "*:Export_Data_Excel") // 设置 设备参数
-	beego.Router("/TaskData/Export_Data_PDF", &controllers.TaskDataController{}, "*:Export_Data_PDF")     // 设置 设备参数
+	beego.Router("/TaskData/Export_Data_Excel", &controllers.TaskDataController{}, "*:Export_Data_Excel") // 导出任务数据excel
+	beego.Router("/TaskData/Export_Data_PDF", &controllers.TaskDataController{}, "*:Export_Data_PDF")     // 导出任务数据pdf
 
 	// 校验
-	beego.Router("/TaskData/Check", &controllers.TaskDataController{}, "*:Check") // 设置 设备参数
+	beego.Router("/TaskData/Check", &controllers.TaskDataController{}, "*:Check") // 检查数据
 
 	// 公司用户
-	beego.Router("/UserTask/List", &controllers.TaskController{}, "*:UserTaskList") //
-	beego.Router("/UserTaskData/List", &controllers.TaskDataController{}, "*:UserTaskData_List")
+	beego.Router("/UserTask/List", &controllers.TaskController{}, "*:UserTaskList")              // 公司用户任务列表
+	beego.Router("/UserTaskData/List", &controllers.TaskDataController{}, "*:UserTaskData_List") // 公司用户任务数据列表
 
 }

routers/User.go

@@ -1,17 +1,14 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
 func init() {
-	beego.Router("/User/List", &controllers.UserController{}, "*:List")           //
-	beego.Router("/User/Add", &controllers.UserController{}, "*:Add") //
-	beego.Router("/User/Up", &controllers.UserController{}, "*:Up") //
-	beego.Router("/User/Del", &controllers.UserController{}, "*:Del")   //
+	beego.Router("/User/List", &controllers.UserController{}, "*:List") // 用户列表
+	beego.Router("/User/Add", &controllers.UserController{}, "*:Add")   // 添加用户
+	beego.Router("/User/Up", &controllers.UserController{}, "*:Up")     // 编辑用户
+	beego.Router("/User/Del", &controllers.UserController{}, "*:Del")   // 删除用户
 
-
-
-
-}
+}

routers/VerifyTemplate.go

@@ -1,14 +1,12 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
 func init() {
 
-
-
 	//   -----------网关接口-----------
 	// 添加网关
 	//beego.Router("/API/A_Device_List", &controllers.DeviceController{}, "*:A_Device_List") // *全部；  get,post:
@@ -44,12 +42,12 @@ func init() {
 	//beego.Router("/Wx/Wx_handler", &controllers.WxController{}, "*:Wx")  // 获取未读消息
 
 	// 模板路由
-	beego.Router("/Template/List_html", &controllers.TemplateController{}, "*:List_html")           // 获取未读消息
+	beego.Router("/Template/List_html", &controllers.TemplateController{}, "*:List_html") // 获取未读消息
 	beego.Router("/Template/List_", &controllers.TemplateController{}, "*:List_")         // 获取未读消息
-	beego.Router("/Template/List", &controllers.TemplateController{}, "*:List")           // 获取未读消息
-	beego.Router("/Template/Get", &controllers.TemplateController{}, "*:Get")           // 获取未读消息
-	beego.Router("/Template/Add", &controllers.TemplateController{}, "*:Add") // 获取未读消息
-	beego.Router("/Template/Up", &controllers.TemplateController{}, "*:Up") // 获取未读消息
-	beego.Router("/Template/Del", &controllers.TemplateController{}, "*:Del")   // 获取未读消息
+	beego.Router("/Template/List", &controllers.TemplateController{}, "*:List")           // 模版列表
+	beego.Router("/Template/Get", &controllers.TemplateController{}, "*:Get")             // 获取模版
+	beego.Router("/Template/Add", &controllers.TemplateController{}, "*:Add")             // 添加模版
+	beego.Router("/Template/Up", &controllers.TemplateController{}, "*:Up")               // 编辑模版
+	beego.Router("/Template/Del", &controllers.TemplateController{}, "*:Del")             // 删除模版
 
 }

routers/router.go

@@ -1,7 +1,7 @@
 package routers
 
 import (
-	"bzd_server/controllers"
+	"ColdVerify_server/controllers"
 	beego "github.com/beego/beego/v2/server/web"
 )