diff --git a/.env/product b/.env/product new file mode 100644 index 0000000000000000000000000000000000000000..775e3aeb82cab176b0e27c1c6a7f7e2b92823968 --- /dev/null +++ b/.env/product @@ -0,0 +1,9 @@ +MYSQL_ROOT_PASSWORD=123456 +DB_USER=root +DB_PASSWORD=123456 +DB_HOST=db +DB_PORT=3306 +DB_NAME=elk-blog +DB_PREFIX=tk_ +SERVER_PORT=8080 +ENVIRONMENT=local \ No newline at end of file diff --git a/.env/staging b/.env/staging new file mode 100644 index 0000000000000000000000000000000000000000..775e3aeb82cab176b0e27c1c6a7f7e2b92823968 --- /dev/null +++ b/.env/staging @@ -0,0 +1,9 @@ +MYSQL_ROOT_PASSWORD=123456 +DB_USER=root +DB_PASSWORD=123456 +DB_HOST=db +DB_PORT=3306 +DB_NAME=elk-blog +DB_PREFIX=tk_ +SERVER_PORT=8080 +ENVIRONMENT=local \ No newline at end of file diff --git a/.gitignore b/.gitignore index b2af0c67733377db6af6083d6ea0241d5a14b4a4..8b8f90819ff13c4c8faa7ac97308bcf41fa71139 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ publish* config/env.ini main tmp -.env .DS_Store .history diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..428cab247017fd7cefd255b154538a748f61a69d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,39 @@ +FROM golang:1.17 as golang +# 为我们的镜像设置必要的环境变量 +ENV GO111MODULE=on \ + CGO_ENABLED=0 \ + GOOS=linux \ + GOARCH=amd64 \ + GOPROXY=https://goproxy.cn,direct +# 进入工作目录 +WORKDIR /blog +ADD . . +# 复制项目中的 go.mod 和 go.sum文件并下载依赖信息 +COPY go.mod . +COPY go.sum . +RUN go mod tidy +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags '-w -s' -installsuffix 'public' -o main . + +FROM ubuntu:18.04 + +# 配置项目环境（根据自己情况来） +ENV GO_PROFILE=pro +ENV GIN_MODE=release + +# 暴露服务端口 +EXPOSE 8080 + +WORKDIR /app + +# 复制打包的 Go 文件到系统用户可执行程序目录下 +COPY --from=golang /blog/main . +COPY --from=golang /blog/public ./public +COPY --from=golang /blog/setting ./setting +COPY --from=golang /blog/views ./views + +RUN chown -R root /app +RUN chmod +x main + +# 容器启动时运行的命令 +ENTRYPOINT ["./main"] +#CMD ["/app/ginserver"] \ No newline at end of file diff --git a/Dockerfile-mysql b/Dockerfile-mysql new file mode 100644 index 0000000000000000000000000000000000000000..c5d1fa5925db7b82956ad65e26549b199e5c98c9 --- /dev/null +++ b/Dockerfile-mysql @@ -0,0 +1,2 @@ +FROM mysql:8.0.21 +COPY sql/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file diff --git a/README.md b/README.md index 59160e88100debc40869e35b35f49a68493338cb..b6ad1bc2cd6e82bcf3f743441ec5b2dc9fe45328 100644 --- a/README.md +++ b/README.md @@ -233,13 +233,13 @@ $ air 前台入口： ``` -http://localhost:4000/ +http://localhost:8080/ ``` 后台入口： ``` -http://localhost:4000/admin/login +http://localhost:8080/admin/login ``` -初始用户名：`admin`，密码：`admin` +初始用户名：`admin`，密码：`admin123$` #### 2.3 `Goland` 的配置 diff --git a/app/controller/admin/about.go b/app/controller/admin/about.go new file mode 100644 index 0000000000000000000000000000000000000000..a458d4055bfb22ff3b830eb4ce15cb3110946d5d --- /dev/null +++ b/app/controller/admin/about.go @@ -0,0 +1,59 @@ +package admin + +import ( + "gitee.com/jikey/elk-blog/app/model" + "gitee.com/jikey/elk-blog/app/service" + "gitee.com/jikey/elk-blog/pkg/e" + "gitee.com/jikey/elk-blog/pkg/response" + "github.com/flosch/pongo2" + "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" + "strconv" +) + +type About struct { + Base +} + +// Index 文章新增、编辑 +func (b *About) Index(c *gin.Context) { + c.HTML(200, "admin/about/index.html", pongo2.Context{ + "title": "Welcome11222!", + "greet": "hello", + "obj": "world", + }) +} + +// Detail 详情 +func (b *About) Detail(c *gin.Context) { + data := make(map[string]interface{}) + + id, _ := strconv.Atoi(c.Query("id")) + data["rows"], _ = service.About.AboutDetail(id) + + response.Success(c, data) +} + +// Update 修改 +func (b *About) Update(c *gin.Context) { + blog := &model.About{} + id_ := c.DefaultPostForm("id", strconv.Itoa(1)) + if err := c.ShouldBind(&blog); err != nil { + c.JSON(400, gin.H{ + "err": err.Error(), + }) + return + } + + //id := strconv.Itoa(id_) + blog.BaseModel.Id, _ = strconv.Atoi(id_) + err := service.About.Update(id_, blog) + + if err != nil { + logrus.Error("修改失败", err) + response.Fail(c, e.ErrorUpdate) + return + } + + response.Success(c, blog) +} diff --git a/app/controller/admin/blog.go b/app/controller/admin/article.go similarity index 50% rename from app/controller/admin/blog.go rename to app/controller/admin/article.go index 446a93c05045be3cd490ffc89b5e74a56311ec1b..7cb356dc46f6aa7b33b6e3575d5b095e72163e47 100644 --- a/app/controller/admin/blog.go +++ b/app/controller/admin/article.go @@ -5,6 +5,7 @@ import ( "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" + "gitee.com/jikey/elk-blog/pkg/setting" "gitee.com/jikey/elk-blog/pkg/utils" "github.com/flosch/pongo2" "github.com/gin-gonic/gin" @@ -12,12 +13,12 @@ import ( "strconv" ) -type Blog struct { +type Article struct { Base } -func (b *Blog) Index(c *gin.Context) { - c.HTML(200, "admin/blog/index.html", pongo2.Context{ +func (b *Article) Index(c *gin.Context) { + c.HTML(200, "admin/article/index.html", pongo2.Context{ "title": "Welcome11222!", "greet": "hello", "obj": "world", @@ -25,65 +26,65 @@ func (b *Blog) Index(c *gin.Context) { } // List 列表 -func (b *Blog) List(c *gin.Context) { +func (b *Article) List(c *gin.Context) { data := make(map[string]interface{}) - pageNum, _ := strconv.Atoi(c.Query("page")) + pageNum, _ := strconv.Atoi(c.DefaultQuery("page", "1")) title := c.Query("title") maps := "title like '%" + title + "%'" - data["rows"] = service.Blog.BlogList(pageNum, utils.PageSize, maps) - data["total"] = service.Blog.GetBlogTotal(maps) + data["rows"] = service.Article.ArticleList(pageNum, setting.Config.App.PageSize, maps) + data["total"] = service.Article.GetArticleTotal(maps) response.Success(c, data, "列表返回成功了呀！") } // Detail 详情 -func (b *Blog) Detail(c *gin.Context) { +func (b *Article) Detail(c *gin.Context) { data := make(map[string]interface{}) id, _ := strconv.Atoi(c.Param("id")) - data["rows"], _ = service.Blog.BlogDetail(id) + data["rows"], _ = service.Article.ArticleDetail(id) response.Success(c, data) } // Category 种类渲染页面 -func (b *Blog) Category(c *gin.Context) { +func (b *Article) Category(c *gin.Context) { response.HTML(c, "category/index", nil) } // CategoryList 获取列表数据 -func (b *Blog) CategoryList(c *gin.Context) { +func (b *Article) CategoryList(c *gin.Context) { data := make(map[string]interface{}) - data["rows"] = service.Category.GetBlogCategoryList("4") + data["rows"] = service.Category.GetArticleCategoryList("4") response.Success(c, data) } // Edit 文章新增、编辑 -func (b *Blog) Edit(c *gin.Context) { - response.HTML(c, "blog/edit", nil) +func (b *Article) Edit(c *gin.Context) { + response.HTML(c, "article/edit", nil) } // EditMd markdown文章新增、编辑 -func (b *Blog) EditMd(c *gin.Context) { - response.HTML(c, "blog/md", nil) +func (b *Article) EditMd(c *gin.Context) { + response.HTML(c, "article/md", nil) } // Insert 新增保存 -func (b *Blog) Insert(c *gin.Context) { - blog := &model.Blog{} +func (b *Article) Insert(c *gin.Context) { + Article := &model.Article{} - if err := c.ShouldBind(&blog); err != nil { + if err := c.ShouldBind(&Article); err != nil { c.JSON(400, gin.H{ "err": err.Error(), }) return } - - err := service.Blog.Create(blog) + Article.Content = utils.RepImages(Article.Content) + err := service.Article.Create(Article) if err != nil { logrus.Error("修改失败", err) @@ -91,22 +92,22 @@ func (b *Blog) Insert(c *gin.Context) { return } - response.Success(c, blog) + response.Success(c, Article) } // Update 修改 -func (b *Blog) Update(c *gin.Context) { - blog := &model.Blog{} +func (b *Article) Update(c *gin.Context) { + Article := &model.Article{} - if err := c.ShouldBind(&blog); err != nil { + if err := c.ShouldBind(&Article); err != nil { c.JSON(400, gin.H{ "err": err.Error(), }) return } - id := strconv.Itoa(blog.Id) - err := service.Blog.Update(id, blog) + id := strconv.Itoa(Article.Id) + err := service.Article.Update(id, Article) if err != nil { logrus.Error("修改失败", err) @@ -114,13 +115,13 @@ func (b *Blog) Update(c *gin.Context) { return } - response.Success(c, blog) + response.Success(c, Article) } -// Destory 删除 -func (b *Blog) Destory(c *gin.Context) { +// Destroy 删除 +func (b *Article) Destroy(c *gin.Context) { id := c.PostForm("id") - service.Blog.Delete(id) + service.Article.Delete(id) response.Success(c, id) } diff --git a/app/controller/admin/banner.go b/app/controller/admin/banner.go index 5449d8b1ad4964d36bf44eb07f0214be09ea09e5..da9cf861fb11950507d956adc9d89bda255d84a5 100644 --- a/app/controller/admin/banner.go +++ b/app/controller/admin/banner.go @@ -80,8 +80,8 @@ func (b *Banner) Update(c *gin.Context) { response.Success(c, banner) } -// Destory 删除 -func (b *Banner) Destory(c *gin.Context) { +// Destroy 删除 +func (b *Banner) Destroy(c *gin.Context) { id := c.PostForm("id") service.Banner.Delete(id) diff --git a/app/controller/admin/category.go b/app/controller/admin/category.go index 23d2dee17a723a6915b3d8af0e5341c115f9ce15..1c5225437d38b568a17b7ca850acf9e2a099de14 100644 --- a/app/controller/admin/category.go +++ b/app/controller/admin/category.go @@ -27,7 +27,7 @@ func (cat *Category) Index(c *gin.Context) { func (cat *Category) List(c *gin.Context) { data := make(map[string]interface{}) - data["rows"] = service.Category.GetBlogCategoryList("4") + data["rows"] = service.Category.GetArticleCategoryList("4") response.Success(c, data) } diff --git a/app/controller/admin/comment.go b/app/controller/admin/comment.go index 79518e9fcaafae42022163c01e7eefe2a6979746..c75b87df9e3decd45eaa48627a6899ddb61eb678 100644 --- a/app/controller/admin/comment.go +++ b/app/controller/admin/comment.go @@ -5,7 +5,7 @@ import ( "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" "strconv" @@ -33,7 +33,7 @@ func (m *Comment) List(c *gin.Context) { maps += " and content like '%" + title + "%'" } - list := service.Comment.List(pageNum, utils.PageSize, maps) + list := service.Comment.List(pageNum, setting.PageSize, maps) data["rows"] = list data["total"] = service.Comment.Total(maps) diff --git a/app/controller/admin/controller.go b/app/controller/admin/controller.go index f267f7456a6ad25cfe47a4c8b6047f1a8842123d..5b1f2a24444af4f582976a2745ca7aa8b654d26f 100644 --- a/app/controller/admin/controller.go +++ b/app/controller/admin/controller.go @@ -1,7 +1,7 @@ package admin import ( - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" "reflect" "strings" @@ -18,7 +18,7 @@ type Controller struct { this ControllerInterface // 实例 } -var Site = utils.Site +var Site = setting.Config.Site func (ctrl *Controller) Init(this ControllerInterface) error { ctrl.this = this @@ -28,14 +28,16 @@ func (ctrl *Controller) Init(this ControllerInterface) error { return nil } -/** +/* +* action调用前回调 */ func (ctrl *Controller) beforeAction(c *gin.Context) error { return nil } -/** +/* +* action调用后回调 */ func (ctrl *Controller) afterAction(c *gin.Context) error { diff --git a/app/controller/admin/link.go b/app/controller/admin/link.go index d6807e027442939b91b4820992560f2b257fe96e..6aca49ec3a9f67861301f99d047f6e086485d0a2 100644 --- a/app/controller/admin/link.go +++ b/app/controller/admin/link.go @@ -5,7 +5,7 @@ import ( "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" "strconv" @@ -29,7 +29,7 @@ func (l *Link) List(c *gin.Context) { title := c.Query("title") maps := "title like '%" + title + "%'" - data["rows"] = service.Link.List(pageNum, utils.PageSize, maps) + data["rows"] = service.Link.List(pageNum, setting.PageSize, maps) data["total"] = service.Link.Total(maps) response.Success(c, data) diff --git a/app/controller/admin/message.go b/app/controller/admin/message.go index 6c04dc0e5dfaccf92ff0068ba720ca34e6770dd2..d3bb25d573772fbb94cd9562f70d598fa040d45d 100644 --- a/app/controller/admin/message.go +++ b/app/controller/admin/message.go @@ -5,7 +5,7 @@ import ( "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" "strconv" @@ -13,59 +13,59 @@ import ( ) type Message struct { - Base + Base } func (m *Message) Index(c *gin.Context) { - data := make(map[string]interface{}) - response.HTML(c, "message/index", data) + data := make(map[string]interface{}) + response.HTML(c, "message/index", data) } // List 列表 func (m *Message) List(c *gin.Context) { - data := make(map[string]interface{}) + data := make(map[string]interface{}) - pageNum, _ := strconv.Atoi(c.Query("page")) + pageNum, _ := strconv.Atoi(c.Query("page")) - title := c.Query("content") - maps := "content like '%" + title + "%'" + title := c.Query("content") + maps := "content like '%" + title + "%'" - data["rows"] = service.Message.List(pageNum, utils.PageSize, maps) - data["total"] = service.Message.Total(maps) + data["rows"] = service.Message.List(pageNum, setting.PageSize, maps) + data["total"] = service.Message.Total(maps) - response.Success(c, data) + response.Success(c, data) } // Insert 新增保存 func (m *Message) Insert(c *gin.Context) { - banner := &model.Message{} + banner := &model.Message{} - if err := c.ShouldBind(&banner); err != nil { - c.JSON(400, gin.H{ - "err": err.Error(), - }) - return - } + if err := c.ShouldBind(&banner); err != nil { + c.JSON(400, gin.H{ + "err": err.Error(), + }) + return + } - err := service.Message.Create(banner) + err := service.Message.Create(banner) - if err != nil { - logrus.Error("修改失败", err) - response.Fail(c, e.ErrorUpdate) - return - } + if err != nil { + logrus.Error("修改失败", err) + response.Fail(c, e.ErrorUpdate) + return + } - response.Success(c, banner) + response.Success(c, banner) } // Destory 删除 func (m *Message) Destory(c *gin.Context) { - id := strings.Split(c.PostForm("id"), ",") + id := strings.Split(c.PostForm("id"), ",") - if row := service.Message.Delete(id); row > 0 { - response.Success(c, id) - return - } + if row := service.Message.Delete(id); row > 0 { + response.Success(c, id) + return + } - response.Fail(c, e.ErrorDelete) + response.Fail(c, e.ErrorDelete) } diff --git a/app/controller/admin/system.go b/app/controller/admin/system.go index 7c922be5673cad79fd21d9de98cc6e695956c652..4aebc3820734b12af9d3ad7a1bd0063df098512e 100644 --- a/app/controller/admin/system.go +++ b/app/controller/admin/system.go @@ -1,9 +1,16 @@ package admin import ( + "gitee.com/jikey/elk-blog/app/model" + "gitee.com/jikey/elk-blog/app/service" + "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" + "github.com/spf13/viper" + "log" + "strconv" ) type System struct { @@ -21,43 +28,66 @@ func (s *System) Setting(c *gin.Context) { func (s *System) SettingList(c *gin.Context) { data := make(map[string]interface{}) - utils.SetSite() - data["rows"] = utils.Site + //setting.SetSite() + //data["rows"] = setting.Config.Site + + data["rows"] = service.System.GetSystem(1) response.Success(c, data) } // SettingUpdate 修改系统设置 func (s *System) SettingUpdate(c *gin.Context) { - var siteMap utils.SiteMap - cfg := utils.Config - site := cfg.Section("site") + system := &model.System{} - if err := c.ShouldBind(&siteMap); err != nil { + if err := c.ShouldBind(&system); err != nil { c.JSON(400, gin.H{ "err": err.Error(), }) return } - site.Key("domain").SetValue(siteMap.Domain) - site.Key("title").SetValue(siteMap.Title) - site.Key("keyword").SetValue(siteMap.Keyword) - site.Key("description").SetValue(siteMap.Description) - site.Key("email").SetValue(siteMap.Email) - site.Key("contact").SetValue(siteMap.Contact) - site.Key("company").SetValue(siteMap.Company) - site.Key("phone").SetValue(siteMap.Phone) - site.Key("icp").SetValue(siteMap.Icp) - site.Key("address").SetValue(siteMap.Address) - site.Key("tpl").SetValue(siteMap.Tpl) + systemId := strconv.Itoa(system.Id) + err := service.System.Update(systemId, system) - // ini.ReflectFrom(cfg, &siteMap) + if err != nil { + logrus.Error("修改失败： ", err) + response.Fail(c, e.ErrorUpdate) + return + } + + response.Success(c, system) +} + +// SettingUpdate 修改系统设置 +func (s *System) SettingUpdateOld(c *gin.Context) { + var siteMap setting.SiteMap - if err := cfg.SaveTo("config/env.ini"); err != nil { + if err := c.ShouldBind(&siteMap); err != nil { + c.JSON(400, gin.H{ + "err": err.Error(), + }) return } + viper.Set("site.domain", siteMap.Domain) + viper.Set("site.title", siteMap.Title) + viper.Set("site.keyword", siteMap.Keyword) + viper.Set("site.description", siteMap.Description) + viper.Set("site.email", siteMap.Email) + viper.Set("site.contact", siteMap.Contact) + viper.Set("site.company", siteMap.Company) + viper.Set("site.phone", siteMap.Phone) + viper.Set("site.icp", siteMap.Icp) + viper.Set("site.address", siteMap.Address) + viper.Set("site.tpl", siteMap.Tpl) + + // ini.ReflectFrom(cfg, &siteMap) + err := viper.WriteConfig() + if err != nil { + log.Fatal("write config failed: ", err) + return + } response.Success(c, siteMap) } diff --git a/app/controller/admin/upload.go b/app/controller/admin/upload.go index fc3b8a0e5f77d47d0ef63105a99b66afbffeb112..18a124acf9706bd9b812a5b93f15f19ca0608971 100644 --- a/app/controller/admin/upload.go +++ b/app/controller/admin/upload.go @@ -4,16 +4,19 @@ import ( "fmt" "gitee.com/jikey/elk-blog/app/model" "gitee.com/jikey/elk-blog/pkg/response" + "gitee.com/jikey/elk-blog/pkg/setting" "gitee.com/jikey/elk-blog/pkg/utils" "github.com/gin-gonic/gin" "github.com/nleeper/goment" "github.com/sirupsen/logrus" "mime/multipart" + "net/http" "os" "path/filepath" + "time" ) -// UploadImage 上传图片 +// UploadImage 上传图片，可以上传到本地或者上传到oss func UploadImage(c *gin.Context) { file, err := c.FormFile("file") data := make(map[string]interface{}) @@ -22,17 +25,44 @@ func UploadImage(c *gin.Context) { response.Fail(c, 201, "上传图片出错了") return } + filePath := "" + if setting.Config.App.UploadOss { + res, msg := uploadOss(file) + if !res { + response.Fail(c, 201, msg) + return + } + filePath = msg + } else { + filePath, err = uploadLocal(c, file) + if err != nil { + response.Fail(c, 201, "上传图片出错了") + return + } + } + + data["location"] = filePath + + //response.Success(c, data) + c.JSON(http.StatusOK, data) + return +} - // 增加时间文件不易重复，且可追溯 +// renameFileName 重命名文件名 +func renameFileName(file *multipart.FileHeader) string { + return utils.RandomString(16) + filepath.Ext(file.Filename) +} + +func uploadLocal(c *gin.Context, file *multipart.FileHeader) (string, error) { g, _ := goment.New() - dirName := fmt.Sprintf("public/uploads/blog/%s/%s/", g.Format("YYYYMMDD"), model.CurrentUserID(c)) + dirName := fmt.Sprintf("public/uploads/article/%s/%s/", g.Format("YYYYMMDD"), model.CurrentUserID(c)) // 如果没有path文件目录就创建一个 if _, err := os.Stat(dirName); err != nil { if !os.IsExist(err) { err2 := os.MkdirAll(dirName, os.ModePerm) if err2 != nil { - return + return "", err } logrus.Info("创建文件夹:" + dirName) @@ -42,20 +72,49 @@ func UploadImage(c *gin.Context) { filePath := dirName + renameFileName(file) // 上传到指定目录 - err = c.SaveUploadedFile(file, filePath) + err := c.SaveUploadedFile(file, filePath) if err != nil { - response.Fail(c, 201, err.Error()) - return + return "", err + } + return filePath, nil +} + +func uploadOss(file *multipart.FileHeader) (bool, string) { + fileExt := filepath.Ext(file.Filename) + allowExts := []string{".jpg", ".png", ".gif", ".jpeg"} + allowFlag := false + for _, ext := range allowExts { + if ext == fileExt { + allowFlag = true + break + } + } + if !allowFlag { + return false, "不允许的类型" } - data["path"] = filePath + now := time.Now() + //文件存放路径 + //fileDir := fmt.Sprintf("articles/%s", now.Format("200601")) + //fileDir := fmt.Sprintf("article") - response.Success(c, data) - return -} + //文件名称 + timeStamp := now.Unix() + //fileName := fmt.Sprintf("%d%s", timeStamp, fileExt) + // 文件key + //fileKey := filepath.Join(fileDir, fileName) + fileKey := fmt.Sprintf("article/%d%s", timeStamp, fileExt) -// renameFileName 重命名文件名 -func renameFileName(file *multipart.FileHeader) string { - return utils.RandomString(16) + filepath.Ext(file.Filename) + src, err := file.Open() + if err != nil { + return false, "上传失败" + } + defer src.Close() + + res, err := utils.OssUpload(fileKey, src) + if err != nil { + return false, "上传失败" + } + return true, res } diff --git a/app/controller/admin/user.go b/app/controller/admin/user.go index 74f8b6fa38d6126c622aa7d572fc57dfdbb81cac..3c3a040fda3696d4d5fc17e35f50fc19454f3b59 100644 --- a/app/controller/admin/user.go +++ b/app/controller/admin/user.go @@ -6,7 +6,7 @@ import ( "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" "strconv" @@ -50,7 +50,7 @@ func (u *User) List(c *gin.Context) { username := c.Query("username") maps := "username like '%" + username + "%'" - rows, total := service.User.List(pageNum, utils.PageSize, maps) + rows, total := service.User.List(pageNum, setting.PageSize, maps) fmt.Println("rows: ", rows) data["rows"] = rows diff --git a/app/controller/home/about.go b/app/controller/home/about.go index a3d26d8a38b056d005530f8a6a6c7bbf4f954d32..e3095c34757be9b7fdc8264e971b2e15c2492230 100644 --- a/app/controller/home/about.go +++ b/app/controller/home/about.go @@ -1,6 +1,7 @@ package home import ( + "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/response" "github.com/gin-gonic/gin" ) @@ -11,8 +12,9 @@ type About struct { func (about *About) Index(c *gin.Context) { data := make(map[string]interface{}) - data["site"] = Site + data["site"] = service.System.GetSystem(1) data["active"] = "about" + data["about"], _ = service.About.AboutDetail(1) response.Render(c, "about/index", data) } diff --git a/app/controller/home/blog.go b/app/controller/home/article.go similarity index 41% rename from app/controller/home/blog.go rename to app/controller/home/article.go index ede45692d66b1ff87b9f992478868917e9e29861..4a467439697e6a3a8240a57dbf172072f2fec022 100644 --- a/app/controller/home/blog.go +++ b/app/controller/home/article.go @@ -5,6 +5,7 @@ import ( "gitee.com/jikey/elk-blog/app/model" "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/response" + "gitee.com/jikey/elk-blog/pkg/setting" "gitee.com/jikey/elk-blog/pkg/utils" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" @@ -12,46 +13,47 @@ import ( "strconv" ) -type Blog struct { +type Article struct { Controller } func init() { - blog := &Blog{} - _ = blog.Init(blog) - blog.Menu() + Article := &Article{} + _ = Article.Init(Article) + Article.Menu() Elk = make(map[interface{}]interface{}) - Elk["Menu"] = blog.Data["Menu"] - Elk["BlogCategory"] = blog.Data["BlogCategory"] - Elk["ArchiveList"] = blog.Data["ArchiveList"] + Elk["Menu"] = Article.Data["Menu"] + Elk["ArticleCategory"] = Article.Data["ArticleCategory"] + Elk["ArchiveList"] = Article.Data["ArchiveList"] } // Index 首页 -func (b *Blog) Index(c *gin.Context) { +func (b *Article) Index(c *gin.Context) { data := make(map[string]interface{}) - pageNum, _ := strconv.Atoi(c.Query("page")) + pageNum, _ := strconv.Atoi(c.DefaultQuery("page", "1")) keywords := c.Query("keywords") - maps := "(tk_blog.status = 1) AND (title like '%" + keywords + "%')" + maps := "(tk_article.status = 1) AND (title like '%" + keywords + "%')" // 获取分页数据 - page := utils.NewPagination(c.Request, service.Blog.GetBlogTotal(maps), utils.PageSize) + page := utils.NewPagination(c.Request, service.Article.GetArticleTotal(maps), setting.Config.App.PageSize) data["page"] = template.HTML(page.Pages()) data["menu"] = Elk["Menu"] - data["blogCategory"] = Elk["BlogCategory"] - data["archiveList"] = service.Blog.BlogArchiveList() - data["list"] = service.Blog.BlogList(pageNum, utils.PageSize, maps) + data["articleCategory"] = service.Category.GetArticleCategoryList("4") + data["archiveList"] = service.Article.ArticleArchiveList() + data["list"] = service.Article.ArticleList(pageNum, setting.Config.App.PageSize, maps) data["link"] = service.Link.List(1, 100, "") - data["site"] = Site - data["active"] = "blog" + //data["site"] = Site + data["site"] = service.System.GetSystem(1) + data["active"] = "article" - response.Render(c, "blog/index", data) + response.Render(c, "article/index", data) } // Detail 详情 -func (b *Blog) Detail(c *gin.Context) { +func (b *Article) Detail(c *gin.Context) { data := make(map[string]interface{}) id, _ := strconv.Atoi(c.Param("id")) @@ -59,25 +61,25 @@ func (b *Blog) Detail(c *gin.Context) { maps := "bid=" + c.Param("id") - detail, _ := service.Blog.BlogDetail(id) - data["blog"] = detail - data["blogCategory"] = Elk["BlogCategory"] - data["archiveList"] = service.Blog.BlogArchiveList() + detail, _ := service.Article.ArticleDetail(id) + data["article"] = detail + data["articleCategory"] = service.Category.GetArticleCategoryList("4") + data["archiveList"] = service.Article.ArticleArchiveList() - data["commentList"] = service.Comment.List(pageNum, utils.PageSize, maps) + data["commentList"] = service.Comment.List(pageNum, setting.PageSize, maps) data["commentTotal"] = service.Comment.Total(maps) - data["prev"] = service.Blog.GetPrevNextBlog(detail.Createtime, "prev") - data["next"] = service.Blog.GetPrevNextBlog(detail.Createtime, "next") + data["prev"] = service.Article.GetPrevNextArticle(detail.CreateTime, "prev") + data["next"] = service.Article.GetPrevNextArticle(detail.CreateTime, "next") data["link"] = service.Link.List(1, 100, "") - data["site"] = Site - data["active"] = "blog" + data["site"] = service.System.GetSystem(1) + data["active"] = "article" - response.Render(c, "blog/detail", data) + response.Render(c, "article/detail", data) } // Archive 归档 -func (b *Blog) Archive(c *gin.Context) { +func (b *Article) Archive(c *gin.Context) { data := make(map[string]interface{}) pageNum, _ := strconv.Atoi(c.Query("page")) @@ -85,21 +87,21 @@ func (b *Blog) Archive(c *gin.Context) { id := c.Param("id") // 获取分页数据 - page := utils.NewPagination(c.Request, total, utils.PageSize) + page := utils.NewPagination(c.Request, total, setting.PageSize) data["page"] = template.HTML(page.Pages()) - data["blogCategory"] = Elk["BlogCategory"] - data["archiveList"] = service.Blog.BlogArchiveList() - data["list"] = service.Blog.GetArchive(pageNum, utils.PageSize, id) + data["articleCategory"] = service.Category.GetArticleCategoryList("4") + data["archiveList"] = service.Article.ArticleArchiveList() + data["list"] = service.Article.GetArchive(pageNum, setting.PageSize, id) data["link"] = service.Link.List(1, 100, "") - data["site"] = Site - data["active"] = "blog" + data["site"] = service.System.GetSystem(1) + data["active"] = "article" response.Render(c, "archive/index", data) } // Category 分类 -func (b *Blog) Category(c *gin.Context) { +func (b *Article) Category(c *gin.Context) { data := make(map[string]interface{}) maps := make(map[string]interface{}) @@ -109,21 +111,21 @@ func (b *Blog) Category(c *gin.Context) { maps["catid"] = id // 获取分页数据 - page := utils.NewPagination(c.Request, service.Blog.GetBlogTotal(maps), utils.PageSize) + page := utils.NewPagination(c.Request, service.Article.GetArticleTotal(maps), setting.PageSize) data["page"] = template.HTML(page.Pages()) - data["blogCategory"] = Elk["BlogCategory"] - data["archiveList"] = service.Blog.BlogArchiveList() - data["list"] = service.Blog.BlogList(pageNum, utils.PageSize, maps) + data["articleCategory"] = service.Category.GetArticleCategoryList("4") + data["archiveList"] = service.Article.ArticleArchiveList() + data["list"] = service.Article.ArticleList(pageNum, setting.PageSize, maps) data["link"] = service.Link.List(1, 100, "") - data["site"] = Site - data["active"] = "blog" + data["site"] = service.System.GetSystem(1) + data["active"] = "article" response.Render(c, "category/index", data) } // Search 搜索 -func (b *Blog) Search(c *gin.Context) { +func (b *Article) Search(c *gin.Context) { data := make(map[string]interface{}) maps := make(map[string]interface{}) @@ -142,31 +144,31 @@ func (b *Blog) Search(c *gin.Context) { maps["title"] = keywords // 获取分页数据 - page := utils.NewPagination(c.Request, service.Blog.GetBlogTotal(maps), utils.PageSize) + page := utils.NewPagination(c.Request, service.Article.GetArticleTotal(maps), setting.PageSize) data["page"] = template.HTML(page.Pages()) - data["list"] = service.Blog.BlogList(pageNum, utils.PageSize, maps) - data["site"] = Site - data["active"] = "blog" + data["list"] = service.Article.ArticleList(pageNum, setting.PageSize, maps) + data["site"] = service.System.GetSystem(1) + data["active"] = "article" - response.Render(c, "blog/search", data) + response.Render(c, "article/search", data) } // Likes 点赞 -func (b *Blog) Likes(c *gin.Context) { +func (b *Article) Likes(c *gin.Context) { id := c.Param("id") - blog := &model.Blog{} + Article := &model.Article{} - if err := c.ShouldBind(&blog); err != nil { + if err := c.ShouldBind(&Article); err != nil { c.JSON(400, gin.H{ "err": err.Error(), }) return } - fmt.Println("blog", blog.Likes) + fmt.Println("Article", Article.Likes) - service.Blog.UpdateField(id, "likes", blog.Likes) + service.Article.UpdateField(id, "likes", Article.Likes) - response.Success(c, blog.Likes) + response.Success(c, Article.Likes) } diff --git a/app/controller/home/category.go b/app/controller/home/category.go index 6d7ced60a218bd9dfd6c1be3053ee94f46e151d4..20b6ba1cfef777bb41f901743058b89dc932c4c9 100644 --- a/app/controller/home/category.go +++ b/app/controller/home/category.go @@ -13,9 +13,9 @@ type Category struct { func (category *Category) Index(c *gin.Context) { data := make(map[string]interface{}) - data["list"] = service.Blog.BlogList(1, 10, nil) + data["list"] = service.Article.ArticleList(1, 10, nil) data["link"] = service.Link.List(1, 100, "") - data["site"] = Site + data["site"] = service.System.GetSystem(1) - response.Render(c, "blog/index", data) + response.Render(c, "article/index", data) } diff --git a/app/controller/home/comment.go b/app/controller/home/comment.go index a7b12cb61084c02238e5b1e93826c4843c148673..f8f49968b86ce5636dc78c8bc0f8dc025de55f8b 100644 --- a/app/controller/home/comment.go +++ b/app/controller/home/comment.go @@ -5,7 +5,7 @@ import ( "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" "strconv" @@ -24,7 +24,7 @@ func (m *Comment) List(c *gin.Context) { title := c.Query("content") maps := "content like '%" + title + "%'" - data["rows"] = service.Comment.List(pageNum, utils.PageSize, maps) + data["rows"] = service.Comment.List(pageNum, setting.PageSize, maps) data["total"] = service.Comment.Total(maps) response.Success(c, data) diff --git a/app/controller/home/controller.go b/app/controller/home/controller.go index e5c1396a53fa69af9fa4168bbeae9277790fa18d..9dc4bc8ac95cb568b264289c3f24168645bf09f1 100644 --- a/app/controller/home/controller.go +++ b/app/controller/home/controller.go @@ -2,7 +2,7 @@ package home import ( "gitee.com/jikey/elk-blog/app/service" - "gitee.com/jikey/elk-blog/pkg/utils" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" "reflect" "strings" @@ -21,7 +21,7 @@ type Controller struct { this ControllerInterface // 实例 } -var Site = utils.Site +var Site = setting.Config.Site func (ctrl *Controller) Init(this ControllerInterface) error { ctrl.this = this @@ -32,14 +32,16 @@ func (ctrl *Controller) Init(this ControllerInterface) error { return nil } -/** +/* +* action调用前回调 */ func (ctrl *Controller) beforeAction(context *gin.Context) error { return nil } -/** +/* +* action调用后回调 */ func (ctrl *Controller) afterAction(context *gin.Context) error { @@ -48,5 +50,5 @@ func (ctrl *Controller) afterAction(context *gin.Context) error { func (ctrl *Controller) Menu() { ctrl.Data["Menu"] = "menu" - ctrl.Data["BlogCategory"] = service.Category.GetBlogCategoryList("4") + ctrl.Data["ArticleCategory"] = service.Category.GetArticleCategoryList("4") } diff --git a/app/controller/home/index.go b/app/controller/home/index.go index 4a164bc0c16705ad7bc4fc30da6800004960378f..48c3fab939156d8696c5c45d20f15daaf6e478f3 100644 --- a/app/controller/home/index.go +++ b/app/controller/home/index.go @@ -21,20 +21,21 @@ func init() { index.Menu() Elk = make(map[interface{}]interface{}) Elk["Menu"] = index.Data["Menu"] - Elk["BlogCategory"] = index.Data["BlogCategory"] + Elk["ArticleCategory"] = index.Data["ArticleCategory"] } func (index *Index) Index(c *gin.Context) { data := make(map[string]interface{}) - data["site"] = Site + data["site"] = service.System.GetSystem(1) + //data["site"] = Site data["active"] = "index" data["advs"] = service.Banner.List("") data["link"] = service.Link.List(1, 100, "") - data["archiveList"] = service.Blog.BlogArchiveList() - data["blogList"] = service.Blog.BlogList(1, 10, "tk_blog.status = 1") + data["archiveList"] = service.Article.ArticleArchiveList() + data["articleList"] = service.Article.ArticleList(1, 10, "tk_article.status = 1") data["menu"] = index.Data["Menu"] - data["blogCategory"] = Elk["BlogCategory"] + data["articleCategory"] = service.Category.GetArticleCategoryList("4") data["time"] = utils.GetTime() response.Render(c, "index/index", data) diff --git a/app/controller/home/message.go b/app/controller/home/message.go index 9f6bc2f13d62fbffd804e854cc2a0cb3ccade599..fb7b601de54c2d7ed48fa1394c5e99e21a2267fd 100644 --- a/app/controller/home/message.go +++ b/app/controller/home/message.go @@ -5,6 +5,7 @@ import ( "gitee.com/jikey/elk-blog/app/service" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" + "gitee.com/jikey/elk-blog/pkg/setting" "gitee.com/jikey/elk-blog/pkg/utils" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" @@ -23,13 +24,13 @@ func (message *Message) Index(c *gin.Context) { maps := make(map[string]interface{}) // 获取分页数据 - page := utils.NewPagination(c.Request, service.Message.Total(maps), utils.PageSize) + page := utils.NewPagination(c.Request, service.Message.Total(maps), setting.PageSize) data["page"] = template.HTML(page.Pages()) data["list"] = service.Message.List(pageNum, 3000, maps) data["link"] = service.Link.List(1, 100, "") - data["archiveList"] = service.Blog.BlogArchiveList() - data["blogCategory"] = Elk["BlogCategory"] - data["site"] = Site + data["archiveList"] = service.Article.ArticleArchiveList() + data["articleCategory"] = service.Category.GetArticleCategoryList("4") + data["site"] = service.System.GetSystem(1) data["active"] = "message" response.Render(c, "message/index", data) diff --git a/app/database/mysql.go b/app/database/mysql.go deleted file mode 100644 index 30dc97fdeea61ac350a20ab279e3a384d7d45dc0..0000000000000000000000000000000000000000 --- a/app/database/mysql.go +++ /dev/null @@ -1,76 +0,0 @@ -package database - -import ( - "fmt" - "gitee.com/jikey/elk-blog/pkg/utils" - _ "github.com/go-sql-driver/mysql" - "github.com/jinzhu/gorm" - "log" - "time" -) - -var Mysql *gorm.DB - -func init() { - dbSetup() -} - -/** -数据库初始化 -*/ -func dbSetup() { - // dsn := "root:88888888@/elk-blog?charset=utf8&parseTime=True&loc=Local" - - var ( - err error - dbType, dbName, user, password, host, tablePrefix string - ) - - sec := utils.Config.Section("database") - - dbType = sec.Key("type").String() - dbName = sec.Key("dbname").String() - user = sec.Key("user").String() - password = sec.Key("password").String() - host = sec.Key("host").String() - tablePrefix = sec.Key("table_prefix").String() - - Mysql, err = gorm.Open( - dbType, - fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8", - user, - password, - host, - dbName, - )) - - // defer Mysql.Close() - - if err != nil { - panic(err) - } - - // 设置默认表名的命名规则 - gorm.DefaultTableNameHandler = func(Mysql *gorm.DB, defaultTableName string) string { - return tablePrefix + defaultTableName - } - Mysql.SingularTable(true) // 全局禁用表名复数 - Mysql.DB().SetMaxIdleConns(25) // 设置最大空闲连接数 - Mysql.DB().SetMaxOpenConns(100) // 设置最大连接数 - Mysql.DB().SetConnMaxLifetime(5 * time.Minute) // 设置每个链接的过期时间 - - // 启用Logger，显示详细日志 - Mysql.LogMode(true) - - // 调试单个操作，显示此操作的详细日志 - // Mysql.Debug().Where("name = ?", "jinzhu").First(&User{}) -} - -func CloseDB() { - defer func() { - err := Mysql.Close() - if err != nil { - log.Fatal(err) - } - }() -} diff --git a/app/model/about.go b/app/model/about.go new file mode 100644 index 0000000000000000000000000000000000000000..bbb0011505403318edbbb278f15d03bda87913e3 --- /dev/null +++ b/app/model/about.go @@ -0,0 +1,6 @@ +package model + +type About struct { + BaseModel + Content string `gorm:"column:content" json:"content" form:"content"` +} diff --git a/app/model/article.go b/app/model/article.go new file mode 100644 index 0000000000000000000000000000000000000000..d8252e73745c7ea3adf02e45057ffb735f66042e --- /dev/null +++ b/app/model/article.go @@ -0,0 +1,31 @@ +package model + +import ( + "errors" +) + +type Article struct { + BaseModel + Category Category `gorm:"foreignkey:Catid"` + Title string `gorm:"column:title" json:"title" form:"title"` + Content string `gorm:"column:content" json:"content" form:"content"` + Md string `gorm:"column:md" json:"md" form:"md"` + Description string `gorm:"column:description" json:"description" form:"description"` + Catid int `gorm:"column:catid" json:"catid" form:"catid"` + //CategoryId int `gorm:"column:category_id" json:"category_id" form:"category_id"` + Status int `gorm:"column:status" json:"status" form:"status"` + Likes int `gorm:"column:likes" json:"likes" form:"likes"` + Views int `gorm:"column:views" json:"views" form:"views"` + Avatar string `gorm:"column:avatar;type:varchar(200)" json:"avatar"` + Author string `gorm:"column:author" json:"author" form:"author"` + Total string `gorm:"-"` + SourceUrl string `gorm:"column:source_url;type:varchar(200)" json:"source_url"` + ColTitle string `gorm:"column:colTitle" json:"colTitle"` +} + +func (b *Article) IsValid() (err error) { + if b.Title == "" { + err = errors.New("标题不能为空") + } + return +} diff --git a/app/model/base.go b/app/model/base.go deleted file mode 100644 index ada55686a27e73f0585c113384498d4e42cd7fd2..0000000000000000000000000000000000000000 --- a/app/model/base.go +++ /dev/null @@ -1,45 +0,0 @@ -package model - -import ( - "gitee.com/jikey/elk-blog/pkg/utils" - "github.com/jinzhu/gorm" - "github.com/spf13/cast" -) - -// BaseModel 基础model -type BaseModel struct { - Id int `gorm:"primary_key;autoIncrement;column:id" json:"id,omitempty"` - Createtime string `gorm:"column:create_time" json:"create_time,omitempty" form:"create_time"` - Updatetime string `gorm:"column:update_time" json:"update_time,omitempty" form:"update_time"` -} - -func (v *BaseModel) BeforeCreate(scope *gorm.Scope) error { - err := scope.SetColumn("create_time", utils.NowTime()) - - if err != nil { - return err - } - - err2 := scope.SetColumn("update_time", utils.NowTime()) - - if err != nil { - return err2 - } - - return nil -} - -func (v *BaseModel) BeforeUpdate(scope *gorm.Scope) error { - err := scope.SetColumn("update_time", utils.NowTime()) - - if err != nil { - return err - } - - return nil -} - -// StringID 获取 ID 的字符串格式 -func (v *BaseModel) StringID() string { - return cast.ToString(v.Id) -} diff --git a/app/model/blog.go b/app/model/blog.go deleted file mode 100644 index 4033b089e38378db3331e63f8120ada2cdd6aff4..0000000000000000000000000000000000000000 --- a/app/model/blog.go +++ /dev/null @@ -1,28 +0,0 @@ -package model - -import ( - "errors" -) - -type Blog struct { - BaseModel - Title string `gorm:"column:title" json:"title" form:"title"` - Content string `gorm:"column:content" json:"content" form:"content"` - Md string `gorm:"column:md" json:"md" form:"md"` - Description string `gorm:"column:description" json:"description" form:"description"` - Catid int `gorm:"column:catid" json:"catid" form:"catid"` - Status int `gorm:"column:status" json:"status" form:"status"` - Likes int `gorm:"column:likes" json:"likes" form:"likes"` - Views int `gorm:"column:views" json:"views" form:"views"` - Avatar string `gorm:"column:avatar;type:varchar(200)" json:"avatar"` - Author string `gorm:"column:author" json:"author" form:"author"` - Total string `gorm:"-"` - ColTitle string `gorm:"column:colTitle" json:"colTitle"` -} - -func (b *Blog) IsValid() (err error) { - if b.Title == "" { - err = errors.New("标题不能为空") - } - return -} diff --git a/app/model/model.go b/app/model/model.go new file mode 100644 index 0000000000000000000000000000000000000000..b448132b3681c9112b791e4d55bbe0607122e4ce --- /dev/null +++ b/app/model/model.go @@ -0,0 +1,155 @@ +package model + +import ( + "fmt" + "github.com/spf13/cast" + "log" + + "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/mysql" + + "gitee.com/jikey/elk-blog/pkg/setting" + "time" +) + +var Mysql *gorm.DB + +type BaseModel struct { + Id int `gorm:"primary_key;autoIncrement;column:id" json:"id,omitempty" form:"id"` + CreateTime string `gorm:"column:create_time" json:"create_time,omitempty" form:"create_time"` + UpdateTime string `gorm:"column:update_time" json:"update_time,omitempty" form:"update_time"` +} + +// Setup initializes the database instance +func init() { + var err error + Mysql, err = gorm.Open(setting.Config.Database.Type, fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local", + setting.Config.Database.User, + setting.Config.Database.Password, + setting.Config.Database.Host, + setting.Config.Database.DbName)) + + if err != nil { + log.Fatalf("models.Setup err: %v", err) + } + + gorm.DefaultTableNameHandler = func(db *gorm.DB, defaultTableName string) string { + return setting.Config.Database.TablePrefix + defaultTableName + } + + Mysql.SingularTable(true) + Mysql.Callback().Create().Replace("gorm:update_time_stamp", updateTimeStampForCreateCallback) + Mysql.Callback().Update().Replace("gorm:update_time_stamp", updateTimeStampForUpdateCallback) + Mysql.Callback().Delete().Replace("gorm:delete", deleteCallback) + Mysql.DB().SetMaxIdleConns(25) // 设置最大空闲连接数 + Mysql.DB().SetMaxOpenConns(100) // 设置最大连接数 + Mysql.DB().SetConnMaxLifetime(5 * time.Minute) // 设置每个链接的过期时间 + + // 启用Logger，显示详细日志 + Mysql.LogMode(true) +} + +// CloseDB closes database connection (unnecessary) +func CloseDB() { + defer func(Mysql *gorm.DB) { + err := Mysql.Close() + if err != nil { + log.Fatal(err) + } + }(Mysql) +} + +// updateTimeStampForCreateCallback will set `CreatedOn`, `ModifiedOn` when creating +func updateTimeStampForCreateCallback(scope *gorm.Scope) { + if !scope.HasError() { + //nowTime := time.Now().Unix() + nowTime := time.Now().Format("2006-01-02 15:04:05") + if createTimeField, ok := scope.FieldByName("CreateTime"); ok { + if createTimeField.IsBlank { + createTimeField.Set(nowTime) + } + } + + if modifyTimeField, ok := scope.FieldByName("UpdateTime"); ok { + if modifyTimeField.IsBlank { + modifyTimeField.Set(nowTime) + } + } + } +} + +// updateTimeStampForUpdateCallback will set `ModifiedOn` when updating +func updateTimeStampForUpdateCallback(scope *gorm.Scope) { + if _, ok := scope.Get("gorm:update_column"); !ok { + scope.SetColumn("UpdateTime", time.Now().Format("2006-01-02 15:04:05")) + } +} + +// deleteCallback will set `DeletedOn` where deleting +func deleteCallback(scope *gorm.Scope) { + if !scope.HasError() { + var extraOption string + if str, ok := scope.Get("gorm:delete_option"); ok { + extraOption = fmt.Sprint(str) + } + + deletedOnField, hasDeletedOnField := scope.FieldByName("DeletedOn") + + if !scope.Search.Unscoped && hasDeletedOnField { + scope.Raw(fmt.Sprintf( + "UPDATE %v SET %v=%v%v%v", + scope.QuotedTableName(), + scope.Quote(deletedOnField.DBName), + scope.AddToVars(time.Now().Format("2006-01-02 15:04:05")), + addExtraSpaceIfExist(scope.CombinedConditionSql()), + addExtraSpaceIfExist(extraOption), + )).Exec() + } else { + scope.Raw(fmt.Sprintf( + "DELETE FROM %v%v%v", + scope.QuotedTableName(), + addExtraSpaceIfExist(scope.CombinedConditionSql()), + addExtraSpaceIfExist(extraOption), + )).Exec() + } + } +} + +// addExtraSpaceIfExist adds a separator +func addExtraSpaceIfExist(str string) string { + if str != "" { + return " " + str + } + return "" +} + +func (v *BaseModel) BeforeCreate(scope *gorm.Scope) error { + err := scope.SetColumn("create_time", time.Now().Format("2006-01-02 15:04:05")) + + if err != nil { + return err + } + + err2 := scope.SetColumn("update_time", time.Now().Format("2006-01-02 15:04:05")) + + if err != nil { + return err2 + } + + return nil +} + +func (v *BaseModel) BeforeUpdate(scope *gorm.Scope) error { + err := scope.SetColumn("update_time", time.Now().Format("2006-01-02 15:04:05")) + + if err != nil { + return err + } + + return nil +} + +// StringID 获取 ID 的字符串格式 +func (v *BaseModel) StringID() string { + return cast.ToString(v.Id) +} diff --git a/app/model/system.go b/app/model/system.go new file mode 100644 index 0000000000000000000000000000000000000000..19f58a1548ba303ddf4f62bbe763a3aa0c7b39d5 --- /dev/null +++ b/app/model/system.go @@ -0,0 +1,19 @@ +package model + +type System struct { + BaseModel + Domain string `gorm:"column:domain" json:"domain" form:"domain"` + SiteName string `gorm:"column:site_name" json:"site_name" form:"site_name"` + Description string `gorm:"column:description" json:"description" form:"description"` + Keyword string `gorm:"column:keyword" json:"keyword" form:"keyword"` + Email string `gorm:"column:email" json:"email" form:"email"` + Contact string `gorm:"column:contact" json:"contact" form:"contact"` + Company string `gorm:"column:company" json:"company" form:"company"` + Record string `gorm:"column:record" json:"record" form:"record"` + Phone string `gorm:"column:phone" json:"phone" form:"phone"` + Icp string `gorm:"column:icp" json:"icp" form:"icp"` + Address string `gorm:"column:address" json:"address" form:"address"` + Tpl string `gorm:"column:tpl" json:"tpl" form:"tpl"` + AllowComment bool `gorm:"column:allow_comment" json:"allow_comment" form:"allow_comment"` + ShowBanner bool `gorm:"column:show_banner" json:"show_banner" form:"show_banner"` +} diff --git a/app/model/user.go b/app/model/user.go index e5376cddd150e1828b0ca674118fd4a0393da2a1..a6e96eeeb9129503d4997b8e366e8bbbb22a9575 100644 --- a/app/model/user.go +++ b/app/model/user.go @@ -26,7 +26,8 @@ type User struct { Address string `gorm:"column:address;type:varchar(255)" json:"address"` } -/** +/* +* 校验用户名 */ func (u *User) checkName() (err error) { diff --git a/app/service/about.go b/app/service/about.go new file mode 100644 index 0000000000000000000000000000000000000000..97f68569191d34cb168316140dd73913b1020b6d --- /dev/null +++ b/app/service/about.go @@ -0,0 +1,44 @@ +package service + +import ( + "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" +) + +type about struct { +} + +var About *about + +// GetBy 查询 +func (b *about) GetBy(field, value string) (blog model.About) { + db.Mysql.Where("? = ?", field, value).First(&blog) + return +} + +// AboutDetail 获取 about 详情 +func (b *about) AboutDetail(id int) (mblog model.About, err error) { + err = db.Mysql.First(&mblog, id).Error + db.Mysql.Model(&mblog).Where("id = ?", id) + return +} + +// Create 新增 +func (b *about) Create(model *model.About) (err error) { + err = db.Mysql.Omit("ColTitle").Create(model).Error + + return err +} + +// Update 修改 +func (b *about) Update(id string, model *model.About) (err error) { + err = db.Mysql.Model(&model).Where("id = ? ", id).Updates(model).Error + + return err +} + +// UpdateField 修改某一字段 +func (b *about) UpdateField(id string, key string, value interface{}) { + mBlog := &model.About{} + db.Mysql.Model(&mBlog).Where("id = ?", id).Update(key, value) +} diff --git a/app/service/article.go b/app/service/article.go new file mode 100644 index 0000000000000000000000000000000000000000..c7cee745b6d7d4573c5c23b7bf37f45f1b5c8a7f --- /dev/null +++ b/app/service/article.go @@ -0,0 +1,120 @@ +package service + +import ( + "fmt" + "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" + "github.com/jinzhu/gorm" + "github.com/spf13/cast" + "strings" +) + +type article struct { +} + +var Article *article + +// ArticleList 获取 article 列表 +func (b *article) ArticleList(PageNum int, PageSize int, maps interface{}) (article []model.Article) { + condition := "left join tk_category on tk_category.colId = tk_article.catid" + db.Mysql.Where(maps).Offset((PageNum - 1) * PageSize).Limit(PageSize).Order("ord asc, id desc").Select("tk_article.*, tk_category.colTitle").Joins(condition).Find(&article) + return +} + +// GetBy 查询 +func (b *article) GetBy(field, value string) (article []model.Article) { + db.Mysql.Where("? = ?", field, value).First(&article) + return +} + +// GetArchiveList 获取归档列表 +func (b *article) GetArchiveList(PageNum int, PageSize int, maps interface{}) (article []model.Article) { + db.Mysql.Where(maps).Offset((PageNum - 1) * PageSize).Limit(PageSize).Order("ord asc, id desc").Find(&article) + return +} + +// ArticleDetail 获取 article 详情 +func (b *article) ArticleDetail(id int) (marticle model.Article, err error) { + err = db.Mysql.First(&marticle, id).Error + db.Mysql.Model(&marticle).Where("id = ?", id).UpdateColumn("views", gorm.Expr("views + ?", 1)) + return +} + +// GetArticleTotal 获取 article 总记录数 +func (b *article) GetArticleTotal(maps interface{}) (count int) { + db.Mysql.Model(&article{}).Where(maps).Count(&count) + return +} + +// Create 新增 +func (b *article) Create(model *model.Article) (err error) { + err = db.Mysql.Omit("ColTitle").Create(model).Error + + return err +} + +// Update 修改 +func (b *article) Update(id string, model *model.Article) (err error) { + err = db.Mysql.Model(&model).Where("id = ? ", id).Omit("ColTitle").Updates(model).Error + + return err +} + +// UpdateField 修改某一字段 +func (b *article) UpdateField(id string, key string, value interface{}) { + marticle := &model.Article{} + db.Mysql.Model(&marticle).Where("id = ?", id).Update(key, value) +} + +// Delete 删除 +func (b *article) Delete(id string) bool { + db.Mysql.Where("id = ?", id).Delete(&article{}) + + return true +} + +// ArticleArchiveList 归档列表 +func (b *article) ArticleArchiveList() (archive []model.Archive) { + //sql := "select count(DATE_FORMAT(create_time, '%Y-%m')) as Count, DATE_FORMAT(create_time, '%Y-%m') as Time, create_time as CreateTime from tk_article group by Time order by Time desc" + sql := "(select count(DATE_FORMAT(create_time, '%Y')) as Count, DATE_FORMAT(create_time, '%Y') as Time,create_time" + + " as CreateTime from tk_article WHERE YEAR(create_time) < YEAR(NOW()) group by Time order by Time desc) union " + + "(select count(DATE_FORMAT(create_time, '%Y-%m')) as Count,DATE_FORMAT(create_time, '%Y-%m') as" + + " Time,create_time as CreateTime from tk_article WHERE YEAR(create_time) = YEAR(NOW()) group by " + + "Time order by Time desc)" + db.Mysql.Raw(sql).Scan(&archive) + + return +} + +// GetArchive 归档列表 +func (b *article) GetArchive(PageNum int, PageSize int, ctime string) (article []model.Article) { + if find := strings.Contains(ctime, "-"); find { + fmt.Println("find the character.") + } else { + fmt.Println("do not find the character.") + } + db.Mysql.Where("create_time like ?", "%"+ctime+"%").Offset((PageNum - 1) * PageSize).Limit(PageSize).Order("ord asc, id desc").Find(&article) + return +} + +// GetPrevNextArticle 获取上一篇下一篇 +func (b *article) GetPrevNextArticle(ctime string, dir string) (link string) { + article := &model.Article{} + var maps, order string + + if dir == "prev" { + maps = fmt.Sprintf("create_time > '%s'", ctime) + order = "asc" + } + + if dir == "next" { + maps = fmt.Sprintf("create_time < '%s'", ctime) + order = "desc" + } + + db.Mysql.Where(maps).Order("ord asc,create_time " + order).First(&article) + + link = fmt.Sprintf("%s", cast.ToString(article.Id), article.Title) + + return +} diff --git a/app/service/banner.go b/app/service/banner.go index fbffefb7df4ac88a68e0e245f10ed3994d36ab19..d403cd003e75b4c03355e6e71069a281ceef5510 100644 --- a/app/service/banner.go +++ b/app/service/banner.go @@ -1,8 +1,8 @@ package service import ( - db "gitee.com/jikey/elk-blog/app/database" "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" ) type banner struct { diff --git a/app/service/blog.go b/app/service/blog.go deleted file mode 100644 index 14ea0f58c4477218f76a77888767d68688fe8423..0000000000000000000000000000000000000000 --- a/app/service/blog.go +++ /dev/null @@ -1,109 +0,0 @@ -package service - -import ( - "fmt" - db "gitee.com/jikey/elk-blog/app/database" - "gitee.com/jikey/elk-blog/app/model" - "github.com/jinzhu/gorm" - "github.com/spf13/cast" -) - -type blog struct { -} - -var Blog *blog - -// BlogList 获取 blog 列表 -func (b *blog) BlogList(PageNum int, PageSize int, maps interface{}) (blog []model.Blog) { - condition := "left join tk_category on tk_category.colId = tk_blog.catid" - db.Mysql.Where(maps).Offset((PageNum - 1) * PageSize).Limit(PageSize).Order("ord asc, id desc").Select("tk_blog.*, tk_category.colTitle").Joins(condition).Find(&blog) - return -} - -// GetBy 查询 -func (b *blog) GetBy(field, value string) (blog []model.Blog) { - db.Mysql.Where("? = ?", field, value).First(&blog) - return -} - -// GetArchiveList 获取归档列表 -func (b *blog) GetArchiveList(PageNum int, PageSize int, maps interface{}) (blog []model.Blog) { - db.Mysql.Where(maps).Offset((PageNum - 1) * PageSize).Limit(PageSize).Order("ord asc, id desc").Find(&blog) - return -} - -// BlogDetail 获取 blog 详情 -func (b *blog) BlogDetail(id int) (mblog model.Blog, err error) { - err = db.Mysql.First(&mblog, id).Error - db.Mysql.Model(&mblog).Where("id = ?", id).UpdateColumn("views", gorm.Expr("views + ?", 1)) - return -} - -// GetBlogTotal 获取 blog 总记录数 -func (b *blog) GetBlogTotal(maps interface{}) (count int) { - db.Mysql.Model(&blog{}).Where(maps).Count(&count) - return -} - -// Create 新增 -func (b *blog) Create(model *model.Blog) (err error) { - err = db.Mysql.Omit("ColTitle").Create(model).Error - - return err -} - -// Update 修改 -func (b *blog) Update(id string, model *model.Blog) (err error) { - err = db.Mysql.Model(&model).Where("id = ? ", id).Omit("ColTitle").Updates(model).Error - - return err -} - -// UpdateField 修改某一字段 -func (b *blog) UpdateField(id string, key string, value interface{}) { - mBlog := &model.Blog{} - db.Mysql.Model(&mBlog).Where("id = ?", id).Update(key, value) -} - -// Delete 删除 -func (b *blog) Delete(id string) bool { - db.Mysql.Where("id = ?", id).Delete(&blog{}) - - return true -} - -// BlogArchiveList 归档列表 -func (b *blog) BlogArchiveList() (archive []model.Archive) { - sql := "select count(DATE_FORMAT(create_time, '%Y-%m')) as Count, DATE_FORMAT(create_time, '%Y-%m') as Time, create_time as CreateTime from tk_blog group by Time order by Time desc" - db.Mysql.Raw(sql).Scan(&archive) - - return -} - -// GetArchive 归档列表 -func (b *blog) GetArchive(PageNum int, PageSize int, ctime string) (blog []model.Blog) { - db.Mysql.Where("create_time like ?", "%"+ctime+"%").Offset((PageNum - 1) * PageSize).Limit(PageSize).Order("ord asc, id desc").Find(&blog) - return -} - -// GetPrevNextBlog 获取上一篇下一篇 -func (b *blog) GetPrevNextBlog(ctime string, dir string) (link string) { - blog := &model.Blog{} - var maps, order string - - if dir == "prev" { - maps = fmt.Sprintf("create_time > '%s'", ctime) - order = "asc" - } - - if dir == "next" { - maps = fmt.Sprintf("create_time < '%s'", ctime) - order = "desc" - } - - db.Mysql.Where(maps).Order("ord asc,create_time " + order).First(&blog) - - link = fmt.Sprintf("%s", cast.ToString(blog.Id), blog.Title) - - return -} diff --git a/app/service/category.go b/app/service/category.go index be8e38c9a48e090210a62e0f9cbe76c522b7d3ba..f90272ec77ed1a0998940dd0f902b63bbd40fee6 100644 --- a/app/service/category.go +++ b/app/service/category.go @@ -1,8 +1,8 @@ package service import ( - db "gitee.com/jikey/elk-blog/app/database" "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" ) type category struct { @@ -10,8 +10,8 @@ type category struct { var Category *category -// GetBlogCategoryList 获取 Blog 分类列表 -func (c *category) GetBlogCategoryList(modelId string) (category []*model.Category) { +// GetArticleCategoryList 获取 Article 分类列表 +func (c *category) GetArticleCategoryList(modelId string) (category []*model.Category) { // var Total []int db.Mysql.Select("concat(colPath,'-', colId) as bPath, colPid, colId, colTitle, description, ord, model, modelid").Where("modelid = ?", modelId).Order("ord ASC").Find(&category) diff --git a/app/service/comment.go b/app/service/comment.go index e7b9d784c53a0691b2be9ae995e85ac1b8fe01fc..6e01e1048a35bc6d1aa761730dccc722082fe348 100644 --- a/app/service/comment.go +++ b/app/service/comment.go @@ -1,8 +1,8 @@ package service import ( - db "gitee.com/jikey/elk-blog/app/database" "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" ) type comment struct { diff --git a/app/service/link.go b/app/service/link.go index 913d9b2d58ca5084ce1919d25b7afff485ee6f34..d3040e7d39c9013bb5fcad5267469d0f23fcd919 100644 --- a/app/service/link.go +++ b/app/service/link.go @@ -1,8 +1,8 @@ package service import ( - db "gitee.com/jikey/elk-blog/app/database" "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" ) type link struct { diff --git a/app/service/message.go b/app/service/message.go index a4a4b5ac7b89a06162c6ca2efea26125cc474b84..a807557cafddc8fd9e1a6be1726d5ef238c0e48f 100644 --- a/app/service/message.go +++ b/app/service/message.go @@ -1,8 +1,8 @@ package service import ( - db "gitee.com/jikey/elk-blog/app/database" "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" ) type message struct { diff --git a/app/service/system.go b/app/service/system.go new file mode 100644 index 0000000000000000000000000000000000000000..18c657b76437007ca14127a6b5cb17ff021a30f4 --- /dev/null +++ b/app/service/system.go @@ -0,0 +1,57 @@ +package service + +import ( + "encoding/json" + "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" +) + +type system struct { +} + +var System *system + +// GetSystemList 获取 Article 分类列表 +func (c *system) GetSystemList(systemId int) (systems []*model.System) { + // var Total []int + + db.Mysql.Select("*").Where("id = ? ", systemId).Order("id ASC").Find(&systems) + // db.Mysql.Model(&category).Select("count(*) as Total").Pluck("Total", &Total) + + return +} + +// GetSystem 获取 System +func (c *system) GetSystem(systemId int) (system model.System) { + // var Total []int + + db.Mysql.Where("id = ? ", systemId).First(&system) + // db.Mysql.Model(&category).Select("count(*) as Total").Pluck("Total", &Total) + + return +} + +// Create 新增 +func (c *system) Create(model *model.System) (err error) { + err = db.Mysql.Create(model).Error + + return err +} + +// Update 修改 +func (c *system) Update(systemId string, model *model.System) (err error) { + data, _ := json.Marshal(&model) + m := make(map[string]interface{}) + json.Unmarshal(data, &m) + // 使用map更新含0值字段，使用struct无法更新 + err = db.Mysql.Model(&model).Where("Id = ? ", systemId).Updates(m).Error + + return err +} + +// Delete 删除 +func (c *system) Delete(id int) (rowsAffected int64) { + result := db.Mysql.Where("Id = ?", id).Delete(&system{}) + + return result.RowsAffected +} diff --git a/app/service/user.go b/app/service/user.go index 64a5db0a55f495a506318d5355ee24c104d76a99..326debe8e1bd1ec05e1a7ff08529b2a7804910e0 100644 --- a/app/service/user.go +++ b/app/service/user.go @@ -3,8 +3,8 @@ package service import ( "errors" "fmt" - db "gitee.com/jikey/elk-blog/app/database" "gitee.com/jikey/elk-blog/app/model" + db "gitee.com/jikey/elk-blog/app/model" "golang.org/x/crypto/bcrypt" ) diff --git a/config/env.example.ini b/config/env.example.ini deleted file mode 100644 index 779cde2f4b8cf4bb78aadfe0be48f112042d5ed3..0000000000000000000000000000000000000000 --- a/config/env.example.ini +++ /dev/null @@ -1,65 +0,0 @@ -[app] -env = dev -log_level = DEBUG -cookie_secret = ZJVAfAwEnR -data_path = data/max_online_num -page_size = 10 - -[server] -host = -port = 6000 -reader_timeout = 60 -write_timeout = 60 - -[database] -type = mysql -host = 192.168.31.165 -port = 3306 -user = root -password = root -dbname = elk-blog -charset = utf8 -; 最大空闲连接数 -max_idle = 2 -; 最大打开连接数 -max_conn = 10 -table_prefix = tk_ - -[xorm] -show_sql = true -; 0-debug, 1-info, 2-warning, 3-error, 4-off, 5-unknow -log_level = 0 - -[security] -; 退订邮件使用的 token key -unsubscribe_token_key = i2ZPUr3YvdX#faDBMc -; 注册激活邮件使用的 sign salt -activate_sign_salt = uaUGhP0KHcZPQVyk8N - -; 过滤广告 -[sensitive] -; 标题关键词 -title = -; 内容关键词 -content = - -; 搜索配置 -[search] -engine_url = - -; 站点信息 -[site] -domain = http://elk.vyan.top -title = 麋鹿博客 -keyword = Elk设计网页设计网站设计 -description = 设计师糜鹿个人网站，分享设计，分享人生，提供优质的网页设计、UI设计、APP用户体验改善、UE设计等各项设计服务！ -blogTitle = 糜鹿设计 -blogKeywords = Elk设计网页设计网站设计 -blogDescription = 设计师糜鹿个人网站，分享设计，分享人生，提供优质的网页设计、UI设计、APP用户体验改善、UE设计等各项设计服务！ -email = elk@qq.com -contact = Elk -company = Elk -phone = 123456 -icp = 哥在香港 -address = 中国 • 上海 -tpl = green \ No newline at end of file diff --git a/deploy/mysql/Dockerfile b/deploy/mysql/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..67e3a9ab0ed73b32057a6d729683304d27ba475b --- /dev/null +++ b/deploy/mysql/Dockerfile @@ -0,0 +1,2 @@ +FROM mysql:5.7 +ADD mysqld.cnf /etc/mysql/mysql.conf.d/mysqld.cnf \ No newline at end of file diff --git a/deploy/mysql/init.sql b/deploy/mysql/init.sql new file mode 100644 index 0000000000000000000000000000000000000000..333cd96961345d36774288927058b36480558f26 --- /dev/null +++ b/deploy/mysql/init.sql @@ -0,0 +1,317 @@ +create database `elk-blog` default character set utf8mb4 collate utf8mb4_general_ci if not exists `juzizhou`; +GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '123456' WITH GRANT OPTION; +flush privileges; +use juzizhou; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for tk_about +-- ---------------------------- +DROP TABLE IF EXISTS `tk_about`; +CREATE TABLE `tk_about` ( + `id` int(10) NOT NULL, + `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `status` tinyint(1) NULL DEFAULT 1, + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_article +-- ---------------------------- +DROP TABLE IF EXISTS `tk_article`; +CREATE TABLE `tk_article` ( + `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT, + `catid` smallint(5) UNSIGNED NULL DEFAULT NULL, + `title` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `md` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `keywords` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `smallimg` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ctime` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `username` char(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `author` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `listorder` smallint(5) UNSIGNED NULL DEFAULT 0, + `posid` tinyint(4) NOT NULL DEFAULT 0, + `ord` tinyint(3) NULL DEFAULT NULL, + `views` int(10) NULL DEFAULT NULL COMMENT '浏览量', + `likes` int(10) NULL DEFAULT NULL COMMENT '点赞', + `source_url` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `avatar` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `status` tinyint(4) NULL DEFAULT 0, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 103 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_banner +-- ---------------------------- +DROP TABLE IF EXISTS `tk_banner`; +CREATE TABLE `tk_banner` ( + `id` int(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `modelId` int(10) NOT NULL, + `smallimg` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `link` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `ord` int(8) NULL DEFAULT NULL, + `status` tinyint(1) NULL DEFAULT 1, + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 40 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_category +-- ---------------------------- +DROP TABLE IF EXISTS `tk_category`; +CREATE TABLE `tk_category` ( + `colId` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT, + `colPid` smallint(5) NOT NULL, + `typeid` smallint(3) NOT NULL DEFAULT 0, + `modelid` smallint(5) NOT NULL, + `model` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `picId` smallint(5) NULL DEFAULT NULL, + `colPath` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `colTitle` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `thumb` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `asmenu` tinyint(1) NULL DEFAULT NULL, + `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `status` tinyint(2) NULL DEFAULT NULL, + `ord` smallint(3) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`colId`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 204 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of tk_category +-- ---------------------------- +INSERT INTO `tk_category` VALUES (1, 0, 0, 1, 'Design', 0, '0', 'Design', '', 1, '设计1', 1, 0); +INSERT INTO `tk_category` VALUES (2, 0, 0, 2, 'About', 0, '0', 'About', '', 1, '关于我们', 1, 0); +INSERT INTO `tk_category` VALUES (3, 0, 0, 3, 'Contact', 0, '0', 'Contact', '', 1, '联系我', 1, 0); +INSERT INTO `tk_category` VALUES (4, 0, 0, 4, 'Blog', 0, '0', 'Blog', '', 1, '博客', 1, 0); +INSERT INTO `tk_category` VALUES (5, 1, 0, 1, 'Design', 0, '0-1', 'GUI444', '', 0, '

