From 967ef37ce9d4fa770460002550d0c2bb940f7843 Mon Sep 17 00:00:00 2001 From: roberChen Date: Fri, 26 Mar 2021 14:26:19 +0800 Subject: [PATCH] chore: use core/logs - depretace all adapter/logs to core/logs --- controllers/AccountController.go | 2 +- controllers/BaseController.go | 2 +- controllers/BookController.go | 2 +- controllers/BookMemberController.go | 2 +- controllers/HomeController.go | 2 +- controllers/ItemsetsController.go | 2 +- controllers/LabelController.go | 2 +- controllers/ManagerController.go | 2 +- controllers/SearchController.go | 2 +- controllers/SettingController.go | 2 +- mail/smtp.go | 3 ++- models/AttachmentModel.go | 2 +- models/BookModel.go | 2 +- models/BookResult.go | 2 +- models/Relationship.go | 2 +- models/Template.go | 2 +- 16 files changed, 17 insertions(+), 16 deletions(-) diff --git a/controllers/AccountController.go b/controllers/AccountController.go index ff126c81..29851e7a 100644 --- a/controllers/AccountController.go +++ b/controllers/AccountController.go @@ -8,7 +8,7 @@ import ( "html/template" - "github.com/beego/beego/v2/adapter/logs" + "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/lifei6671/gocaptcha" "github.com/mindoc-org/mindoc/conf" diff --git a/controllers/BaseController.go b/controllers/BaseController.go index 4cd778ed..81201985 100644 --- a/controllers/BaseController.go +++ b/controllers/BaseController.go @@ -13,7 +13,7 @@ import ( "path/filepath" "github.com/beego/beego/v2/adapter" - "github.com/beego/beego/v2/adapter/logs" + "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" diff --git a/controllers/BookController.go b/controllers/BookController.go index a30fce4b..7e104cbd 100644 --- a/controllers/BookController.go +++ b/controllers/BookController.go @@ -17,8 +17,8 @@ import ( "net/http" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/graphics" "github.com/mindoc-org/mindoc/models" diff --git a/controllers/BookMemberController.go b/controllers/BookMemberController.go index e30012d8..38c33f1d 100644 --- a/controllers/BookMemberController.go +++ b/controllers/BookMemberController.go @@ -3,8 +3,8 @@ package controllers import ( "errors" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" ) diff --git a/controllers/HomeController.go b/controllers/HomeController.go index 744f4dd2..673c03d8 100644 --- a/controllers/HomeController.go +++ b/controllers/HomeController.go @@ -4,7 +4,7 @@ import ( "math" "net/url" - "github.com/beego/beego/v2/adapter/logs" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils/pagination" diff --git a/controllers/ItemsetsController.go b/controllers/ItemsetsController.go index eda28b05..ef129111 100644 --- a/controllers/ItemsetsController.go +++ b/controllers/ItemsetsController.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils/pagination" diff --git a/controllers/LabelController.go b/controllers/LabelController.go index e954dd3a..36a20861 100644 --- a/controllers/LabelController.go +++ b/controllers/LabelController.go @@ -3,8 +3,8 @@ package controllers import ( "math" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils/pagination" diff --git a/controllers/ManagerController.go b/controllers/ManagerController.go index 360c6b8c..f695d4d5 100644 --- a/controllers/ManagerController.go +++ b/controllers/ManagerController.go @@ -14,8 +14,8 @@ import ( "os" "github.com/beego/beego/v2/adapter" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils" diff --git a/controllers/SearchController.go b/controllers/SearchController.go index 1061a487..ff734817 100644 --- a/controllers/SearchController.go +++ b/controllers/SearchController.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/beego/beego/v2/adapter/logs" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils" diff --git a/controllers/SettingController.go b/controllers/SettingController.go index 262a377e..1ad090c0 100644 --- a/controllers/SettingController.go +++ b/controllers/SettingController.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/beego/beego/v2/adapter/logs" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/graphics" "github.com/mindoc-org/mindoc/models" diff --git a/mail/smtp.go b/mail/smtp.go index fa6c88c6..5d1f82bb 100644 --- a/mail/smtp.go +++ b/mail/smtp.go @@ -17,7 +17,8 @@ import ( "regexp" "strconv" "strings" - "github.com/beego/beego/v2/adapter/logs" + + "github.com/beego/beego/v2/core/logs" ) var ( diff --git a/models/AttachmentModel.go b/models/AttachmentModel.go index 8df9d3ae..eaf88286 100644 --- a/models/AttachmentModel.go +++ b/models/AttachmentModel.go @@ -8,8 +8,8 @@ import ( "strings" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/utils/filetil" ) diff --git a/models/BookModel.go b/models/BookModel.go index 8e558df5..78676a33 100644 --- a/models/BookModel.go +++ b/models/BookModel.go @@ -17,8 +17,8 @@ import ( "encoding/json" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/utils" "github.com/mindoc-org/mindoc/utils/cryptil" diff --git a/models/BookResult.go b/models/BookResult.go index f26a4d4e..0aad7a14 100644 --- a/models/BookResult.go +++ b/models/BookResult.go @@ -15,8 +15,8 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/beego/beego/v2/adapter" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/converter" diff --git a/models/Relationship.go b/models/Relationship.go index 22ab6382..e78b8a8c 100644 --- a/models/Relationship.go +++ b/models/Relationship.go @@ -3,8 +3,8 @@ package models import ( "errors" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/Template.go b/models/Template.go index 324644bc..5cf1520f 100644 --- a/models/Template.go +++ b/models/Template.go @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/beego/beego/v2/adapter/logs" "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" )