From 31fe267d0ae6ec08da7d87ded277b66b0f23974a Mon Sep 17 00:00:00 2001
From: PandaGoAdmin <18610165312@163.com>
Date: Fri, 2 Sep 2022 17:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E3=80=91=E8=A7=84?=
=?UTF-8?q?=E5=88=99=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/develop/gen/gen.go | 24 +++---
apps/rule/api/rule_notice.go | 65 +++++++++++++++
apps/rule/entity/notice.go | 62 +++++++++++++++
apps/rule/router/rule_notice.go | 70 ++++++++++++++++
apps/rule/services/rule_notice.go | 101 ++++++++++++++++++++++++
config.yml | 2 +-
go.mod | 13 +--
go.sum | 45 -----------
pkg/initialize/router.go | 7 ++
pkg/initialize/table.go | 3 +
resource/pandax-mysql.sql | 2 +-
resource/template/vue/edit-vue.template | 46 +++++------
resource/template/vue/list-vue.template | 14 ++--
13 files changed, 353 insertions(+), 101 deletions(-)
create mode 100644 apps/rule/api/rule_notice.go
create mode 100644 apps/rule/entity/notice.go
create mode 100644 apps/rule/router/rule_notice.go
create mode 100644 apps/rule/services/rule_notice.go
diff --git a/apps/develop/gen/gen.go b/apps/develop/gen/gen.go
index 8c45d6f..839d103 100644
--- a/apps/develop/gen/gen.go
+++ b/apps/develop/gen/gen.go
@@ -196,19 +196,19 @@ func (s *toolsGenTableColumn) GenTableInit(tableName string) entity.DevGenTable
wg := sync.WaitGroup{}
dcs := *dbColumn
- for i := 0; i < len(dcs); i++ {
- index := i
+ for x := 0; x < len(dcs); x++ {
+ index := x
wg.Add(1)
- go func(wg *sync.WaitGroup, i int) {
+ go func(wg *sync.WaitGroup, y int) {
defer wg.Done()
var column entity.DevGenTableColumn
- column.ColumnComment = dcs[i].ColumnComment
- column.ColumnName = dcs[i].ColumnName
- column.ColumnType = dcs[i].ColumnType
- column.Sort = i + 1
+ column.ColumnComment = dcs[y].ColumnComment
+ column.ColumnName = dcs[y].ColumnName
+ column.ColumnType = dcs[y].ColumnType
+ column.Sort = y + 1
column.IsPk = "0"
- nameList := strings.Split(dcs[i].ColumnName, "_")
+ nameList := strings.Split(dcs[y].ColumnName, "_")
for i := 0; i < len(nameList); i++ {
strStart := string([]byte(nameList[i])[:1])
strend := string([]byte(nameList[i])[1:])
@@ -219,13 +219,12 @@ func (s *toolsGenTableColumn) GenTableInit(tableName string) entity.DevGenTable
column.JsonField += strings.ToUpper(strStart) + strend
}
}
- if strings.Contains(dcs[i].ColumnKey, "PR") {
+ if strings.Contains(dcs[y].ColumnKey, "PR") {
column.IsPk = "1"
- data.PkColumn = dcs[i].ColumnName
+ data.PkColumn = dcs[y].ColumnName
data.PkGoField = column.GoField
data.PkJsonField = column.JsonField
- global.Log.Info("是否自增主键", dcs[i].Extra)
- if dcs[i].Extra == "auto_increment" {
+ if dcs[y].Extra == "auto_increment" {
column.IsIncrement = "1"
}
}
@@ -331,6 +330,7 @@ func (s *toolsGenTableColumn) GenTableInit(tableName string) entity.DevGenTable
// 类型&性别字段设置下拉框
column.HtmlType = "select"
}
+ global.Log.Info(y)
data.Columns = append(data.Columns, column)
}(&wg, index)
}
diff --git a/apps/rule/api/rule_notice.go b/apps/rule/api/rule_notice.go
new file mode 100644
index 0000000..837a6cd
--- /dev/null
+++ b/apps/rule/api/rule_notice.go
@@ -0,0 +1,65 @@
+package api
+
+// ==========================================================================
+// 生成日期：2022-09-02 15:49:39 +0800 CST
+// 生成路径: apps/rule/api/rule_notice.go
+// 生成人：panda
+// ==========================================================================
+import (
+ "github.com/XM-GO/PandaKit/model"
+ "github.com/XM-GO/PandaKit/restfulx"
+
+ "github.com/XM-GO/PandaKit/utils"
+ "pandax/apps/rule/entity"
+ "pandax/apps/rule/services"
+)
+
+type RuleNoticeApi struct {
+ RuleNoticeApp services.RuleNoticeModel
+}
+
+// GetRuleNoticeList Notice列表数据
+func (p *RuleNoticeApi) GetRuleNoticeList(rc *restfulx.ReqCtx) {
+ data := entity.RuleNotice{}
+ pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+ pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+ data.Name = restfulx.QueryParam(rc, "name")
+
+ list, total := p.RuleNoticeApp.FindListPage(pageNum, pageSize, data)
+
+ rc.ResData = model.ResultPage{
+ Total: total,
+ PageNum: int64(pageNum),
+ PageSize: int64(pageNum),
+ Data: list,
+ }
+}
+
+// GetRuleNotice 获取Notice
+func (p *RuleNoticeApi) GetRuleNotice(rc *restfulx.ReqCtx) {
+ id := restfulx.PathParamInt(rc, "id")
+ rc.ResData = p.RuleNoticeApp.FindOne(int64(id))
+}
+
+// InsertRuleNotice 添加Notice
+func (p *RuleNoticeApi) InsertRuleNotice(rc *restfulx.ReqCtx) {
+ var data entity.RuleNotice
+ restfulx.BindQuery(rc, &data)
+
+ p.RuleNoticeApp.Insert(data)
+}
+
+// UpdateRuleNotice 修改Notice
+func (p *RuleNoticeApi) UpdateRuleNotice(rc *restfulx.ReqCtx) {
+ var data entity.RuleNotice
+ restfulx.BindQuery(rc, &data)
+
+ p.RuleNoticeApp.Update(data)
+}
+
+// DeleteRuleNotice 删除Notice
+func (p *RuleNoticeApi) DeleteRuleNotice(rc *restfulx.ReqCtx) {
+ id := restfulx.PathParam(rc, "id")
+ ids := utils.IdsStrToIdsIntGroup(id)
+ p.RuleNoticeApp.Delete(ids)
+}
diff --git a/apps/rule/entity/notice.go b/apps/rule/entity/notice.go
new file mode 100644
index 0000000..f14ffe4
--- /dev/null
+++ b/apps/rule/entity/notice.go
@@ -0,0 +1,62 @@
+package entity
+
+import (
+ "encoding/json"
+ "github.com/XM-GO/PandaKit/model"
+)
+
+type RuleNotice struct {
+ model.BaseAutoModel
+ UserId string `json:"user_id"`
+ Name string `json:"name"`
+ Category string `json:"category"` // http，mail
+ Description string `json:"description"`
+ Model string `json:"model"` // 配置或模板 setting or template
+ ExParam json.RawMessage `json:"ex_param" gorm:"type:jsonb;comment: 拓展参数"`
+}
+
+func (RuleNotice) TableName() string {
+ return "rule_notice"
+}
+
+type RestSetting struct {
+ Method string `json:"method"`
+ Url string `json:"url"`
+ Headers map[string]string `json:"headers"`
+ BodyType string `json:"bodyType"`
+ Timeout int64 `json:"timeout"`
+ CertificationPath string `json:"certificationPath"`
+ PrivateKeyPath string `json:"privateKeyPath"`
+ RootCaPath string `json:"rootCaPath"`
+ InsecureSkipVerify bool `json:"insecureSkipVerify"`
+}
+
+type MqttSetting struct {
+ Server string `json:"server"`
+ Topic string `json:"topic"`
+ Qos byte `json:"qos"`
+ Username string `json:"username"`
+ Password string `json:"password"`
+ Retained bool `json:"retained"`
+ CertificationPath string `json:"certificationPath"`
+ PrivateKeyPath string `json:"privateKeyPath"`
+ RootCaPath string `json:"rootCaPath"`
+ InsecureSkipVerify bool `json:"insecureSkipVerify"`
+}
+
+type MailSetting struct {
+ Host string `json:"host"` // 服务器地址
+ Port int `json:"port"` // 服务器端口
+ From string `json:"from"` // 邮箱账号
+ Nickname string `json:"nickname"` // 发件人
+ Secret string `json:"secret"` // 邮箱密码
+ IsSSL bool `json:"isSsl"` // 是否开启ssl
+}
+
+type ScriptSetting struct {
+ Category string `json:"category"` // 0 python，1 javascript 2 shell
+}
+
+type DataTemplate struct {
+ DataTemplate string `json:"dataTemplate"`
+}
diff --git a/apps/rule/router/rule_notice.go b/apps/rule/router/rule_notice.go
new file mode 100644
index 0000000..0a4230f
--- /dev/null
+++ b/apps/rule/router/rule_notice.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2022-09-02 15:49:39 +0800 CST
+// 生成路径: apps/rule/router/rule_notice.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+ "github.com/XM-GO/PandaKit/model"
+ "github.com/XM-GO/PandaKit/restfulx"
+ "pandax/apps/rule/api"
+ "pandax/apps/rule/entity"
+ "pandax/apps/rule/services"
+
+ restfulspec "github.com/emicklei/go-restful-openapi/v2"
+ "github.com/emicklei/go-restful/v3"
+)
+
+func InitRuleNoticeRouter(container *restful.Container) {
+ s := &api.RuleNoticeApi{
+ RuleNoticeApp: services.RuleNoticeModelDao,
+ }
+
+ ws := new(restful.WebService)
+ ws.Path("/rule/notice").Produces(restful.MIME_JSON)
+ tags := []string{"notice"}
+
+ ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+ restfulx.NewReqCtx(request, response).WithLog("获取Notice分页列表").Handle(s.GetRuleNoticeList)
+ }).
+ Doc("获取Notice分页列表").
+ Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+ Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+ Metadata(restfulspec.KeyOpenAPITags, tags).
+ Writes(model.ResultPage{}).
+ Returns(200, "OK", model.ResultPage{}))
+
+ ws.Route(ws.GET("/{id}").To(func(request *restful.Request, response *restful.Response) {
+ restfulx.NewReqCtx(request, response).WithLog("获取Notice信息").Handle(s.GetRuleNotice)
+ }).
+ Doc("获取Notice信息").
+ Param(ws.PathParameter("id", "Id").DataType("int")).
+ Metadata(restfulspec.KeyOpenAPITags, tags).
+ Writes(entity.RuleNotice{}). // on the response
+ Returns(200, "OK", entity.RuleNotice{}).
+ Returns(404, "Not Found", nil))
+
+ ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+ restfulx.NewReqCtx(request, response).WithLog("添加Notice信息").Handle(s.InsertRuleNotice)
+ }).
+ Doc("添加Notice信息").
+ Metadata(restfulspec.KeyOpenAPITags, tags).
+ Reads(entity.RuleNotice{}))
+
+ ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+ restfulx.NewReqCtx(request, response).WithLog("修改Notice信息").Handle(s.UpdateRuleNotice)
+ }).
+ Doc("修改Notice信息").
+ Metadata(restfulspec.KeyOpenAPITags, tags).
+ Reads(entity.RuleNotice{}))
+
+ ws.Route(ws.DELETE("/{id}").To(func(request *restful.Request, response *restful.Response) {
+ restfulx.NewReqCtx(request, response).WithLog("删除Notice信息").Handle(s.DeleteRuleNotice)
+ }).
+ Doc("删除Notice信息").
+ Metadata(restfulspec.KeyOpenAPITags, tags).
+ Param(ws.PathParameter("id", "多id 1,2,3").DataType("string")))
+
+ container.Add(ws)
+}
diff --git a/apps/rule/services/rule_notice.go b/apps/rule/services/rule_notice.go
new file mode 100644
index 0000000..f8cb59f
--- /dev/null
+++ b/apps/rule/services/rule_notice.go
@@ -0,0 +1,101 @@
+// ==========================================================================
+// 生成日期：2022-09-02 15:49:39 +0800 CST
+// 生成路径: apps/rule/services/rule_notice.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+ "github.com/XM-GO/PandaKit/biz"
+ "pandax/apps/rule/entity"
+ "pandax/pkg/global"
+)
+
+type (
+ RuleNoticeModel interface {
+ Insert(data entity.RuleNotice) *entity.RuleNotice
+ FindOne(id int64) *entity.RuleNotice
+ FindListPage(page, pageSize int, data entity.RuleNotice) (*[]entity.RuleNotice, int64)
+ FindList(data entity.RuleNotice) *[]entity.RuleNotice
+ Update(data entity.RuleNotice) *entity.RuleNotice
+ Delete(ids []int64)
+ }
+
+ noticeModelImpl struct {
+ table string
+ }
+)
+
+var RuleNoticeModelDao RuleNoticeModel = ¬iceModelImpl{
+ table: `rule_notice`,
+}
+
+func (m *noticeModelImpl) Insert(data entity.RuleNotice) *entity.RuleNotice {
+ err := global.Db.Table(m.table).Create(&data).Error
+ biz.ErrIsNil(err, "添加规则通知配置失败")
+ return &data
+}
+
+func (m *noticeModelImpl) FindOne(id int64) *entity.RuleNotice {
+ resData := new(entity.RuleNotice)
+ db := global.Db.Table(m.table).Where("id = ?", id)
+ err := db.First(resData).Error
+ biz.ErrIsNil(err, "查询规则通知配置失败")
+ return resData
+}
+
+func (m *noticeModelImpl) FindListPage(page, pageSize int, data entity.RuleNotice) (*[]entity.RuleNotice, int64) {
+ list := make([]entity.RuleNotice, 0)
+ var total int64 = 0
+ offset := pageSize * (page - 1)
+ db := global.Db.Table(m.table)
+ // 此处填写 where参数判断
+ if data.Description != "" {
+ db = db.Where("description = ?", data.Description)
+ }
+ if data.Name != "" {
+ db = db.Where("name like ?", "%"+data.Name+"%")
+ }
+ if data.Category != "" {
+ db = db.Where("category = ?", data.Category)
+ }
+ if data.Model != "" {
+ db = db.Where("model = ?", data.Model)
+ }
+ db.Where("delete_time IS NULL")
+ err := db.Count(&total).Error
+ err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+ biz.ErrIsNil(err, "查询规则通知配置分页列表失败")
+ return &list, total
+}
+
+func (m *noticeModelImpl) FindList(data entity.RuleNotice) *[]entity.RuleNotice {
+ list := make([]entity.RuleNotice, 0)
+ db := global.Db.Table(m.table)
+ // 此处填写 where参数判断
+ if data.Description != "" {
+ db = db.Where("description = ?", data.Description)
+ }
+ if data.Name != "" {
+ db = db.Where("name like ?", "%"+data.Name+"%")
+ }
+ if data.Category != "" {
+ db = db.Where("category = ?", data.Category)
+ }
+ if data.Model != "" {
+ db = db.Where("model = ?", data.Model)
+ }
+ db.Where("delete_time IS NULL")
+ biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询规则通知配置列表失败")
+ return &list
+}
+
+func (m *noticeModelImpl) Update(data entity.RuleNotice) *entity.RuleNotice {
+ biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改规则通知配置失败")
+ return &data
+}
+
+func (m *noticeModelImpl) Delete(ids []int64) {
+ biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.RuleNotice{}, "id in (?)", ids).Error, "删除规则通知配置失败")
+}
diff --git a/config.yml b/config.yml
index b3b8ace..eef6749 100644
--- a/config.yml
+++ b/config.yml
@@ -5,7 +5,7 @@ app:
server:
# debug release test
model: release
- port: 8080
+ port: 7788
cors: true
# 接口限流
rate:
diff --git a/go.mod b/go.mod
index 520ba4f..51ae17e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,7 @@ module pandax
go 1.18
require (
+ github.com/XM-GO/PandaKit v0.0.0-20220821142427-3acdfc4785d9
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/didip/tollbooth v4.0.2+incompatible
github.com/emicklei/go-restful-openapi/v2 v2.9.0
@@ -14,7 +15,6 @@ require (
github.com/robfig/cron/v3 v3.0.1
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.5.0
- github.com/swaggo/swag v1.7.4
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
google.golang.org/grpc v1.48.0
gorm.io/gorm v1.22.3
@@ -22,23 +22,16 @@ require (
require (
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
- github.com/KyleBanks/depth v1.2.1 // indirect
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
- github.com/XM-GO/PandaKit v0.0.0-20220821142427-3acdfc4785d9 // indirect
github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible // indirect
github.com/brianvoe/gofakeit/v6 v6.0.2 // indirect
github.com/casbin/casbin/v2 v2.37.4 // indirect
github.com/casbin/gorm-adapter/v3 v3.4.6 // indirect
github.com/denisenkom/go-mssqldb v0.11.0 // indirect
- github.com/gin-contrib/sse v0.1.0 // indirect
- github.com/gin-gonic/gin v1.7.4 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
- github.com/go-playground/locales v0.14.0 // indirect
- github.com/go-playground/universal-translator v0.18.0 // indirect
- github.com/go-playground/validator/v10 v10.8.0 // indirect
github.com/go-redis/redis v6.15.9+incompatible // indirect
github.com/go-sql-driver/mysql v1.6.0 // indirect
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
@@ -60,10 +53,8 @@ require (
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
- github.com/leodido/go-urn v1.2.1 // indirect
github.com/lib/pq v1.10.4 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
- github.com/mattn/go-isatty v0.0.14 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
@@ -77,7 +68,6 @@ require (
github.com/richardlehane/msoleps v1.0.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tencentyun/cos-go-sdk-v5 v0.7.33 // indirect
- github.com/ugorji/go/codec v1.1.7 // indirect
github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3 // indirect
github.com/xuri/excelize/v2 v2.4.1 // indirect
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
@@ -86,7 +76,6 @@ require (
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
- golang.org/x/tools v0.1.0 // indirect
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index dbab23f..417ca5b 100644
--- a/go.sum
+++ b/go.sum
@@ -3,8 +3,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
-github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -12,12 +10,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY=
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/XM-GO/PandaKit v0.0.0-20220814121200-1838edb60142 h1:G7V4eFIeR7rHWkK9LCW5TAH5fUmFb9+M1s74Q/nP9JA=
-github.com/XM-GO/PandaKit v0.0.0-20220814121200-1838edb60142/go.mod h1:A/0dFObLVa7Yzeq6cMmcjNUoajSgcLkEJglLc41BO3w=
-github.com/XM-GO/PandaKit v0.0.0-20220819095140-dd76101b435f h1:Ginj9GfKXfr10uLn+akHDzDclOAEWR+m4qL+8ff80rs=
-github.com/XM-GO/PandaKit v0.0.0-20220819095140-dd76101b435f/go.mod h1:A/0dFObLVa7Yzeq6cMmcjNUoajSgcLkEJglLc41BO3w=
-github.com/XM-GO/PandaKit v0.0.0-20220819142346-23e2263623b4 h1:0mNXB5TRKIQBg08rEyJfJlOl9WWO0I2P+wpbAg7WFrw=
-github.com/XM-GO/PandaKit v0.0.0-20220819142346-23e2263623b4/go.mod h1:A/0dFObLVa7Yzeq6cMmcjNUoajSgcLkEJglLc41BO3w=
github.com/XM-GO/PandaKit v0.0.0-20220821142427-3acdfc4785d9 h1:m0d1Oh4a6UfUyuplkUoI5Ztc6kPZRVXw6SnTtCV4Tj0=
github.com/XM-GO/PandaKit v0.0.0-20220821142427-3acdfc4785d9/go.mod h1:A/0dFObLVa7Yzeq6cMmcjNUoajSgcLkEJglLc41BO3w=
github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible h1:ht2+VfbXtNLGhCsnTMc6/N26nSTBK6qdhktjYyjJQkk=
@@ -43,7 +35,6 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -70,10 +61,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
-github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
@@ -81,28 +68,20 @@ github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg=
github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ=
github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
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 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.8.0 h1:1kAa0fCrnpv+QYdkdcRzrRM7AyYs5o8+jZdJCz9xj6k=
github.com/go-playground/validator/v10 v10.8.0/go.mod h1:9JhgTzTaE31GZDpH/HSvHiRJrJ3iKAgqqH0Bl/Ocjdk=
github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
@@ -214,7 +193,6 @@ github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -232,8 +210,6 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -250,8 +226,6 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
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=
@@ -298,14 +272,12 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
@@ -324,21 +296,14 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/swaggo/swag v1.7.4 h1:up+ixy8yOqJKiFcuhMgkuYuF4xnevuhnFAXXF8OSfNg=
-github.com/swaggo/swag v1.7.4/go.mod h1:zD8h6h4SPv7t3l+4BKdRquqW1ASWjKZgT6Qv9z3kNqI=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.194/go.mod h1:yrBKWhChnDqNz1xuXdSbWXG56XawEq0G5j1lg4VwBD4=
github.com/tencentyun/cos-go-sdk-v5 v0.7.33 h1:5jmJU7U/1nf/7ZPDkrUL8KlF1oDUzTHsdtLNY6x0hq4=
github.com/tencentyun/cos-go-sdk-v5 v0.7.33/go.mod h1:4E4+bQ2gBVJcgEC9Cufwylio4mXOct2iu05WjgEBx1o=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3 h1:EpI0bqf/eX9SdZDwlMmahKM+CDBgNbsXMhsN28XrM8o=
github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
github.com/xuri/excelize/v2 v2.4.1 h1:veeeFLAJwsNEBPBlDepzPIYS1eLyBVcXNZUW79exZ1E=
github.com/xuri/excelize/v2 v2.4.1/go.mod h1:rSu0C3papjzxQA3sdK8cU544TebhrPUoTOaGPIh0Q1A=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -376,8 +341,6 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -386,10 +349,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -401,7 +362,6 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
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-20190423024810-112230192c58/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/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -436,7 +396,6 @@ golang.org/x/text v0.3.0/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.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/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=
@@ -453,10 +412,7 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw
golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -504,7 +460,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/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=
diff --git a/pkg/initialize/router.go b/pkg/initialize/router.go
index 2320588..1a9479b 100644
--- a/pkg/initialize/router.go
+++ b/pkg/initialize/router.go
@@ -10,6 +10,8 @@ import (
resRouter "pandax/apps/resource/router"
sysRouter "pandax/apps/system/router"
+ ruleRouter "pandax/apps/rule/router"
+
"pandax/pkg/middleware"
)
@@ -61,6 +63,11 @@ func InitRouter() *transport.HttpServer {
resRouter.InitResOssRouter(container)
resRouter.InitResEmailsRouter(container)
}
+ // 规则
+ {
+ ruleRouter.InitRuleNoticeRouter(container)
+ }
+
// api接口
middleware.SwaggerConfig(container)
return server
diff --git a/pkg/initialize/table.go b/pkg/initialize/table.go
index 7f434bb..de936eb 100644
--- a/pkg/initialize/table.go
+++ b/pkg/initialize/table.go
@@ -7,6 +7,7 @@ import (
jobEntity "pandax/apps/job/entity"
logEntity "pandax/apps/log/entity"
resSourceEntity "pandax/apps/resource/entity"
+ ruleEntity "pandax/apps/rule/entity"
"pandax/apps/system/entity"
"pandax/pkg/global"
)
@@ -48,6 +49,8 @@ func InitTable() {
flowEntity.FlowWorkStage{},
flowEntity.FlowWorkTask{},
flowEntity.FlowWorkTaskHistory{},
+
+ ruleEntity.RuleNotice{},
),
"初始化表失败")
}
diff --git a/resource/pandax-mysql.sql b/resource/pandax-mysql.sql
index 779ef33..e785c1b 100644
--- a/resource/pandax-mysql.sql
+++ b/resource/pandax-mysql.sql
@@ -1356,7 +1356,7 @@ CREATE TABLE `sys_users` (
-- ----------------------------
-- Records of sys_users
-- ----------------------------
-INSERT INTO `sys_users` VALUES (1, 'pandax', '13818888888', 1, 1, NULL, '', '0', '1@qq.com', 2, 4, 'panda', '1', NULL, '0', '2021-12-03 09:46:55', '2022-02-09 13:28:49', NULL, 'panda', '$2a$10$EXMJ5huCCTlCmP2ITFkAJ.4Mgmq3JcZGUvtE.KLX8j7FmhiiTEEya', '1', '1,4');
+INSERT INTO `sys_users` VALUES (1, 'pandax', '13818888888', 1, 1, NULL, '', '0', '1@qq.com', 2, 4, 'panda', '1', NULL, '0', '2021-12-03 09:46:55', '2022-02-09 13:28:49', NULL, 'panda', '$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2', '1', '1,4');
INSERT INTO `sys_users` VALUES (3, '测试用户', '18435234356', 1, 2, '', '', '0', '342@163.com', 3, 1, 'test', '', '', '0', '2021-12-06 15:16:53', '2022-05-10 19:19:25', NULL, 'test', '$2a$10$4cHTracxWJLdhMmazvbm1urKyD3v5N2AYxAFtNYh6juU39kgae73e', '2', '1,4');
INSERT INTO `sys_users` VALUES (4, 'panda', '18353366912', 1, 2, '', '', '0', '2417920382@qq.com', 2, 4, 'panda', '', '', '0', '2021-12-19 15:58:09', '2021-12-19 16:06:54', NULL, 'admin', '$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2', '2', '4,1');
INSERT INTO `sys_users` VALUES (5, 'tenant', '', 1, 1, '', '', '0', '', 3, 1, 'panda', '1', '', '0', '2021-12-03 09:46:55', '2022-02-09 13:28:49', NULL, 'tenant', '$2a$10$ycRsRdsrNQInLB2Ib0maOetsWZ0kFctmF6ytAErWTjOx5cWdeJMcK', '1', '1,4');
diff --git a/resource/template/vue/edit-vue.template b/resource/template/vue/edit-vue.template
index a14037a..aa2a8d0 100644
--- a/resource/template/vue/edit-vue.template
+++ b/resource/template/vue/edit-vue.template
@@ -17,33 +17,33 @@
{{- else if eq $column.HtmlType "switch" }}
- el-form-item label="{{$column.ColumnComment}}" prop="{{$column.JsonField}}">
+
{{- else if eq $column.HtmlType "select" }}
- {{if ne $column.DictType ""}}
-
-
- {{"{{"}} dict.dictLabel {{"}}"}}
-
-
- {{- end }}
+ {{if ne $column.DictType ""}}
+
+
+ {{"{{"}} dict.dictLabel {{"}}"}}
+
+
+ {end }}
{{- else if eq $column.HtmlType "radio" }}
- {{if ne $column.DictType ""}}
-
-
- {{"{{"}} dict.dictLabel {{"}}"}}
-
-
- {{- end }}
+ {{if ne $column.DictType ""}}
+
+
+ {{"{{"}} dict.dictLabel {{"}}"}}
+
+
+ {{- end }}
{{- else if eq $column.HtmlType "datetime" }}
-
+
{{- else if and (eq $column.HtmlType "switch" "select" "radio" "checkbox") (ne $column.DictType "") }}
@@ -54,7 +54,7 @@