From e8ec1cce0e3ca0bad6a337df806d6e870e633028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=96=E4=BA=96=E4=BC=8D?= Date: Sat, 27 Mar 2021 21:40:36 +0800 Subject: [PATCH 1/4] update AppVeyor CI/CD config --- appveyor.yml | 100 +++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 56 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c97eac4d..0ba45645 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,65 +1,53 @@ -version: "{build}" -clone_folder: c:\gopath\src\github.com\lifei6671\mindoc +version: 1.0.{build} +branches: + only: + - master +image: Visual Studio 2015 +clone_folder: c:\gopath\src\github.com\mindoc-org\mindoc +init: +- cmd: >- + if [%tbs_arch%]==[x86] SET PATH=C:\MinGW\bin;%PATH% + if [%tbs_arch%]==[x64] SET PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64;C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% + + SET PATH=%GOPATH%\bin;%GOBIN%;%PATH% + + FOR /f "delims=" %%i IN ('go version') DO (SET GO_VERSION=%%i) environment: GOPATH: c:\gopath - GOVERSION: "1.12" + GOBIN: c:\gobin + GO111MODULE: on + CGO_ENABLED: 1 matrix: - - tbs_arch: "x86" - tbs_tools: "mingw" - tbs_static_runtime: 1 - GOARCH: 386 - - - tbs_arch: "x64" - tbs_tools: "mingw" - tbs_static_runtime: 1 - GOARCH: amd64 - + - tbs_arch: x86 + GOARCH: 386 + - tbs_arch: x64 + GOARCH: amd64 install: - - ps: if($env:tbs_tools -eq 'mingw' -and $env:tbs_arch -eq 'x64') - { - Start-FileDownload "http://libgd.blob.core.windows.net/mingw/x86_64-4.9.1-release-posix-seh-rt_v3-rev1.7z" -FileName mingw_x86_64.7z; - 7z x -oC:\ mingw_x86_64.7z | out-null; - } - - ps: if($env:tbs_tools -eq 'mingw' -and $env:tbs_arch -eq 'x86') - { - Start-FileDownload "http://libgd.blob.core.windows.net/mingw/i686-4.9.1-release-posix-dwarf-rt_v3-rev1.7z" -FileName mingw_x86.7z; - 7z x -oC:\ mingw_x86.7z | out-null; - } - - set PATH=%GOPATH%\bin;c:\go\bin;%PATH% - - echo %PATH% - - echo %GOPATH% - - go version - - go env +- cmd: >- + echo %PATH% + echo %GO_VERSION% + + go env + + where gcc + + where g++ build_script: - - if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[x86] SET PATH=C:\mingw32\bin;%PATH% - - if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[x64] SET PATH=C:\mingw64\bin;%PATH% - - set CGO_ENABLED=1 - - for /f "delims=" %%i in ('go version') do (set GO_VERSION=%%i) - - cd c:\gopath\src\github.com\lifei6671\mindoc - - go mod tidy - - go build -v -o "mindoc_windows_%GOARCH%.exe" -ldflags="-w -X github.com/mindoc-org/mindoc/conf.VERSION=%APPVEYOR_REPO_TAG_NAME% -X 'github.com/mindoc-org/mindoc/conf.BUILD_TIME=%date% %time%' -X 'conf.GO_VERSION=%GO_VERSION%'" - - 7z a -t7z -r mindoc_windows_%GOARCH%.7z conf/*.conf* static/* mindoc_windows_%GOARCH%.exe views/* uploads/* +- cmd: >- + cd c:\gopath\src\github.com\mindoc-org\mindoc + + go mod tidy + + go build -ldflags "-w" + + go build -v -o "mindoc_windows_%GOARCH%.exe" -ldflags="-w -X github.com/mindoc-org/mindoc/conf.VERSION=%APPVEYOR_REPO_TAG_NAME% -X 'github.com/mindoc-org/mindoc/conf.BUILD_TIME=%date% %time%' -X 'conf.GO_VERSION=%GO_VERSION%'" + + 7z a -t7z -r mindoc_windows_%GOARCH%.7z conf/*.conf* static/* mindoc_windows_%GOARCH%.exe views/* uploads/* test_script: - - mindoc_windows_%GOARCH%.exe version +- cmd: >- + cd c:\gopath\src\github.com\mindoc-org\mindoc -notifications: - - provider: Email - to: - - lifei6671@163.com - on_build_success: false - -artifacts: - - path: mindoc_windows_%GOARCH%.7z - name: Releases - -deploy: - - provider: GitHub - auth_token: - secure: "Qkhxloft5lBKti7O+vVS+Vrxh7CBAUVhlfdZ9ptBXjFtjt6jHXnaBA2uv2OYbISB" - draft: false - prerelease: false - artifact: mindoc_windows_%GOARCH%.7z - on: - appveyor_repo_tag: true + mindoc_windows_%GOARCH%.exe version +deploy: off \ No newline at end of file From 5b274ce8360af3279fc360a1171e8a848238e15d Mon Sep 17 00:00:00 2001 From: wangbin05 Date: Wed, 31 Mar 2021 19:32:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E9=98=85=E8=AF=BB=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/command.go | 1 + controllers/DocumentController.go | 5 ++++ models/DocumentViewCount.go | 44 +++++++++++++++++++++++++++++++ static/js/kancloud.js | 3 +++ views/document/default_read.tpl | 1 + 5 files changed, 54 insertions(+) create mode 100644 models/DocumentViewCount.go diff --git a/commands/command.go b/commands/command.go index 34a35ca2..a420d85d 100644 --- a/commands/command.go +++ b/commands/command.go @@ -109,6 +109,7 @@ func RegisterModel() { new(models.TeamMember), new(models.TeamRelationship), new(models.Itemsets), + new(models.DocumentViewCount), ) gob.Register(models.Blog{}) gob.Register(models.Document{}) diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go index dbbba7c8..126972bf 100644 --- a/controllers/DocumentController.go +++ b/controllers/DocumentController.go @@ -143,17 +143,22 @@ func (c *DocumentController) Read() { doc.AttachList = attach } + view_count := models.NewDocumentViewCount().IncrViewCount(doc.DocumentId) + c.Data["ViewCount"] = view_count + if c.IsAjax() { var data struct { DocTitle string `json:"doc_title"` Body string `json:"body"` Title string `json:"title"` Version int64 `json:"version"` + ViewCount int `json:"view_count"` } data.DocTitle = doc.DocumentName data.Body = doc.Release data.Title = doc.DocumentName + " - Powered by MinDoc" data.Version = doc.Version + data.ViewCount = view_count c.JsonResult(0, "ok", data) } diff --git a/models/DocumentViewCount.go b/models/DocumentViewCount.go new file mode 100644 index 00000000..5e926e41 --- /dev/null +++ b/models/DocumentViewCount.go @@ -0,0 +1,44 @@ +package models + +import ( + "github.com/astaxie/beego/orm" + "github.com/mindoc-org/mindoc/conf" +) + +type DocumentViewCount struct { + DocumentId int `orm:"pk;column(document_id);type(int)" json:"doc_id"` + ViewCount int `orm:"column(view_count);type(int)" json:"view_count"` +} + +// TableName 获取对应数据库表名. +func (v *DocumentViewCount) TableName() string { + return "document_viewcount" +} + +// TableEngine 获取数据使用的引擎. +func (v *DocumentViewCount) TableEngine() string { + return "INNODB" +} + +func (v *DocumentViewCount) TableNameWithPrefix() string { + return conf.GetDatabasePrefix() + v.TableName() +} + +func NewDocumentViewCount() *DocumentViewCount { + return &DocumentViewCount{} +} + +func (v *DocumentViewCount) IncrViewCount(id int) int { + o := orm.NewOrm() + num, _ := o.QueryTable(v.TableNameWithPrefix()).Filter("document_id", id).Update(orm.Params{ + "view_count": orm.ColValue(orm.ColAdd, 1), + }) + if 0 == num { + v.DocumentId = id + v.ViewCount = 1 + num, _ = o.Insert(v) + } else { + o.QueryTable(v.TableNameWithPrefix()).Filter("document_id", id).One(v) + } + return v.ViewCount +} diff --git a/static/js/kancloud.js b/static/js/kancloud.js index 47b72847..3363b395 100644 --- a/static/js/kancloud.js +++ b/static/js/kancloud.js @@ -65,6 +65,7 @@ function loadDocument($url, $id, $callback) { $("title").text(data.title); $("#article-title").text(data.doc_title); $("#article-info").text(data.doc_info); + $("#view_count").text("阅读次数：" + data.view_count); events.trigger('article.open', {$url: $url, $id: $id}); @@ -80,6 +81,7 @@ function loadDocument($url, $id, $callback) { var doc_title = res.data.doc_title; var title = res.data.title; var doc_info = res.data.doc_info; + var view_count = res.data.view_count; $body = body; if (typeof $callback === "function" ) { @@ -90,6 +92,7 @@ function loadDocument($url, $id, $callback) { $("title").text(title); $("#article-title").text(doc_title); $("#article-info").text(doc_info); + $("#view_count").text("阅读次数：" + view_count); events.data($id, res.data); diff --git a/views/document/default_read.tpl b/views/document/default_read.tpl index 383dec41..27a47d42 100644 --- a/views/document/default_read.tpl +++ b/views/document/default_read.tpl @@ -146,6 +146,7 @@

+

阅读次数：{{.ViewCount}}
本文档使用 MinDoc 发布

From 323378c0ae4cb4808731afdecce1f9c0dba3f35f Mon Sep 17 00:00:00 2001 From: wangbin05 Date: Thu, 1 Apr 2021 09:23:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=98=85=E8=AF=BB?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/command.go | 1 - controllers/DocumentController.go | 6 ++--- models/DocumentModel.go | 9 +++++++ models/DocumentViewCount.go | 44 ------------------------------- 4 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 models/DocumentViewCount.go diff --git a/commands/command.go b/commands/command.go index a420d85d..34a35ca2 100644 --- a/commands/command.go +++ b/commands/command.go @@ -109,7 +109,6 @@ func RegisterModel() { new(models.TeamMember), new(models.TeamRelationship), new(models.Itemsets), - new(models.DocumentViewCount), ) gob.Register(models.Blog{}) gob.Register(models.Document{}) diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go index 126972bf..6ba30842 100644 --- a/controllers/DocumentController.go +++ b/controllers/DocumentController.go @@ -143,8 +143,8 @@ func (c *DocumentController) Read() { doc.AttachList = attach } - view_count := models.NewDocumentViewCount().IncrViewCount(doc.DocumentId) - c.Data["ViewCount"] = view_count + doc.IncrViewCount(doc.DocumentId) + c.Data["ViewCount"] = doc.ViewCount + 1 if c.IsAjax() { var data struct { @@ -158,7 +158,7 @@ func (c *DocumentController) Read() { data.Body = doc.Release data.Title = doc.DocumentName + " - Powered by MinDoc" data.Version = doc.Version - data.ViewCount = view_count + data.ViewCount = doc.ViewCount + 1 c.JsonResult(0, "ok", data) } diff --git a/models/DocumentModel.go b/models/DocumentModel.go index 5e5e4474..0984d340 100644 --- a/models/DocumentModel.go +++ b/models/DocumentModel.go @@ -41,6 +41,7 @@ type Document struct { Version int64 `orm:"column(version);type(bigint);" json:"version"` //是否展开子目录：0 否/1 是 /2 空间节点，单击时展开下一级 IsOpen int `orm:"column(is_open);type(int);default(0)" json:"is_open"` + ViewCount int `orm:"column(view_count);type(int)" json:"view_count"` AttachList []*Attachment `orm:"-" json:"attach"` } @@ -384,3 +385,11 @@ func (item *Document) Processor() *Document { } return item } + +// 增加阅读次数 +func (item *Document) IncrViewCount(id int) { + o := orm.NewOrm() + o.QueryTable(item.TableNameWithPrefix()).Filter("document_id", id).Update(orm.Params{ + "view_count": orm.ColValue(orm.ColAdd, 1), + }) +} diff --git a/models/DocumentViewCount.go b/models/DocumentViewCount.go deleted file mode 100644 index 5e926e41..00000000 --- a/models/DocumentViewCount.go +++ /dev/null @@ -1,44 +0,0 @@ -package models - -import ( - "github.com/astaxie/beego/orm" - "github.com/mindoc-org/mindoc/conf" -) - -type DocumentViewCount struct { - DocumentId int `orm:"pk;column(document_id);type(int)" json:"doc_id"` - ViewCount int `orm:"column(view_count);type(int)" json:"view_count"` -} - -// TableName 获取对应数据库表名. -func (v *DocumentViewCount) TableName() string { - return "document_viewcount" -} - -// TableEngine 获取数据使用的引擎. -func (v *DocumentViewCount) TableEngine() string { - return "INNODB" -} - -func (v *DocumentViewCount) TableNameWithPrefix() string { - return conf.GetDatabasePrefix() + v.TableName() -} - -func NewDocumentViewCount() *DocumentViewCount { - return &DocumentViewCount{} -} - -func (v *DocumentViewCount) IncrViewCount(id int) int { - o := orm.NewOrm() - num, _ := o.QueryTable(v.TableNameWithPrefix()).Filter("document_id", id).Update(orm.Params{ - "view_count": orm.ColValue(orm.ColAdd, 1), - }) - if 0 == num { - v.DocumentId = id - v.ViewCount = 1 - num, _ = o.Insert(v) - } else { - o.QueryTable(v.TableNameWithPrefix()).Filter("document_id", id).One(v) - } - return v.ViewCount -} From dc578c3b340792725f3c82401975aebf1e336842 Mon Sep 17 00:00:00 2001 From: wangbin05 Date: Thu, 1 Apr 2021 10:48:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/DocumentModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/DocumentModel.go b/models/DocumentModel.go index 0984d340..a656f132 100644 --- a/models/DocumentModel.go +++ b/models/DocumentModel.go @@ -41,7 +41,7 @@ type Document struct { Version int64 `orm:"column(version);type(bigint);" json:"version"` //是否展开子目录：0 否/1 是 /2 空间节点，单击时展开下一级 IsOpen int `orm:"column(is_open);type(int);default(0)" json:"is_open"` - ViewCount int `orm:"column(view_count);type(int)" json:"view_count"` + ViewCount int `orm:"column(view_count);type(int)" json:"view_count"` AttachList []*Attachment `orm:"-" json:"attach"` }