From 920ead1e014250adcf1219fbd65b1456b02a90af Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 9 Sep 2022 09:03:39 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E4=B8=8B=E8=BD=BD=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=8C=85=20https://github.com/siyuan-note/siyuan/issues/5837?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerimage.yml | 2 +- app/appx/AppxManifest.xml | 2 +- app/package.json | 2 +- kernel/model/conf.go | 4 ++-- kernel/model/liandi.go | 2 +- kernel/model/updater.go | 2 +- kernel/util/working.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index c789a1886..0ce5f33e7 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -33,4 +33,4 @@ jobs: - name: Build the Docker image run: | - docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.1.13 . \ No newline at end of file + docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.1.14 . \ No newline at end of file diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml index d8e7b8b44..212d12bf2 100644 --- a/app/appx/AppxManifest.xml +++ b/app/appx/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.14.0"/> SiYuan 云南链滴科技有限公司 diff --git a/app/package.json b/app/package.json index 2d57a4aa3..8fe520f91 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "2.1.13", + "version": "2.1.14", "description": "Build Your Eternal Digital Garden", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 017b27e59..51f2a11d1 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -380,7 +380,7 @@ func Close(force bool, execInstallPkg int) (exitCode int) { if !skipNewVerInstallPkg() { newVerInstallPkgPath := "" if Conf.System.DownloadInstallPkg && !util.ISMicrosoftStore { - newVerInstallPkgPath = GetNewVerInstallPkgPath() + newVerInstallPkgPath = getNewVerInstallPkgPath() if "" != newVerInstallPkgPath && 0 == execInstallPkg { exitCode = 2 return @@ -388,7 +388,7 @@ func Close(force bool, execInstallPkg int) (exitCode int) { } if 2 == execInstallPkg && "" != newVerInstallPkgPath { // 执行新版本安装 - execNewVerInstallPkg(newVerInstallPkgPath) + go execNewVerInstallPkg(newVerInstallPkgPath) } } diff --git a/kernel/model/liandi.go b/kernel/model/liandi.go index 6ff628eec..5c68de63c 100644 --- a/kernel/model/liandi.go +++ b/kernel/model/liandi.go @@ -240,7 +240,7 @@ func AutoRefreshCheck() { time.Sleep(3 * time.Minute) checkDownloadInstallPkg() - if "" != GetNewVerInstallPkgPath() { + if "" != getNewVerInstallPkgPath() { util.PushMsg(Conf.Language(61), 0) } }() diff --git a/kernel/model/updater.go b/kernel/model/updater.go index fb5270928..09f19f45e 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -54,7 +54,7 @@ func execNewVerInstallPkg(newVerInstallPkgPath string) { logging.LogInfof("installed new version output [%s]", data) } -func GetNewVerInstallPkgPath() string { +func getNewVerInstallPkgPath() string { if skipNewVerInstallPkg() { return "" } diff --git a/kernel/util/working.go b/kernel/util/working.go index 8ba204134..458a7093a 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -41,7 +41,7 @@ import ( var Mode = "prod" const ( - Ver = "2.1.13" + Ver = "2.1.14" IsInsider = false )