diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index cb4d3a0e6..3d90041cf 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.3.0 .
\ 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.3.1 .
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b991155fa..37901db2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## v2.3.1 / 2022-10-08
+
+### 改进功能
+
+* [改进行级代码、键盘和标签元素边界编辑交互](https://github.com/siyuan-note/siyuan/issues/5595)
+* [文档滚动状态不产生同步冲突](https://github.com/siyuan-note/siyuan/issues/6076)
+* [移动端编辑工具栏仅在编辑器中触发](https://github.com/siyuan-note/siyuan/issues/6086)
+* [块引缺失锚文本情况下自动补全](https://github.com/siyuan-note/siyuan/issues/6087)
+* [内核接口 `api/system/getConf` 脱敏处理](https://github.com/siyuan-note/siyuan/issues/6088)
+* [分割线不应该支持折叠](https://github.com/siyuan-note/siyuan/issues/6097)
+
+### 修复缺陷
+
+* [加载自定义表情可能导致内核崩溃](https://github.com/siyuan-note/siyuan/issues/6078)
+* [文档实时统计失效](https://github.com/siyuan-note/siyuan/issues/6079)
+* [段落末尾为行级元素时右键异常](https://github.com/siyuan-note/siyuan/issues/6080)
+* [快捷键 `⌥⌘ ` 识别失败](https://github.com/siyuan-note/siyuan/issues/6081)
+* [反链面板刷新后数学公式无法加载](https://github.com/siyuan-note/siyuan/issues/6085)
+* [列表项行级元素结尾和转义元素编辑异常](https://github.com/siyuan-note/siyuan/issues/6092)
+* [列表项中 `Ctrl+Tab` 异常](https://github.com/siyuan-note/siyuan/issues/6093)
+* [分隔线块标菜单点击异常](https://github.com/siyuan-note/siyuan/issues/6094)
+
## v2.3.0 / 2022-10-07
### 引入特性
diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml
index 8c1bfe108..8128e46d6 100644
--- a/app/appx/AppxManifest.xml
+++ b/app/appx/AppxManifest.xml
@@ -9,7 +9,7 @@
+ Version="2.3.1.0"/>
SiYuan
云南链滴科技有限公司
diff --git a/app/package.json b/app/package.json
index be2e6a04a..ea7858da6 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "SiYuan",
- "version": "2.3.0",
+ "version": "2.3.1",
"description": "Build Your Eternal Digital Garden",
"homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js",
diff --git a/kernel/go.mod b/kernel/go.mod
index dc78930fc..6c5ac82ac 100644
--- a/kernel/go.mod
+++ b/kernel/go.mod
@@ -32,7 +32,7 @@ require (
github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/mitchellh/go-ps v1.0.0
github.com/mssola/user_agent v0.5.3
- github.com/olahol/melody v1.1.0
+ github.com/olahol/melody v1.1.1
github.com/panjf2000/ants/v2 v2.5.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/qiniu/go-sdk/v7 v7.13.0
@@ -110,10 +110,10 @@ require (
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
- golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect
- golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9 // indirect
+ golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect
+ golang.org/x/exp v0.0.0-20221006183845-316c7553db56 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
- golang.org/x/net v0.0.0-20221002022538-bcab6841153b // indirect
+ golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect
golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875 // indirect
golang.org/x/tools v0.1.12 // indirect
diff --git a/kernel/go.sum b/kernel/go.sum
index ea2fb7eef..ac7c013c8 100644
--- a/kernel/go.sum
+++ b/kernel/go.sum
@@ -285,6 +285,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/olahol/melody v1.1.0 h1:TLM16mYoRxzd5TWM/t8ld7mO1ONJ9Wqv9Mk0TBn2TjI=
github.com/olahol/melody v1.1.0/go.mod h1:hmyIdsPS27XdDmgMTiEjN05EwSXgZA2dc2aJBbqJq4c=
+github.com/olahol/melody v1.1.1 h1:amgBhR7pDY0rA0JHWprgLF0LnVztognAwEQgf/WYLVM=
+github.com/olahol/melody v1.1.1/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
@@ -396,6 +398,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
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/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+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=
@@ -435,10 +438,14 @@ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0=
+golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/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-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9 h1:lNtcVz/3bOstm7Vebox+5m3nLh/BYWnhmc3AhXOW6oI=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+golang.org/x/exp v0.0.0-20221006183845-316c7553db56 h1:BrYbdKcCNjLyrN6aKqXy4hPw9qGI8IATkj4EWv9Q+kQ=
+golang.org/x/exp v0.0.0-20221006183845-316c7553db56/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/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-20190823064033-3a9bac650e44/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -483,6 +490,8 @@ golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHh
golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20221002022538-bcab6841153b h1:6e93nYa3hNqAvLr0pD4PN1fFS+gKzp2zAXqrnTCstqU=
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2HzHcTFta3z5nsc13wI4=
+golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
diff --git a/kernel/util/working.go b/kernel/util/working.go
index 12e64c933..ace5343bd 100644
--- a/kernel/util/working.go
+++ b/kernel/util/working.go
@@ -41,7 +41,7 @@ import (
var Mode = "prod"
const (
- Ver = "2.3.0"
+ Ver = "2.3.1"
IsInsider = false
)