ios android

', 1, 1); +INSERT INTO `tk_category` VALUES (6, 1, 0, 1, 'Design', 0, '0-1', 'WEB', '', 0, 'WEB', 1, 4); +INSERT INTO `tk_category` VALUES (7, 1, 0, 1, 'Design', 0, '0-1', 'PAINT', '', 0, 'PAINT', 1, 3); +INSERT INTO `tk_category` VALUES (17, 4, 0, 4, 'Blog', 0, '0-4', '轻慢摄影', '', 0, '轻慢摄影', 0, 0); +INSERT INTO `tk_category` VALUES (14, 4, 0, 4, 'Blog', 0, '0-4', '快乐绘画', '', 0, '快乐绘画', 0, 0); +INSERT INTO `tk_category` VALUES (15, 4, 0, 4, 'Blog', 0, '0-4', '收藏点滴', '', 0, '收藏点滴', 0, 0); +INSERT INTO `tk_category` VALUES (18, 1, 0, 1, 'Design', 0, '0-1', 'App', '', 0, '', 0, 2); +INSERT INTO `tk_category` VALUES (184, 1, 0, 1, 'Design', 0, '0-1', 'logo', '', 0, '', 0, 5); +INSERT INTO `tk_category` VALUES (185, 4, 0, 4, 'Blog', 0, '0-4', '设计理论', '', 0, '设计理论', 0, 0); +INSERT INTO `tk_category` VALUES (188, 4, 0, 4, 'Blog', NULL, '0-4', '好看风云', NULL, NULL, '好看风云', NULL, 6); + +-- ---------------------------- +-- Table structure for tk_comment +-- ---------------------------- +DROP TABLE IF EXISTS `tk_comment`; +CREATE TABLE `tk_comment` ( + `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `pid` int(10) NULL DEFAULT NULL, + `path` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `username` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `nid` mediumint(8) UNSIGNED NULL DEFAULT NULL, + `bid` mediumint(8) UNSIGNED NULL DEFAULT NULL, + `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `author` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `module` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `headimg` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `url` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ip` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `verify` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `isreply` tinyint(1) NULL DEFAULT 0, + `ord` tinyint(5) NULL DEFAULT NULL, + `status` tinyint(1) NULL DEFAULT 1, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 119 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_contact +-- ---------------------------- +DROP TABLE IF EXISTS `tk_contact`; +CREATE TABLE `tk_contact` ( + `id` int(10) NOT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Fixed; + +-- ---------------------------- +-- Table structure for tk_design +-- ---------------------------- +DROP TABLE IF EXISTS `tk_design`; +CREATE TABLE `tk_design` ( + `id` int(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `colId` smallint(5) NOT NULL, + `title` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', + `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容', + `smallimg` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `ctime` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建时间', + `commentnum` int(10) NOT NULL DEFAULT 1 COMMENT '评论数量', + `status` tinyint(1) NOT NULL DEFAULT 1, + `likes` int(10) NOT NULL DEFAULT 1 COMMENT '喜欢数量', + `author` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `inputtime` int(30) NOT NULL, + `posid` tinyint(2) NOT NULL DEFAULT 0, + `ord` int(10) UNSIGNED NOT NULL DEFAULT 0, + PRIMARY KEY (`id`, `author`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_link +-- ---------------------------- +DROP TABLE IF EXISTS `tk_link`; +CREATE TABLE `tk_link` ( + `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT, + `linktype` tinyint(1) NULL DEFAULT NULL, + `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `logo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `status` tinyint(1) NULL DEFAULT 1, + `ord` tinyint(5) NULL DEFAULT 0, + `introduce` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `contact` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 26 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_message +-- ---------------------------- +DROP TABLE IF EXISTS `tk_message`; +CREATE TABLE `tk_message` ( + `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `pid` int(10) NULL DEFAULT NULL, + `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `path` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ip` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `headimg` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `url` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `verify` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `isreply` tinyint(1) NULL DEFAULT NULL, + `ord` tinyint(1) NULL DEFAULT NULL, + `status` tinyint(1) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 54 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_node +-- ---------------------------- +DROP TABLE IF EXISTS `tk_node`; +CREATE TABLE `tk_node` ( + `id` smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `title` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `status` tinyint(1) NULL DEFAULT NULL, + `remark` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `sort` smallint(6) UNSIGNED NULL DEFAULT NULL, + `pid` smallint(6) UNSIGNED NULL DEFAULT NULL, + `level` tinyint(1) UNSIGNED NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 12 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_password_resets +-- ---------------------------- +DROP TABLE IF EXISTS `tk_password_resets`; +CREATE TABLE `tk_password_resets` ( + `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `created_at` timestamp(0) NULL DEFAULT NULL, + INDEX `tk_password_resets_email_index`(`email`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_role +-- ---------------------------- +DROP TABLE IF EXISTS `tk_role`; +CREATE TABLE `tk_role` ( + `id` smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `pid` smallint(6) NULL DEFAULT NULL, + `status` tinyint(1) UNSIGNED NULL DEFAULT NULL, + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for tk_role_user +-- ---------------------------- +DROP TABLE IF EXISTS `tk_role_user`; +CREATE TABLE `tk_role_user` ( + `role_id` mediumint(9) UNSIGNED NOT NULL, + `user_id` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Fixed; + +-- ---------------------------- +-- Table structure for tk_system +-- ---------------------------- +DROP TABLE IF EXISTS `tk_system`; +CREATE TABLE `tk_system` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `domain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `site_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `description` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `keyword` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `email` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `contact` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `company` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `record` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `phone` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `icp` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `address` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `tpl` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1', + `allow_comment` tinyint(2) NULL DEFAULT 0, + `show_banner` tinyint(2) NULL DEFAULT 0, + `status` tinyint(4) NULL DEFAULT 0, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 103 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of tk_system +-- ---------------------------- +INSERT INTO `tk_system` VALUES (1, '127.0.0.1:8080', '橘子洲', '橘子洲', '橘子洲', 'akira@163.com', 'alex', '橘子洲', '', '15911006066', '橘子洲', '橘子洲', 'green', 0, 0, 0, NULL, '2023-01-15 14:18:37'); + +-- ---------------------------- +-- Table structure for tk_user +-- ---------------------------- +DROP TABLE IF EXISTS `tk_user`; +CREATE TABLE `tk_user` ( + `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT, + `username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `sex` tinyint(2) NULL DEFAULT NULL, + `avatar` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `nickname` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `description` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `password` char(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `loginip` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `logintime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `verify` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `isadmin` tinyint(1) NULL DEFAULT NULL, + `status` tinyint(1) NULL DEFAULT NULL, + `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of tk_user +-- ---------------------------- +INSERT INTO `tk_user` VALUES (1, 'admin', 1, '', '杰克', '大风起兮云飞扬，威加海内兮归故乡\r\n', '$2a$14$W7LKAr1AId3eYmtIiAtFeeLYhPuRldxziwORiuu2roiN2ojwD36xy', NULL, NULL, NULL, 'jikeytang@163.com', NULL, NULL, '中国 • 上海市 • 浦东新区', '2022-07-05 13:42:22', '2022-07-05 13:42:24'); + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/deploy/mysql/mysqld.cnf b/deploy/mysql/mysqld.cnf new file mode 100644 index 0000000000000000000000000000000000000000..a6739269286e9df0eed02db4783ffb206ccbb5c3 --- /dev/null +++ b/deploy/mysql/mysqld.cnf @@ -0,0 +1,111 @@ +[client] +port=3306 +socket = /var/run/mysqld/mysqld.sock +[mysql] +no-auto-rehash +auto-rehash +default-character-set=utf8mb4 +[mysqld] +###basic settings +server-id = 2 +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +#log-error = /var/lib/mysql/error.log +# By default we only accept connections from localhost +#bind-address = 127.0.0.1 +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 +character-set-server = utf8mb4 +sql_mode="NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" +default-storage-engine=INNODB +transaction_isolation = READ-COMMITTED +auto_increment_offset = 1 +connect_timeout = 20 +max_connections = 3500 +wait_timeout=86400 +interactive_timeout=86400 +interactive_timeout = 7200 +log_bin_trust_function_creators = 1 +wait_timeout = 7200 +sort_buffer_size = 32M +join_buffer_size = 128M +max_allowed_packet = 1024M +tmp_table_size = 2097152 +explicit_defaults_for_timestamp = 1 +read_buffer_size = 16M +read_rnd_buffer_size = 32M +query_cache_type = 1 +query_cache_size = 2M +table_open_cache = 1500 +table_definition_cache = 1000 +thread_cache_size = 768 +back_log = 3000 +open_files_limit = 65536 +skip-name-resolve +########log settings######## +log-output=FILE +general_log = ON +general_log_file=/var/lib/mysql/general.log +slow_query_log = ON +slow_query_log_file=/var/lib/mysql/slowquery.log +long_query_time=10 +#log-error=/var/lib/mysql/error.log +log_queries_not_using_indexes = OFF +log_throttle_queries_not_using_indexes = 0 +#expire_logs_days = 120 +min_examined_row_limit = 100 +########innodb settings######## +innodb_io_capacity = 4000 +innodb_io_capacity_max = 8000 +innodb_buffer_pool_size = 6144M +innodb_file_per_table = on +innodb_buffer_pool_instances = 20 +innodb_buffer_pool_load_at_startup = 1 +innodb_buffer_pool_dump_at_shutdown = 1 +innodb_log_file_size = 300M +innodb_log_files_in_group = 2 +innodb_log_buffer_size = 16M +innodb_undo_logs = 128 +#innodb_undo_tablespaces = 3 +#innodb_undo_log_truncate = 1 +#innodb_max_undo_log_size = 2G +innodb_flush_method = O_DIRECT +innodb_flush_neighbors = 1 +innodb_purge_threads = 4 +innodb_large_prefix = 1 +innodb_thread_concurrency = 64 +innodb_print_all_deadlocks = 1 +innodb_strict_mode = 1 +innodb_sort_buffer_size = 64M +innodb_flush_log_at_trx_commit=1 +innodb_autoextend_increment=64 +innodb_concurrency_tickets=5000 +innodb_old_blocks_time=1000 +innodb_open_files=65536 +innodb_stats_on_metadata=0 +innodb_file_per_table=1 +innodb_checksum_algorithm=0 +#innodb_data_file_path=ibdata1:60M;ibdata2:60M;autoextend:max:1G +innodb_data_file_path = ibdata1:12M:autoextend +#innodb_temp_data_file_path = ibtmp1:500M:autoextend:max:20G +#innodb_buffer_pool_dump_pct = 40 +#innodb_page_cleaners = 4 +#innodb_purge_rseg_truncate_frequency = 128 +binlog_gtid_simple_recovery=1 +#log_timestamps=system +############## +delayed_insert_limit = 100 +delayed_insert_timeout = 300 +delayed_queue_size = 1000 +delay_key_write = ON +disconnect_on_expired_password = ON +div_precision_increment = 4 +end_markers_in_json = OFF +eq_range_index_dive_limit = 10 +innodb_adaptive_flushing = ON +innodb_adaptive_hash_index = ON +innodb_adaptive_max_sleep_delay = 150000 +#innodb_additional_mem_pool_size = 2097152 +innodb_autoextend_increment = 64 +innodb_autoinc_lock_mode = 1 \ No newline at end of file diff --git a/deploy/redis/Dockerfile b/deploy/redis/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..a28b3b193cfd1b737f8177f235a70008c3fa328a --- /dev/null +++ b/deploy/redis/Dockerfile @@ -0,0 +1,4 @@ +FROM redis:4.0.10 +COPY redis.conf /usr/local/etc/redis/redis.conf +EXPOSE 6379 +ENTRYPOINT [ "redis-server", "/usr/local/etc/redis/redis.conf"] \ No newline at end of file diff --git a/deploy/redis/redis.conf b/deploy/redis/redis.conf new file mode 100644 index 0000000000000000000000000000000000000000..f999666155c029d2021bc97ea6391137eccef636 --- /dev/null +++ b/deploy/redis/redis.conf @@ -0,0 +1,9 @@ +port 6379 +dir /data +pidfile /data/redis.pid +logfile "/data/redis.log" +repl-disable-tcp-nodelay yes +no-appendfsync-on-rewrite yes +maxmemory 248m +maxmemory-policy allkeys-lru +requirepass abcd1234 \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000000000000000000000000000000000000..fcbc6ebe52d2c7a04d94057fa2d1a797e38607b5 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,60 @@ +version: '2.2' + +services: + redis: +# image: 'redis:6' + build: + context: ./deploy/redis + dockerfile: Dockerfile + # command: redis-server --requirepass yourpassword + ports: + - '16379:6379' + networks: + - main + container_name: el-redis + + db: + image: mariadb:10.3 +# build: +# context: ./deploy/mysql +# dockerfile: Dockerfile +# image: mysql:8.0.21 + # 容器名(以后的控制都通过这个) + hostname: db + container_name: database + # 重启策略 + restart: always + env_file: + - .env/staging + ports: + - "3306:3306" + environment: + TZ: Asia/Shanghai + volumes: + - /var/mysql/data:/var/lib/mysql + # 配置挂载 +# - /root/mysql/conf/:/etc/mysql/conf.d/ + # 初始化目录挂载，注意此处我只跑了这个挂载，只是为了说明其他配置不应该数据初始化 + - /var/mysql/init/:/docker-entrypoint-initdb.d/ + + app: + build: + context: . + dockerfile: Dockerfile + container_name: juzizhou + expose: + - "8080" + ports: + - "8080:8080" + volumes: + - /var/juzizhou:/app + depends_on: + - db + logging: + driver: "json-file" + options: + max-size: "300m" + max-file: "3" + restart: on-failure +networks: + main: \ No newline at end of file diff --git a/go.mod b/go.mod index 478aecbf78cecce403db78d19007a55350149b08..2e263ae64c4fa70adefcd68e448c7d5c4fd4910f 100644 --- a/go.mod +++ b/go.mod @@ -1,42 +1,56 @@ module gitee.com/jikey/elk-blog -go 1.18 +go 1.17 require ( + github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 github.com/gin-gonic/gin v1.8.1 - github.com/go-sql-driver/mysql v1.6.0 + github.com/golang-jwt/jwt/v4 v4.4.2 github.com/jinzhu/gorm v1.9.16 + github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/mojocn/base64Captcha v1.3.5 github.com/nleeper/goment v1.4.4 + github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/shirou/gopsutil v3.21.11+incompatible github.com/sirupsen/logrus v1.8.1 + github.com/spf13/cast v1.5.0 + github.com/spf13/viper v1.13.0 github.com/vjeantet/jodaTime v1.0.0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d - gopkg.in/ini.v1 v1.66.6 ) require ( + github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-ole/go-ole v1.2.6 // 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.11.0 // indirect + github.com/go-sql-driver/mysql v1.6.0 // indirect github.com/goccy/go-json v0.9.8 // indirect - github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect - github.com/google/go-cmp v0.5.8 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.4 // indirect + github.com/jonboulle/clockwork v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect + github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/lib/pq v1.10.3 // indirect + github.com/magiconair/properties v1.8.6 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.0.2 // indirect - github.com/spf13/cast v1.5.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.4.1 // indirect github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/tkuchiki/go-timezone v0.2.2 // indirect @@ -46,6 +60,9 @@ require ( golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index b49cca785f4637bdb754326362688120b876dcca..f2afa41ec28f38a1de699bd9cd2fc6842e16a30e 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,144 @@ +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.44.3/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 v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +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/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= +cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +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/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= +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= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +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/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible h1:KXeJoM1wo9I/6xPTyt6qCxoSZnmASiAjlrr0dyTUKt8= +github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/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/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +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/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 h1:fmFk0Wt3bBxxwZnu48jqMdaOR/IZ4vdtJFuaFV8MpIE= github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3/go.mod h1:bJWSKrZyQvfTnb2OudyUjurSG4/edverV7n82+K3JiM= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +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.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +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-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-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= @@ -22,24 +147,137 @@ github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= 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.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw= github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.9.8 h1:DxXB6MLd6yyel7CLph8EwNIonUtVZd3Ue5iRcL4DQCE= github.com/goccy/go-json v0.9.8/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs= github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +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/groupcache v0.0.0-20210331224755-41bb18bfe9da/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/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +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.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.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +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.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.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/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.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +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/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +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/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +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/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -47,9 +285,27 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas= github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg= +github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +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.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.11/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= +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/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +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/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +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.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -59,47 +315,136 @@ 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.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8= +github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= +github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4= +github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA= +github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ= +github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg= github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +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/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= 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/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.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/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mojocn/base64Captcha v1.3.5 h1:Qeilr7Ta6eDtG4S+tQuZ5+hO+QHbiGAJdi4PfoagaA0= github.com/mojocn/base64Captcha v1.3.5/go.mod h1:/tTTXn4WTpX9CfrmipqRytCpJ27Uw3G6I7NcP2WwcmY= +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/nleeper/goment v1.4.4 h1:GlMTpxvhueljArSunzYjN9Ri4SOmpn0Vh2hg2z/IIl8= github.com/nleeper/goment v1.4.4/go.mod h1:zDl5bAyDhqxwQKAvkSXMRLOdCowrdZz53ofRJc4VhTo= -github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= -github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +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.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +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/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +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/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.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +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/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo= +github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= +github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= 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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +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/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= @@ -107,65 +452,530 @@ github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hM github.com/tkuchiki/go-timezone v0.2.0/go.mod h1:b1Ean9v2UXtxSq4TZF0i/TU9NuoWa9hOzOKoGCV2zqY= github.com/tkuchiki/go-timezone v0.2.2 h1:MdHR65KwgVTwWFQrota4SKzc4L5EfuH5SdZZGtk/P2Q= github.com/tkuchiki/go-timezone v0.2.2/go.mod h1:oFweWxYl35C/s7HMVZXiA19Jr9Y0qJHMaG/J2TES4LY= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/vjeantet/jodaTime v1.0.0 h1:Fq2K9UCsbTFtKbHpe/L7C57XnSgbZ5z+gyGpn7cTE3s= github.com/vjeantet/jodaTime v1.0.0/go.mod h1:gA+i8InPfZxL1ToHaDpzi6QT/npjl3uPlcV4cxDNerI= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= +go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= +go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= +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= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +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-20190325154230-a5d413f7728c/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-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +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-20190501045829-6d32002ffd75/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-20220617043117-41969df76e82 h1:KpZB5pUSBvrHltNEdK/tw0xlPeD13M6M6aGP32gKqiw= golang.org/x/image v0.0.0-20220617043117-41969df76e82/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-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +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/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/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-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-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +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-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/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-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +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-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/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-20200625203802-6e8e738ad208/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/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +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-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-20190222072716-a9d3bda3a223/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-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-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/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-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-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-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/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-20210616094352-59db8d763f22/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-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/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-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.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= +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 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= +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-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-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-20190907020128-2ca718005c18/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-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-20200619180055-7c47624df98f/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.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +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/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= +google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko= +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/appengine v1.6.7/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-20200513103714-09dca8ec2884/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/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +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/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +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.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.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +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= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= 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/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= -gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +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.3/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/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/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.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= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/main.go b/main.go index 8eb5d136eb037058e5e5c469a417f2e46c206c9e..afeae19f78c4b44934f0cc0c4fb521606c295753 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,8 @@ package main import ( // "gitee.com/jikey/elk-blog/app/service" - "gitee.com/jikey/elk-blog/app/database" + "gitee.com/jikey/elk-blog/app/model" + "gitee.com/jikey/elk-blog/pkg/setting" "gitee.com/jikey/elk-blog/routers" "github.com/sirupsen/logrus" "time" @@ -15,7 +16,7 @@ func init() { time.Local = timelocal router := routers.RouterApp() - _ = router.Run(":4000") + _ = router.Run(setting.Config.Server.Port) // 设置日志级别 logrus.SetLevel(logrus.DebugLevel) @@ -23,5 +24,5 @@ func init() { } func main() { - database.CloseDB() + model.CloseDB() } diff --git a/middleware/cors.go b/middleware/cors.go index f82b04d6d529750fe39e9d95f5c57205b6fdfe7d..de4165e1af9b4c6352729903569ce967c886bdd0 100644 --- a/middleware/cors.go +++ b/middleware/cors.go @@ -5,10 +5,17 @@ import ( "net/http" ) +// Cors 处理跨域 func Cors() gin.HandlerFunc { return func(c *gin.Context) { method := c.Request.Method origin := c.Request.Header.Get("Origin") + //c.Header("Access-Control-Allow-Origin", origin) + //c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id") + //c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS,DELETE,PUT") + //c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type") + //c.Header("Access-Control-Allow-Credentials", "true") + if origin != "" { c.Header("Access-Control-Allow-Origin", "*") // 可将将 * 替换为指定的域名 c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE") @@ -16,9 +23,13 @@ func Cors() gin.HandlerFunc { c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Cache-Control, Content-Language, Content-Type") c.Header("Access-Control-Allow-Credentials", "true") } + + // 放行所有OPTIONS方法 if method == "OPTIONS" { c.AbortWithStatus(http.StatusNoContent) } + + // 处理请求 c.Next() } } diff --git a/middleware/jwt.go b/middleware/jwt.go index c312c3b0ce60ab724e8865c5687436a32fb76b61..cc1c4bcbfa05f8fd9aa869a0da6b0cd644bed94e 100644 --- a/middleware/jwt.go +++ b/middleware/jwt.go @@ -4,6 +4,7 @@ import ( "errors" "gitee.com/jikey/elk-blog/pkg/e" "gitee.com/jikey/elk-blog/pkg/response" + "gitee.com/jikey/elk-blog/pkg/setting" "gitee.com/jikey/elk-blog/pkg/utils" "github.com/gin-gonic/gin" jwtgo "github.com/golang-jwt/jwt/v4" @@ -36,7 +37,7 @@ var ( // JWTAuth jwt中间件 func JWTAuth() gin.HandlerFunc { return func(c *gin.Context) { - tokenHeader, err := c.Cookie("milu.blog.token") + tokenHeader, err := c.Cookie("milu.article.token") if tokenHeader == "" { // response.Fail(c, e.AuthTokenNoEmpty) @@ -75,7 +76,8 @@ func JWTAuth() gin.HandlerFunc { func NewJWT() *JWT { return &JWT{ - SignKey: []byte(utils.Config.Section("app").Key("key").MustString("")), + //SignKey: []byte(utils.Config.Section("app").Key("key").MustString("")), + SignKey: []byte(setting.Config.App.Key), MaxRefresh: time.Duration(10) * time.Minute, } } diff --git a/middleware/log.go b/middleware/log.go new file mode 100644 index 0000000000000000000000000000000000000000..bc5c694c180be7ebfd0f7c3190117e07183ae58a --- /dev/null +++ b/middleware/log.go @@ -0,0 +1,104 @@ +package middleware + +import ( + "fmt" + "gitee.com/jikey/elk-blog/pkg/setting" + "github.com/gin-gonic/gin" + rotatelogs "github.com/lestrrat-go/file-rotatelogs" + "github.com/rifflock/lfshook" + "github.com/sirupsen/logrus" + "os" + "path" + "time" +) + +// LoggerToFile 日志记录到文件 +func LoggerToFile() gin.HandlerFunc { + + logFilePath := setting.Config.App.LogFilePath + logFileName := setting.Config.App.LogFileName + + // 日志文件 + fileName := path.Join(logFilePath, logFileName) + + // 写入文件 + src, err := os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, os.ModeAppend) + if err != nil { + fmt.Println("err", err) + } + + // 实例化 + logger := logrus.New() + + // 设置输出 + logger.Out = src + + // 设置日志级别 + logger.SetLevel(logrus.DebugLevel) + + // 设置 rotatelogs + logWriter, err := rotatelogs.New( + // 分割后的文件名称 + fileName+".%Y%m%d.log", + + // 生成软链，指向最新日志文件 + rotatelogs.WithLinkName(fileName), + + // 设置最大保存时间(7天) + rotatelogs.WithMaxAge(7*24*time.Hour), + + // 设置日志切割时间间隔(1天) + rotatelogs.WithRotationTime(24*time.Hour), + ) + + writeMap := lfshook.WriterMap{ + logrus.InfoLevel: logWriter, + logrus.FatalLevel: logWriter, + logrus.DebugLevel: logWriter, + logrus.WarnLevel: logWriter, + logrus.ErrorLevel: logWriter, + logrus.PanicLevel: logWriter, + } + + lfHook := lfshook.NewHook(writeMap, &logrus.JSONFormatter{ + TimestampFormat: "2006-01-02 15:04:05", + }) + + // 新增 Hook + logger.AddHook(lfHook) + + return func(c *gin.Context) { + // 开始时间 + startTime := time.Now() + + // 处理请求 + c.Next() + + // 结束时间 + endTime := time.Now() + + // 执行时间 + latencyTime := endTime.Sub(startTime) + + // 请求方式 + reqMethod := c.Request.Method + + // 请求路由 + reqUri := c.Request.RequestURI + + // 状态码 + statusCode := c.Writer.Status() + + // 请求IP + clientIP := c.ClientIP() + + // 日志格式 + logger.WithFields(logrus.Fields{ + "status_code": statusCode, + "latency_time": latencyTime, + "client_ip": clientIP, + "req_method": reqMethod, + "req_uri": reqUri, + }).Info() + } +} diff --git a/old-Dockerfile b/old-Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..a306c83939b4ee8606c5132ecc15f5df2d56929d --- /dev/null +++ b/old-Dockerfile @@ -0,0 +1,42 @@ +FROM golang:1.17 as golang +# 为我们的镜像设置必要的环境变量 +ENV GO111MODULE=on \ + CGO_ENABLED=0 \ + GOOS=linux \ + GOARCH=amd64 \ + GOPROXY=https://goproxy.cn,direct +# 设置/www，进入容器就会直接进入到这个目录下,而不是进入到默认根目录下面 +ADD . /www +# 进入工作目录 +WORKDIR /www +# 复制项目中的 go.mod 和 go.sum文件并下载依赖信息 +COPY go.mod . +COPY go.sum . +RUN go mod tidy +# 将代码复制到容器中 +COPY . . +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags '-w -s' -installsuffix 'public' -o ginserver main.go + +FROM ubuntu:18.04 + +# 配置项目环境（根据自己情况来） +ENV GO_PROFILE=pro +ENV GIN_MODE=release + +# 暴露服务端口 +EXPOSE 8080 + +WORKDIR /app + +# 复制打包的 Go 文件到系统用户可执行程序目录下 +COPY --from=golang /www/ginserver /app +COPY --from=golang /www/public /app/public +COPY --from=golang /www/setting /app/setting +COPY --from=golang /www/views /app/views + +RUN chown -R root /app/ginserver +RUN chmod +x /app/ginserver + +# 容器启动时运行的命令 +ENTRYPOINT ["/app/ginserver"] +#CMD ["/app/ginserver"] \ No newline at end of file diff --git a/pkg/response/response.go b/pkg/response/response.go index 7725f89fdc26109f33392af21acfc2032a821719..109a34c2d06913a635e4d2ee7dac850842495f5d 100644 --- a/pkg/response/response.go +++ b/pkg/response/response.go @@ -3,6 +3,7 @@ package response import ( "fmt" "gitee.com/jikey/elk-blog/pkg/e" + "gitee.com/jikey/elk-blog/pkg/setting" "gitee.com/jikey/elk-blog/pkg/utils" "github.com/flosch/pongo2" "github.com/gin-gonic/gin" @@ -117,7 +118,7 @@ func HTML(c *gin.Context, path string, data interface{}) { // Render 渲染 func Render(c *gin.Context, path string, data interface{}) { - tpl := utils.Site.Tpl + tpl := setting.Config.Site.Tpl if tpl == "" { tpl = "home" diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go new file mode 100644 index 0000000000000000000000000000000000000000..9e11a20a9523f8ad7bd4e07f412fcfc15f91a2b3 --- /dev/null +++ b/pkg/setting/setting.go @@ -0,0 +1,171 @@ +package setting + +import ( + "fmt" + "github.com/spf13/viper" + "os" + "path/filepath" + + //"gopkg.in/ini.v1" + "log" +) + +var ( + //Config *ini.File + + // PageSize RunMode string + PageSize int + //Site *SiteMap +) + +// AllConfig 读取配置文件config +type AllConfig struct { + Redis string + Database DatabaseConfig + App AppConfig + Site SiteMap + Server ServerConfig + Security SecurityConfig + Xorm XormConfig + Sensitive SensitiveConfig + Search SearchConfig + Aliyun AliyunConfig +} + +type DatabaseConfig struct { + Type string + Host string + Port string + User string + Password string + DbName string + Charset string + TablePrefix string `toml:"table_prefix" mapstructure:"table_prefix"` + MaxIdle int `toml:"max_idle" mapstructure:"max_idle"` + MaxConn int `toml:"max_conn" mapstructure:"max_conn"` +} + +type AliyunConfig struct { + AccessKey string `toml:"access_key" mapstructure:"access_key"` + SecretAccessKey string `toml:"secret_access_key" mapstructure:"secret_access_key"` + BucketName string `toml:"bucket_name" mapstructure:"bucket_name"` + Endpoint string + InnerNet string `toml:"inner_net" mapstructure:"inner_net"` + OuterNet string `toml:"outer_net" mapstructure:"outer_net"` + AliyunNet string `toml:"aliyun_net" mapstructure:"aliyun_net"` +} + +type AppConfig struct { + Env string + LogLevel string + CookieSecret string + DataPath string + PageSize int `toml:"page_size" mapstructure:"page_size"` + Key string + UploadOss bool `toml:"upload_oss" mapstructure:"upload_oss"` + LogFilePath string `toml:"log_file_path" mapstructure:"log_file_path"` + LogFileName string `toml:"log_file_name" mapstructure:"log_file_name"` +} + +type ServerConfig struct { + Host string + Port string + ReaderTimeout int + WriteTimeout int +} +type SecurityConfig struct { + UnsubscribeTokenKey string + ActivateSignSalt string +} + +type XormConfig struct { + ShowSql bool + LogLevel int +} +type SensitiveConfig struct { + Title string + Content string +} +type SearchConfig struct { + EngineUrl string +} + +type SiteMap struct { + Domain string + Title string + Keyword string + Description string + Slogon Slogon + Email string + Contact string + Company string + Record string + Phone string + Icp string + Address string + Tpl string +} + +type Slogon struct { + blogTitle string + blogKeywords string + blogDescription string +} + +func init() { + LoadInI() + SetApp() + SetMeta() + SetSite() +} + +var Config AllConfig + +// LoadInI 载入配置 +func LoadInI() { + var err error + path, _ := os.Getwd() + cfg := viper.New() + cfg.SetConfigName("config") // 配置文件的文件名，没有扩展名，如 .yaml, .toml 这样的扩展名 + cfg.SetConfigType("toml") // 设置扩展名。在这里设置文件的扩展名。另外，如果配置文件的名称没有扩展名，则需要配置这个选项 + //viper.AddConfigPath("/etc/appname/") // 查找配置文件所在路径 + //viper.AddConfigPath("$HOME/.appname") // 多次调用AddConfigPath，可以添加多个搜索路径 + //cfg.AddConfigPath(path + "/config") // 还可以在工作目录中搜索配置文件 + //cfg.AddConfigPath(path + "/config") // 还可以在工作目录中搜索配置文件 + path_ := filepath.Join(path, "/setting") + fmt.Println(path_) + cfg.AddConfigPath(path_) // 还可以在工作目录中搜索配置文件 + err = cfg.ReadInConfig() // 搜索并读取配置文件 + + if err != nil { // 处理错误 + //panic(fmt.Errorf("Fatal error config file: %s \n", err)) + log.Fatalf("Fatal error config file: %v", err) + } + err = cfg.Unmarshal(&Config) + if err != nil { + return + } + viper.WatchConfig() + //将配置文件绑定到config上 + //Config, err = ini.Load("config/env.ini") + //// Config, err = ini.Load("env.ini") + //if err != nil { + // log.Fatalf("Fail to parse 'conf/env.ini': %v", err) + //} +} + +func SetApp() { + //sec := config.App + PageSize = Config.App.PageSize +} + +func SetMeta() { + //sec := Config.Section("site") + _ = viper.GetString("site.keyword") +} + +func SetSite() { + //Site = &SiteMap{} + //Site := config.Site + //_ = Config.Section("site").MapTo(Site) +} diff --git a/pkg/utils/setting.go b/pkg/utils/setting.go deleted file mode 100644 index 59e952d5ac948cc3112e5c086a02c9b63ff03ca7..0000000000000000000000000000000000000000 --- a/pkg/utils/setting.go +++ /dev/null @@ -1,61 +0,0 @@ -package utils - -import ( - "gopkg.in/ini.v1" - "log" -) - -var ( - Config *ini.File - - // PageSize RunMode string - PageSize int - Site *SiteMap -) - -type SiteMap struct { - Domain string `ini:"domain"` - Title string `ini:"title"` - Slogon string `ini:"slogon"` - Keyword string `ini:"keyword"` - Description string `ini:"description"` - Email string `ini:"email"` - Contact string `ini:"contact"` - Company string `ini:"company"` - Phone string `ini:"phone"` - Icp string `ini:"icp"` - Address string `ini:"address"` - Tpl string `ini:"tpl"` -} - -func init() { - LoadInI() - SetApp() - SetMeta() - SetSite() -} - -// LoadInI 载入配置 -func LoadInI() { - var err error - Config, err = ini.Load("config/env.ini") - // Config, err = ini.Load("env.ini") - if err != nil { - log.Fatalf("Fail to parse 'conf/env.ini': %v", err) - } -} - -func SetApp() { - sec := Config.Section("app") - PageSize = sec.Key("page_size").MustInt(10) -} - -func SetMeta() { - sec := Config.Section("site") - _ = sec.Key("keyword").MustString("") -} - -func SetSite() { - Site = &SiteMap{} - _ = Config.Section("site").MapTo(Site) -} diff --git a/pkg/utils/upload.go b/pkg/utils/upload.go new file mode 100644 index 0000000000000000000000000000000000000000..f8756d161c039cbfbde22e9b2aee81c4a9551309 --- /dev/null +++ b/pkg/utils/upload.go @@ -0,0 +1,168 @@ +package utils + +import ( + "fmt" + "gitee.com/jikey/elk-blog/pkg/setting" + "github.com/aliyun/aliyun-oss-go-sdk/oss" + "github.com/gin-gonic/gin" + "io" + "net/http" + "os" + "path/filepath" + "regexp" + "strconv" + "strings" + "sync" + "time" +) + +var ( + long = 0 + ti1 = int64(0) + once sync.Once + client *oss.Client + err error +) + +func Uploads(str []interface{}) []interface{} { + for k, v := range str { + str[k] = Upload(v.(string)) + } + return str +} + +// 使用sync.Once来保证oss.New函数只调用一次，避免重复创建OSSClient实例。 +func getOssClient() *oss.Client { + once.Do(func() { + // 创建OSSClient实例。 + client, err = oss.New(setting.Config.Aliyun.Endpoint, + setting.Config.Aliyun.AccessKey, + setting.Config.Aliyun.SecretAccessKey) + if err != nil { + fmt.Println("Error:", err) + os.Exit(-1) + } + fmt.Println("create ossClient") + }) + fmt.Println("get ossClient") + return client +} + +func Upload(url string) string { + // 创建OSSClient实例。 + client = getOssClient() + t1 := time.Now().Unix() + if ti1 != t1 { //如果时间戳不一样,那么归零 + long = 0 + } + ti1 = t1 + long++ + obj := fmt.Sprintf("article/%d%d.png", t1, long) + // 获取存储空间。 + bucket, err := client.Bucket(setting.Config.Aliyun.BucketName) + if err != nil { + fmt.Println("Error:", err) + os.Exit(-1) + } + res, _ := http.Get(url) + // 上传Byte数组。 + //err = bucket.PutObject(obj, bytes.NewReader(ReadImgData(url))) + err = bucket.PutObject(obj, io.Reader(res.Body)) + if err != nil { + fmt.Println("Error:", err) + os.Exit(-1) + } + return setting.Config.Aliyun.InnerNet + obj +} + +// ReadImgData 获取C的图片数据 +func ReadImgData(url string) []byte { + resp, err := http.Get(url) + if err != nil { + panic(err) + } + defer resp.Body.Close() + pix, err := io.ReadAll(resp.Body) + if err != nil { + panic(err) + } + return pix +} + +// RepImages 上传给定内容中非本站的图片，并替换为上传的图片链接 https://zhuanlan.zhihu.com/p/74047342 +func RepImages(htmls string) string { + var imgRE = regexp.MustCompile(`]+\bsrc=["']([^"']+)["']`) + imgs := imgRE.FindAllStringSubmatch(htmls, -1) + out := make([]string, len(imgs)) + myImage := "" + resHtml := htmls + //var result = make(chan string) + for i := range out { + if !strings.HasPrefix(imgs[i][1], "https://static.juzizhou.net") { + fmt.Println(imgs[i][1]) + myImage = Upload(imgs[i][1]) + resHtml = strings.Replace(resHtml, imgs[i][1], myImage, -1) + out[i] = imgs[i][1] + fmt.Println(strconv.Itoa(i), out[i]) + } + } + fmt.Println(resHtml) + return resHtml +} + +func OssUpload(key string, file io.Reader) (string, error) { + client = getOssClient() + // 获取存储空间。 + bucket, err := client.Bucket(setting.Config.Aliyun.BucketName) + if err != nil { + return "", err + } + // 上传文件。 + err = bucket.PutObject(key, file) + if err != nil { + return "", err + } + // https://jxcatimg.oss-cn-shenzhen.aliyuncs.com/articles/202107/1626401559-1564453109_219427.jpg + return setting.Config.Aliyun.InnerNet + key, nil +} + +func OSSUploadFile(c *gin.Context) (bool, string) { + fileHeader, err := c.FormFile("file") + if err != nil { + return false, "参数有误" + } + fileExt := filepath.Ext(fileHeader.Filename) + allowExts := []string{".jpg", ".png", ".gif", ".jpeg", ".doc", ".docx", ".ppt", ".pptx", ".xls", ".xlsx", ".pdf"} + allowFlag := false + for _, ext := range allowExts { + if ext == fileExt { + allowFlag = true + break + } + } + if !allowFlag { + return false, "不允许的类型" + } + + now := time.Now() + //文件存放路径 + fileDir := fmt.Sprintf("articles/%s", now.Format("200601")) + + //文件名称 + timeStamp := now.Unix() + fileName := fmt.Sprintf("%d-%s", timeStamp, fileHeader.Filename) + // 文件key + fileKey := filepath.Join(fileDir, fileName) + + src, err := fileHeader.Open() + if err != nil { + return false, "上传失败" + } + defer src.Close() + + res, err := OssUpload(fileKey, src) + if err != nil { + return false, "上传失败" + } + return true, res +} diff --git a/pkg/utils/util.go b/pkg/utils/util.go index 85bd00b94ad048b87b4e0ea7a328bca1efc52371..5394608e6fc4305734c2401016e13a582ba01073 100644 --- a/pkg/utils/util.go +++ b/pkg/utils/util.go @@ -2,6 +2,7 @@ package utils import ( "bytes" + "gitee.com/jikey/elk-blog/pkg/setting" "github.com/gin-gonic/gin" mathrand "math/rand" "net/http" @@ -12,7 +13,8 @@ import ( // IsEnv 检测环境 func IsEnv(eType string) bool { - return Config.Section("app").Key("env").MustString("") == eType + //return Config.Section("app").Key("env").MustString("") == eType + return setting.Config.App.Env == eType } // IsProd 是否是生产环境 diff --git a/public/admin/js/admin.js b/public/admin/js/admin.js index 09218d59ccccc55c9aa8838dd435e8ffb206f4bc..c1ac2848fc5fd564ecc3f69b1dffe513269ff1b7 100644 --- a/public/admin/js/admin.js +++ b/public/admin/js/admin.js @@ -11,14 +11,14 @@ this.info() }, info: function () { - var user = JSON.parse(app.atob(localStorage.getItem('milu.blog.user'))) + var user = JSON.parse(app.atob(localStorage.getItem('milu.article.user'))) if (user) { this.data.user = user } }, getUserInfo: function () { - return JSON.parse(app.atob(localStorage.getItem('milu.blog.user'))) && '' + return JSON.parse(app.atob(localStorage.getItem('milu.article.user'))) && '' }, /** * 构造树型结构数据 diff --git a/public/common/api/init.json b/public/common/api/init.json index 998781f982198dcb7ed25aad028692d413d468ff..3806a6928fb6579e8b8ae6035bd8bd917a3694cc 100644 --- a/public/common/api/init.json +++ b/public/common/api/init.json @@ -25,25 +25,25 @@ "title": "发表文章", "icon": "fa fa-pencil", "target": "_blank", - "href": "blog/edit" + "href": "article/edit" }, { "title": "发表MD", "icon": "fa fa-maxcdn", "target": "_blank", - "href": "blog/edit/md" + "href": "article/edit/md" }, { "title": "文章管理", "icon": "fa fa-list-alt", "target": "_self", - "href": "blog" + "href": "article" }, { "title": "类别管理", "icon": "fa fa-navicon", "target": "_self", - "href": "blog/category" + "href": "article/category" }, { "title": "Banner管理", @@ -69,6 +69,12 @@ "target": "_self", "href": "users" }, + { + "title": "关于我", + "icon": "fa fa-beer", + "target": "_self", + "href": "about" + }, { "title": "友情链接", "icon": "fa fa-link", diff --git a/public/common/images/favicon.ico b/public/common/images/favicon.ico index 16b87024939c2e4121273b77f336a6a63bbe99a2..80de41f20199f1e7c96f203d3390c330603115dc 100644 Binary files a/public/common/images/favicon.ico and b/public/common/images/favicon.ico differ diff --git a/public/common/images/favicon1.ico b/public/common/images/favicon1.ico new file mode 100644 index 0000000000000000000000000000000000000000..16b87024939c2e4121273b77f336a6a63bbe99a2 Binary files /dev/null and b/public/common/images/favicon1.ico differ diff --git a/public/common/js/app.js b/public/common/js/app.js index 3dbbd53800483c13143905e049a05fc64bc14833..2e14d5645860b03c991db678a2c9a59552c7680e 100644 --- a/public/common/js/app.js +++ b/public/common/js/app.js @@ -454,7 +454,7 @@ // request interceptor service.interceptors.request.use( config => { - const token = app.cookie.get('milu.blog.token') + const token = app.cookie.get('milu.article.token') token && (config.headers['Authorization'] = `Bearer ${token}`) // 让每个请求携带自定义token 请根据实际情况自行修改 diff --git a/public/common/js/page.js b/public/common/js/page.js index 5a145dc775b16959148c4437ddb774e91e9697dd..da52f5e0858dc8369b162b5a12a62e2f41f81b1d 100644 --- a/public/common/js/page.js +++ b/public/common/js/page.js @@ -93,7 +93,7 @@ popup: null, }, data: { - blogStoreKey: 'milu.blog.likes.ids', + blogStoreKey: 'milu.article.likes.ids', likedIds: [], }, init: function () { @@ -207,7 +207,7 @@ return } - var url = `/blog/${id}/likes`, + var url = `/article/${id}/likes`, data = { likes: ++badge } $.ajax({ @@ -216,6 +216,7 @@ dataType: 'json', data, success: function (res) { + console.log(res.msg) if (!res.code) { self.handleLikeOk(el, res?.data) } else { diff --git a/public/data/elk-blog.sql b/public/data/elk-blog.sql index e0a00398c8a18f082bafcfbc106ca24a4b919c03..e7c7c9df62536aa743385f66782dd7d50c647469 100644 --- a/public/data/elk-blog.sql +++ b/public/data/elk-blog.sql @@ -13,6 +13,11 @@ File Encoding : 65001 Date: 2022-07-30 08:21:33 */ +-- create database elk-blog +create database `elk-blog` default character set utf8mb4 collate utf8mb4_general_ci; + +use elk-blog; + SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/public/green/css/app.css b/public/green/css/app.css index 77f0bf1dc98beb42850f473f2a4c2e38c218698f..089a90788b5b40b27c19d05521e8f0184f668196 100644 --- a/public/green/css/app.css +++ b/public/green/css/app.css @@ -225,6 +225,7 @@ a:hover, a:active{ } .app-blog-model .app-container-inner{ width:80%; + /*width:100%;*/ } .app-container-inner{ display:flex; @@ -592,7 +593,7 @@ a:hover, a:active{ /* blog detail */ .app-detail-overview{ display:flex; - justify-content:space-between; + justify-content:center; align-items:center; } .app-detail-title{ diff --git a/public/green/images/ico.png b/public/green/images/ico.png new file mode 100644 index 0000000000000000000000000000000000000000..4f24ac61f7e9ae1876905f67422296682cc2c203 Binary files /dev/null and b/public/green/images/ico.png differ diff --git a/public/home/images/aboutme/me.jpg b/public/home/images/aboutme/me.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6e12a045829a2811549f4c17903fd4f9cdc2cbb0 Binary files /dev/null and b/public/home/images/aboutme/me.jpg differ diff --git a/public/ico.png b/public/ico.png new file mode 100644 index 0000000000000000000000000000000000000000..4f24ac61f7e9ae1876905f67422296682cc2c203 Binary files /dev/null and b/public/ico.png differ diff --git a/routers/routers.go b/routers/routers.go index f2d10f98a5995ee28d1694ac58170f5dd9a07821..0c45cfb07df44d41aedda78d35eb411ab0da7210 100644 --- a/routers/routers.go +++ b/routers/routers.go @@ -13,10 +13,11 @@ import ( ) func RouterApp() *gin.Engine { - gin.SetMode(gin.ReleaseMode) + //gin.SetMode(gin.ReleaseMode) + gin.SetMode(gin.DebugMode) router := gin.Default() - + router.Use(middleware.LoggerToFile()) // 模板引擎 router.HTMLRender = utils.NewRender("views/") @@ -47,17 +48,17 @@ func RouterApp() *gin.Engine { back.POST("upload/image", admin.UploadImage) // 文章管理 - blogController := new(admin.Blog) - back.GET("blog", blogController.Index) - back.GET("blog/category", blogController.Category) - back.GET("blog/category/list", blogController.CategoryList) - back.GET("blog/list", blogController.List) - back.GET("blog/edit", blogController.Edit) - back.GET("blog/:id", blogController.Detail) - back.GET("blog/edit/md", blogController.EditMd) - back.POST("blog/insert", blogController.Insert) - back.PUT("blog/update", blogController.Update) - back.POST("blog/delete", blogController.Destory) + articleController := new(admin.Article) + back.GET("article", articleController.Index) + back.GET("article/category", articleController.Category) + back.GET("article/category/list", articleController.CategoryList) + back.GET("article/list", articleController.List) + back.GET("article/:id", articleController.Detail) + back.GET("article/edit", articleController.Edit) + back.GET("article/edit/md", articleController.EditMd) + back.POST("article/insert", articleController.Insert) + back.PUT("article/update", articleController.Update) + back.POST("article/delete", articleController.Destroy) // 分类管理 categoryController := new(admin.Category) @@ -73,7 +74,7 @@ func RouterApp() *gin.Engine { back.GET("banner/list", bannerController.List) back.POST("banner/insert", bannerController.Insert) back.PUT("banner/update", bannerController.Update) - back.POST("banner/delete", bannerController.Destory) + back.POST("banner/delete", bannerController.Destroy) // System管理 systemController := new(admin.System) @@ -116,6 +117,12 @@ func RouterApp() *gin.Engine { back.POST("user/insert", userController.Insert) back.PUT("user/update", userController.Update) back.POST("user/delete", userController.Destory) + + // 用户管理 + aboutController := new(admin.About) + back.GET("about", aboutController.Index) + back.PUT("about/update", aboutController.Update) + back.GET("about/info", aboutController.Detail) } // 前台页面 @@ -130,13 +137,13 @@ func RouterApp() *gin.Engine { front.GET("/verify", homeController.GetVerify) // 博客 - blogController := new(home.Blog) - front.GET("/blog", blogController.Index) - front.GET("/blog/:id", blogController.Detail) - front.GET("/blog/archive/:id", blogController.Archive) - front.GET("/blog/category/:id", blogController.Category) + blogController := new(home.Article) + front.GET("/article", blogController.Index) + front.GET("/article/:id", blogController.Detail) + front.GET("/article/archive/:id", blogController.Archive) + front.GET("/article/category/:id", blogController.Category) front.GET("/search", blogController.Index) - front.POST("/blog/:id/likes", blogController.Likes) + front.POST("/article/:id/likes", blogController.Likes) // 标签 tagsController := new(home.Tags) diff --git a/setting/config.toml b/setting/config.toml new file mode 100644 index 0000000000000000000000000000000000000000..5f7ddb81e0ec08bd4a43d81005590c0c195a8d43 --- /dev/null +++ b/setting/config.toml @@ -0,0 +1,81 @@ +[app] +env = 'dev' +log_level = 'DEBUG' +cookie_secret = 'ZJVAfAwEnR' +data_path = 'data/max_online_num' +log_file_path = './' +log_file_name = 'juzi.log' +page_size = 10 +key = '' +upload_oss = true + +[server] +host = '127.0.0.1' +port = ':8080' +reader_timeout = 60 +write_timeout = 60 + +[database] +type = 'mysql' +# docker 部署时，host要填写宿主机的ip https://codeantenna.com/a/CuMmEL1ebL +host = '127.0.0.1' +port = '3306' +user = 'root' +password = '123456' +dbname = 'elk-blog' +charset = 'utf8mb4' +table_prefix = "tk_" +# 最大空闲连接数 +max_idle = 2 +# 最大打开连接数 +max_conn = 10 + + +[xorm] +show_sql = true +# 0-debug, 1-info, 2-warning, 3-error, 4-off, 5-unknow +log_level = 0 + +[security] +# 退订邮件使用的 token key +# faDBMc +unsubscribe_token_key = 'i2ZPUr3YvdX' +# 注册激活邮件使用的 sign salt +activate_sign_salt = 'uaUGhP0KHcZPQVyk8N' + +# 过滤广告 +[sensitive] +# 标题关键词 +title = '' +# 内容关键词 +content = '' + +# 搜索配置 +[search] +engine_url = '' + +[aliyun] +access_key = "access_key" +secret_access_key = "secret_access_key" +bucket_name = "bucket_name" +endpoint = "https://oss-cn-beijing.aliyuncs.com" +inner_net = "https://static.domain.net/" +outer_net = "https://domain.oss-cn-beijing.aliyuncs.com/" +aliyun_net = "http://domain.oss-cn-beijing.aliyuncs.com/" + +# 站点信息 +[site] +domain = 'http://127.0.0.1:8080' +title = '麋鹿博客' +keyword = 'Elk设计网页设计网站设计' +description = '设计师糜鹿个人网站，分享设计，分享人生，提供优质的网页设计、UI设计、APP用户体验改善、UE设计等各项设计服务！' +blogTitle = '糜鹿设计' +blogKeywords = 'Elk设计网页设计网站设计' +blogDescription = '设计师糜鹿个人网站，分享设计，分享人生，提供优质的网页设计、UI设计、APP用户体验改善、UE设计等各项设计服务！' +email = 'elk@qq.com' +contact = 'Elk' +company = 'Elk' +phone = '123456' +icp = '哥在香港' +address = '中国 • 上海' +tpl = 'green' diff --git a/test/abc.jpg b/test/abc.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6e12a045829a2811549f4c17903fd4f9cdc2cbb0 Binary files /dev/null and b/test/abc.jpg differ diff --git a/test/test_a.go b/test/test_a.go new file mode 100644 index 0000000000000000000000000000000000000000..3ecf1dcca6420949e320e5b00e8ef1416128b486 --- /dev/null +++ b/test/test_a.go @@ -0,0 +1,52 @@ +package main + +import ( + "fmt" + "github.com/sirupsen/logrus" + "golang.org/x/crypto/bcrypt" + "regexp" + "strconv" + "strings" +) + +// BcryptHash 使用 bcrypt 对密码进行加密 +func BcryptHash(password string) string { + // GenerateFromPassword 的第二个参数是 cost 值。建议大于 12，数值越大耗费时间越长 + bytes, err := bcrypt.GenerateFromPassword([]byte(password), 14) + logrus.Error(err) + + return string(bytes) +} + +// BcryptCheck 对比明文密码和数据库的哈希值 +func BcryptCheck(password, hash string) bool { + err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)) + return err == nil +} + +// BcryptIsHashed 判断字符串是否是哈希过的数据 +func BcryptIsHashed(str string) bool { + // bcrypt 加密后的长度等于 60 + return len(str) == 60 +} + +func RepImages(htmls string) { + var imgRE = regexp.MustCompile(`]+\bsrc=["']([^"']+)["']`) + imgs := imgRE.FindAllStringSubmatch(htmls, -1) + out := make([]string, len(imgs)) + myImage := "https://static.juzizhou.net/1111111111111111.jpg" + resHtml := htmls + for i := range out { + if strings.HasPrefix(imgs[i][1], "https://static.juzizhou.net") { + resHtml = strings.Replace(resHtml, imgs[i][1], myImage, -1) + out[i] = imgs[i][1] + fmt.Println(strconv.Itoa(i), out[i]) + } + } + fmt.Println(resHtml) +} + +func main() { + a := BcryptHash("admin123$") + fmt.Print(a) +} diff --git a/test/test_b.go b/test/test_b.go new file mode 100644 index 0000000000000000000000000000000000000000..42d49106d400ab668a36041f5733d3d79b60c755 --- /dev/null +++ b/test/test_b.go @@ -0,0 +1,55 @@ +package main + +import ( + "fmt" + "path/filepath" + "sync" + "time" +) + +// 婷婷的淘宝客户端和web端都会指向婷婷这一个人 +type Woman struct { + name string +} + +var ( + once sync.Once + ting *Woman + ti1 = int64(0) + long = 0 +) + +func getTing() *Woman { + once.Do(func() { + ting = new(Woman) + ting.name = "tingting" + fmt.Println("newtingting") + }) + fmt.Println("gettingting") + return ting +} + +func main() { + for i := 0; i < 3; i++ { + _ = getTing() + } + now := time.Now() + fileExt := ".jpg" + //文件存放路径 + fileDir := fmt.Sprintf("articles") + + //文件名称 + timeStamp := now.Unix() + fileName := fmt.Sprintf("%d%s", timeStamp, fileExt) + // 文件key + fileKey := filepath.Join(fileDir, fileName) + fmt.Println(fileKey) + t1 := time.Now().Unix() + if ti1 != t1 { //如果时间戳不一样,那么归零 + long = 0 + } + ti1 = t1 + long++ + obj := fmt.Sprintf("article/%d%d.png", t1, long) + fmt.Println(obj) +} diff --git a/test/test_c.go b/test/test_c.go new file mode 100644 index 0000000000000000000000000000000000000000..997016b9cef71406b36b9c757008212c2259aacc --- /dev/null +++ b/test/test_c.go @@ -0,0 +1,34 @@ +package main + +import ( + "fmt" + "github.com/aliyun/aliyun-oss-go-sdk/oss" + "os" +) + +func main() { + // 创建OSSClient实例。 + // yourEndpoint填写Bucket对应的Endpoint，以华东1（杭州）为例，填写为https://oss-cn-hangzhou.aliyuncs.com。其它Region请按实际情况填写。 + // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。 + client, err := oss.New("https://oss-cn-beijing.aliyuncs.com", + "", "") + if err != nil { + fmt.Println("Error:", err) + os.Exit(-1) + } + + // 填写存储空间名称，例如examplebucket。 + bucket, err := client.Bucket("juzizhou") + if err != nil { + fmt.Println("Error:", err) + os.Exit(-1) + } + + // 依次填写Object的完整路径（例如exampledir/exampleobject.txt）和本地文件的完整路径（例如D:\\localpath\\examplefile.txt）。 + err = bucket.PutObjectFromFile("article/abc.jpg", "E:\\GolandProjects\\juzizhou\\test\\abc.jpg") + if err != nil { + fmt.Println("Error:", err) + os.Exit(-1) + } + fmt.Println("https://static.domain.net/article/abc.jpg") +} diff --git a/views/admin/about/index.html b/views/admin/about/index.html new file mode 100644 index 0000000000000000000000000000000000000000..cb677f7096a3e48770bbad379c05720b60a9ce20 --- /dev/null +++ b/views/admin/about/index.html @@ -0,0 +1,79 @@ +{% include "../common/_app_css.html" %} +
+ +
+ 关于我 +
+ + + + + + 取消 + 确认 + + + +
+{% include "../common/_app_js.html" %} +{% block importJs %} + +{% endblock %} +{% include "../components/tinymce.html" %} +{% include "../components/table-tool-bar.html" %} + diff --git a/views/admin/blog/edit.html b/views/admin/article/edit.html similarity index 94% rename from views/admin/blog/edit.html rename to views/admin/article/edit.html index 77ff31f6925f99bfbe0f2fc60efd9da0fb2c3822..842f39efd22f41e530a2c27e9e0e0669329b1910 100644 --- a/views/admin/blog/edit.html +++ b/views/admin/article/edit.html @@ -8,6 +8,9 @@ + + + @@ -80,6 +83,7 @@ catid: '', content: '', status: 1, + source_url: '', }, rules: { title: [ @@ -113,12 +117,12 @@ addNew() { // this.editVisible = true // this.dialogStatus = 'create' - window.open('blog/edit') + window.open('article/edit') }, getCategoryList() { app.request({ method: 'get', - url: 'blog/category/list', + url: 'article/category/list', params: this.queryForm, }).then((res) => { const rows = res?.data?.rows @@ -131,7 +135,7 @@ getDetail() { app.request({ method: 'get', - url: `blog/${this.id}`, + url: `article/${this.id}`, }).then((res) => { this.modelForm = res?.data?.rows @@ -144,7 +148,7 @@ this.tableLoading = true app.request({ method: 'get', - url: 'blog/list', + url: 'article/list', params: this.queryForm, }).then((res) => { this.tableData = res?.data?.rows @@ -200,7 +204,7 @@ app.request({ method: 'post', - url: 'blog/delete', + url: 'article/delete', data: app.stringify({ id }) }).then((res) => { !res?.code && this.refreshData() @@ -231,7 +235,7 @@ if (valid) { app.request({ method: 'post', - url: 'blog/insert', + url: 'article/insert', data: this.modelForm, }).then(() => { this.editVisible = false @@ -258,7 +262,7 @@ onUpdate() { app.request({ method: 'put', - url: 'blog/update', + url: 'article/update', data: this.modelForm, }).then(() => { this.editVisible = false @@ -287,7 +291,7 @@ done && done() }, toMarkdown() { - window.open('/admin/blog/edit/md') + window.open('/admin/article/edit/md') } } }) diff --git a/views/admin/blog/index.html b/views/admin/article/index.html similarity index 95% rename from views/admin/blog/index.html rename to views/admin/article/index.html index 61d0e49dc8ea397cedbea0b81e54ca11410c869f..359d94b808546b3e07c83c524e58161171e6bb3a 100644 --- a/views/admin/blog/index.html +++ b/views/admin/article/index.html @@ -31,7 +31,7 @@ @@ -127,15 +127,15 @@ addNew() { this.editVisible = true this.dialogStatus = 'create' - window.open('blog/edit') + window.open('article/edit') }, addNewMd() { - window.open('blog/edit/md') + window.open('article/edit/md') }, getCategoryList() { app.request({ method: 'get', - url: 'blog/category/list', + url: 'article/category/list', params: this.queryForm, }).then((res) => { this.categoryList = res?.data?.rows @@ -145,7 +145,7 @@ this.tableLoading = true app.request({ method: 'get', - url: 'blog/list', + url: 'article/list', params: this.queryForm, }).then((res) => { this.tableData = res?.data?.rows @@ -169,8 +169,8 @@ this.editVisible = true this.dialogStatus = 'update' this.modelForm = row - // const url = `blog/edit?id=${row.id}${isMd}` - const url = row.md ? `blog/edit/md?id=${row.id}` : `blog/edit?id=${row.id}` + // const url = `article/edit?id=${row.id}${isMd}` + const url = row.md ? `article/edit/md?id=${row.id}` : `article/edit?id=${row.id}` window.open(url) }, @@ -204,7 +204,7 @@ app.request({ method: 'post', - url: 'blog/delete', + url: 'article/delete', data: app.stringify({ id }) }).then((res) => { !res?.code && this.refreshData() @@ -231,7 +231,7 @@ if (valid) { app.request({ method: 'post', - url: 'blog/insert', + url: 'article/insert', data: this.modelForm, }).then(() => { this.editVisible = false @@ -258,7 +258,7 @@ onUpdate() { app.request({ method: 'put', - url: 'blog/update', + url: 'article/update', data: this.modelForm, }).then(() => { this.editVisible = false diff --git a/views/admin/blog/md.html b/views/admin/article/md.html similarity index 92% rename from views/admin/blog/md.html rename to views/admin/article/md.html index 2aeeefe5506dbf1eb9357b0abbd236bae5303d58..8d38eb463211cadd69e72f251d38599a900de6ce 100644 --- a/views/admin/blog/md.html +++ b/views/admin/article/md.html @@ -89,6 +89,12 @@ + + + + + + @@ -113,6 +119,7 @@ content: '', catid: '', status: 1, + source_url: '', }, rules: { title: [ @@ -145,7 +152,7 @@ getDetail() { app.request({ method: 'get', - url: `blog/${this.id}`, + url: `article/${this.id}`, }).then((res) => { this.modelForm = res?.data?.rows this.input = this.modelForm.md @@ -158,7 +165,7 @@ getCategoryList() { app.request({ method: 'get', - url: 'blog/category/list', + url: 'article/category/list', params: this.queryForm, }).then((res) => { const rows = res?.data?.rows @@ -183,7 +190,7 @@ if (valid) { app.request({ method: 'post', - url: 'blog/insert', + url: 'article/insert', data: this.modelForm, }).then(() => { this.handleClose() @@ -208,7 +215,7 @@ onUpdate() { app.request({ method: 'put', - url: 'blog/update', + url: 'article/update', data: this.modelForm, }).then(() => { this.editVisible = false @@ -226,7 +233,7 @@ this.drawer = !this.drawer }, toEditor() { - window.open('/admin/blog/edit') + window.open('/admin/article/edit') }, handleClose(done) { this.$refs.modelForm && this.$refs.modelForm.resetFields() diff --git a/views/admin/auth/login.html b/views/admin/auth/login.html index d17a3e51ac435c4ed75fc49c9f573b6a2fb860d2..2e0cb3ae845d65772f957b39adf4818e64b2b55b 100644 --- a/views/admin/auth/login.html +++ b/views/admin/auth/login.html @@ -22,7 +22,7 @@
- +
{# {{/*
*/}} #} @@ -65,8 +65,8 @@ if (res.code === 20103) { var toPath = '/admin/' - res.data.token && app.cookie.set('milu.blog.token', res.data.token, 1, toPath) - res.data.user && localStorage.setItem('milu.blog.user', app.btoa(res.data.user)) + res.data.token && app.cookie.set('milu.article.token', res.data.token, 1, toPath) + res.data.user && localStorage.setItem('milu.article.user', app.btoa(res.data.user)) layer.msg('登录成功', function () { location.href = toPath diff --git a/views/admin/components/tinymce.html b/views/admin/components/tinymce.html index 31969c19c6f51f998d1b796a048339594fd0b0a1..7dd63bbf542955ea566cb7dbc76ab776380860f8 100644 --- a/views/admin/components/tinymce.html +++ b/views/admin/components/tinymce.html @@ -89,6 +89,7 @@ imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'], default_link_target: '_blank', link_title: false, + images_upload_url: '/admin/upload/image', nonbreaking_force_tab: true, // inserting nonbreaking space   need Nonbreaking Space Plugin init_instance_callback: editor => { if (_this.value) { @@ -116,7 +117,25 @@ editor.on('focus', function () { editor.setContent(_this.value) }) - } + }, + // images_upload_handler(blobInfo, success, failure, progress) { + // progress(0); + // const token = _this.$store.getters.token; + // getToken(token).then(response => { + // const url = response.data.qiniu_url; + // const formData = new FormData(); + // formData.append('token', response.data.qiniu_token); + // formData.append('key', response.data.qiniu_key); + // formData.append('file', blobInfo.blob(), url); + // upload(formData).then(() => { + // success(url); + // progress(100); + // }) + // }).catch(err => { + // failure('出现未知问题，刷新页面，或者联系程序员') + // console.log(err); + // }); + // }, // 整合七牛上传 // images_dataimg_filter(img) { // setTimeout(() => { diff --git a/views/admin/index/index.html b/views/admin/index/index.html index 492b0d69b39201b977b56ae12137c196c0f44313..713c1e4a948363e08b0606246b3887412385f05d 100644 --- a/views/admin/index/index.html +++ b/views/admin/index/index.html @@ -21,11 +21,12 @@
快捷操作
新增作品 - 新增博文 + 新增博文 新增作品分类 新增博客分类 作品评论 - 博客评论 + 博客评论 + 关于我 留言管理 友情链接 广告管理 diff --git a/views/admin/index/welcome.html b/views/admin/index/welcome.html index 75894b9dc0360ad076574039c13c360865e8ac48..6fbe6a67710c6454aa9d8786ff766c99ef48da3b 100644 --- a/views/admin/index/welcome.html +++ b/views/admin/index/welcome.html @@ -19,7 +19,7 @@
快捷操作
- 新增文章 + 新增文章 新增分类 文章评论 留言管理 diff --git a/views/admin/layouts/master.html b/views/admin/layouts/master.html index 7c2e226f3e28ed8ed9e3d32ef04c35cc9c574a49..943ac45e41edd53ed1ca412b2763ea8f451b778e 100644 --- a/views/admin/layouts/master.html +++ b/views/admin/layouts/master.html @@ -103,7 +103,7 @@ this.bind() }, info: function () { - var user = JSON.parse(app.atob(localStorage.getItem('milu.blog.user'))) + var user = JSON.parse(app.atob(localStorage.getItem('milu.article.user'))) if (user) { $('#js-top-username').text(user.nickname) @@ -114,7 +114,7 @@ $('.login-out').on("click", function () { layer.msg('成功退出', { time: 1200 }, function () { window.location.href = '/admin/login' - app.cookie.remove('milu.blog.token') + app.cookie.remove('milu.article.token') }); }); }, diff --git a/views/admin/system/setting.html b/views/admin/system/setting.html index 6b307b4425d4f9e36dbc183ee5db79030300a17d..2cffb2faf4c3006fa5d61943a88334939067bf87 100644 --- a/views/admin/system/setting.html +++ b/views/admin/system/setting.html @@ -5,40 +5,93 @@ 网站信息设置
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - + - + 取消 @@ -55,13 +108,25 @@ return { loading: false, modelForm: { - tpl: 'default', + domain: '', + phone:'', + contact:'', + icp:'green', + tpl: null, }, tplOptions: [ { value: 'home', label: '默认主题' }, { value: 'defaulted', label: '极简主题' }, { value: 'green', label: '绿色主题' }, ], + commentOptions: [ + {value: true, label:'允许评论'}, + {value: false, label: '暂停评论'} + ], + bannerOptions: [ + {value: true, label:'显示轮播'}, + {value: false, label: '隐藏轮播'} + ] } }, created() { @@ -73,7 +138,9 @@ method: 'get', url: 'system/setting/list', }).then((res) => { - this.modelForm = res?.data?.rows + console.log(res.data.rows) + // this.modelForm = res?.data?.rows[0] + this.modelForm = res.data.rows setTimeout(() => { this.loading = false diff --git a/views/defaulted/blog/detail.html b/views/defaulted/article/detail.html similarity index 100% rename from views/defaulted/blog/detail.html rename to views/defaulted/article/detail.html diff --git a/views/defaulted/blog/index.html b/views/defaulted/article/index.html similarity index 100% rename from views/defaulted/blog/index.html rename to views/defaulted/article/index.html diff --git a/views/defaulted/blog/search.html b/views/defaulted/article/search.html similarity index 100% rename from views/defaulted/blog/search.html rename to views/defaulted/article/search.html diff --git a/views/defaulted/category/index.html b/views/defaulted/category/index.html index 5ac46041dca954ff22067b561d6d8236c31aed26..1deb3844b3023ba61fdf35cb26c03fe4e4bba4e1 100644 --- a/views/defaulted/category/index.html +++ b/views/defaulted/category/index.html @@ -10,7 +10,7 @@ {% for vo in data.list %}
- {{ vo.Title }} + {{ vo.Title }}
{{ vo.Content | safe }}
diff --git a/views/defaulted/common/_blog_sider.html b/views/defaulted/common/_blog_sider.html index 4d79ef859d96efd70104db715130bdddcd46d1fb..1ea05cb4bd83627805bbaf382f139b4af7eec33e 100644 --- a/views/defaulted/common/_blog_sider.html +++ b/views/defaulted/common/_blog_sider.html @@ -5,7 +5,7 @@
-
杰克 - 一直在路上
+
{{data.site.Company}}一直在路上

https://gitee.com/jikey/elk-blog -

+ {{ data.about.Content | safe }}
diff --git a/views/green/archive/index.html b/views/green/archive/index.html index c909172a07b6e11ac0a057bcf12e12a9f2933128..e7e9c6fd3170dffc0ad686694398ff4fc32c4762 100644 --- a/views/green/archive/index.html +++ b/views/green/archive/index.html @@ -4,6 +4,12 @@ {% block head %} + {% endblock %} {% block content %} @@ -15,7 +21,7 @@ {% for vo in data.list %}
- {{ vo.Title | addslashes }} + {{ vo.Title | addslashes }}
{{ vo.Description | escape | safe | slice:":150" }}
diff --git a/views/green/blog/detail.html b/views/green/article/detail.html similarity index 89% rename from views/green/blog/detail.html rename to views/green/article/detail.html index 0ed4f2e435e7bc34bf27771b4f071fb891206f2b..b61438e13fc98fa0aa40251c0af9d045be0db545 100644 --- a/views/green/blog/detail.html +++ b/views/green/article/detail.html @@ -1,6 +1,6 @@ {% extends "../layouts/blog-layouts.html" %} -{% block title %}{{ data.blog.Title }}{% endblock %} +{% block title %}{{ data.article.Title }}{% endblock %} {% block head %} @@ -9,7 +9,7 @@ {% block content %}
-
+
@@ -45,48 +45,48 @@
-

{{ data.blog.Title }}

+

{{ data.article.Title }}

-
- +
-
{{ data.blog.Author }}
+
{{ data.commentTotal }} 评论
/ - + / -
{{ data.blog.Views }} 阅读
+
{{ data.article.Views }} 阅读
/ -
{{ data.blog.Content | length }} 字
+
{{ data.article.Content | length }} 字
- {{ data.blog.Createtime | slice:"8:10" }} - {{ data.blog.Createtime | slice:":7" }} + {{ data.article.Createtime | slice:"8:10" }} + {{ data.article.Createtime | slice:":7" }}
-
{{ data.blog.Content | safe }}
+
{{ data.article.Content | safe }}
- 转载请注明来源： 杰克 + 转载请注明来源： {{data.site.Company}}
本文链接： - {{ data.site.Domain }}/blog/{{ data.blog.Id }} + {{ data.site.Domain }}/article/{{ data.article.Id }}
-
+ + {% if(data.site.AllowComment) %}
@@ -133,7 +134,7 @@
  • * - 了解Gravatar + 了解Cravatar
  • @@ -149,7 +150,7 @@
  • - +
    • @@ -209,4 +210,5 @@
    + {% endif %} {% endblock %} \ No newline at end of file diff --git a/views/green/blog/index.html b/views/green/article/index.html similarity index 92% rename from views/green/blog/index.html rename to views/green/article/index.html index 9864fd61d920a28e4466eaba179f33f740fffa44..0def77a73d002c25bf1972c633f691bf471c859c 100644 --- a/views/green/blog/index.html +++ b/views/green/article/index.html @@ -4,6 +4,12 @@ {% block head %} + {% endblock %} {% block content %} @@ -15,7 +21,7 @@ {% for vo in data.list %}
    - {{ vo.Title | addslashes }} + {{ vo.Title | addslashes }}
    {{ vo.Description | escape | safe | slice:":150" }}
    @@ -32,7 +38,7 @@
    {{ vo.Views }} 阅读
    - + {{ vo.ColTitle }}
    diff --git a/views/green/blog/search.html b/views/green/article/search.html similarity index 100% rename from views/green/blog/search.html rename to views/green/article/search.html diff --git a/views/green/category/index.html b/views/green/category/index.html index c909172a07b6e11ac0a057bcf12e12a9f2933128..6a76d139a1a29d8dafa86db3ebcda28f4c48d50f 100644 --- a/views/green/category/index.html +++ b/views/green/category/index.html @@ -4,6 +4,12 @@ {% block head %} + {% endblock %} {% block content %} @@ -15,7 +21,7 @@ {% for vo in data.list %}
    - {{ vo.Title | addslashes }} + {{ vo.Title | addslashes }}
    {{ vo.Description | escape | safe | slice:":150" }}
    @@ -32,7 +38,7 @@
    {{ vo.Views }} 阅读
    - + {{ vo.ColTitle }}
    diff --git a/views/green/common/_blog_sider.html b/views/green/common/_blog_sider.html index 654bbe36d67ce22089d3237af10ada3aacb678e0..45c742c5120f27c97b2f3ddc5c72b7141fbe7fca 100644 --- a/views/green/common/_blog_sider.html +++ b/views/green/common/_blog_sider.html @@ -3,12 +3,12 @@
    - +
    -
    杰克 - 一直在路上
    +
    {{data.site.Company}}一直在路上
    - @@ -33,10 +33,10 @@
      - {% for cat in data.blogCategory %} + {% for cat in data.articleCategory %} {% if cat.ColId != 4 %}
    • - {{ cat.ColTitle }} + {{ cat.ColTitle }} {{ cat.Total }}
      • {% endif %} @@ -54,7 +54,7 @@ {% for arc in data.archiveList %} {% if arc.Time %}
    • - {{ arc.Time }} + {{ arc.Time }} [{{ arc.Count }}]
      • {% endif %} diff --git a/views/green/index/index.html b/views/green/index/index.html index c8e5ee9d8378e9e03cc572d6760a8b86d0789783..de52237adcf8c07067440c1e21fff180a1565dde 100644 --- a/views/green/index/index.html +++ b/views/green/index/index.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -
    diff --git a/views/home/blog/index.html b/views/home/article/index.html similarity index 95% rename from views/home/blog/index.html rename to views/home/article/index.html index 3ec82c13d7316c7d0ef601e653a21c42914c54b2..16972a62222c8e863194ce524daa8a09e7984b77 100644 --- a/views/home/blog/index.html +++ b/views/home/article/index.html @@ -11,7 +11,7 @@ {% for vo in data.list %}
    - {{ vo.Title }} + {{ vo.Title }}
    {{ vo.Description | escape | safe | slice:":150" }}
    @@ -28,7 +28,7 @@
    {{ vo.Views }} 阅读
    - + {{ vo.ColTitle }}
    diff --git a/views/home/blog/search.html b/views/home/article/search.html similarity index 100% rename from views/home/blog/search.html rename to views/home/article/search.html diff --git a/views/home/category/index.html b/views/home/category/index.html index 3c56211959647734f59643ad0ee06d90c7209e1e..02171c91cd25d8eeb15b97a449d2674d96e24253 100644 --- a/views/home/category/index.html +++ b/views/home/category/index.html @@ -11,7 +11,7 @@ {% for vo in data.list %}
    - {{ vo.Title }} + {{ vo.Title }}
    {{ vo.Content | safe }}
    diff --git a/views/home/common/_blog_sider.html b/views/home/common/_blog_sider.html index 58ee9729c85150631d68911fa74b846ba36186b7..7e71073677e98fb021eade1c57b0ed335df99116 100644 --- a/views/home/common/_blog_sider.html +++ b/views/home/common/_blog_sider.html @@ -5,10 +5,10 @@
      - {% for cat in data.blogCategory %} + {% for cat in data.articleCategory %} {% if cat.ColId != 4 %}
    • - {{ cat.ColTitle }} + {{ cat.ColTitle }} {{ cat.Total }}
      • {% endif %} @@ -25,7 +25,7 @@
        {% for arc in data.archiveList %}
      • - {{ arc.Time }} + {{ arc.Time }} [{{ arc.Count }}]
        • {% endfor %} diff --git a/views/home/index/index.html b/views/home/index/index.html index 6146cbf8f68226ef600adf22164dba3c8948246a..a8237b28c59c59cf360f465d5228fe70d04e8262 100644 --- a/views/home/index/index.html +++ b/views/home/index/index.html @@ -26,10 +26,10 @@
          - {% for cat in data.blogCategory %} + {% for cat in data.articleCategory %} {% if cat.ColId != 4 && forloop.Counter <= 5 %}
        • - {{ cat.ColTitle }}{{ cat.ColTitle }} + {{ cat.ColTitle }}{{ cat.ColTitle }}
          • {% endif %} {% endfor %} diff --git a/views/home/layouts/_footer.html b/views/home/layouts/_footer.html index c44cea5acc6452c74a8bbb6995fe861921aee2ed..dcdbd9af3c846eb4546943285e024a47e1d6c733 100644 --- a/views/home/layouts/_footer.html +++ b/views/home/layouts/_footer.html @@ -18,7 +18,7 @@

        - Copyright © 2022 {{ data.site.Company }}. All Rights Reserved. + Copyright © 2022 {{ data.site.Company }}. All Rights Reserved. {{data.site.Record}}

        为了使您有更好的浏览体验，建议使用Chrome浏览器

        diff --git a/views/home/layouts/_header.html b/views/home/layouts/_header.html index df6b7a03b745a7e87a2b00825bf37b00aadec1ea..fc348c476b671f7f645910d5d94a0032414e2927 100644 --- a/views/home/layouts/_header.html +++ b/views/home/layouts/_header.html @@ -19,8 +19,8 @@
      • 首页
        • -
      • - 文章 +
      • + 文章
      • 标签 diff --git a/views/home/message/index.html b/views/home/message/index.html index afc91f1237b063d5c46e5edb0c2cb0c926eee8f4..803fe252960afa75c931b858db59556b3a5cf76e 100644 --- a/views/home/message/index.html +++ b/views/home/message/index.html @@ -28,7 +28,7 @@
      • * - 了解Gravatar + 了解Gravatar