0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-07-06 10:23:53 +08:00
commit f90925a80a
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -20,6 +20,8 @@ Refactor your thinking
<br><br>
<a title="Twitter" target="_blank" href="https://twitter.com/b3logos"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/b3logos?label=Follow&style=social"></a>
<a title="Discord" target="_blank" href="https://discord.com/channels/808152298789666826"><img alt="Discord" src="https://img.shields.io/discord/808152298789666826?logo=discord&label=Chat&style=social"></a>
<br><br>
<a href="https://www.producthunt.com/posts/siyuan?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-siyuan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=394475&theme=light" alt="SiYuan - WYSIWYG&#0032;Block&#0032;Ref&#0032;E2EE&#0032;Sync&#0032;Local&#0045;first | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
</p>
<p align="center">

2
README_zh_CN.md
View file

@ -20,6 +20,8 @@
<br><br>
<a title="Twitter" target="_blank" href="https://twitter.com/b3logos"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/b3logos?label=Follow&style=social"></a>
<a title="Discord" target="_blank" href="https://discord.com/channels/808152298789666826"><img alt="Discord" src="https://img.shields.io/discord/808152298789666826?logo=discord&label=Chat&style=social"></a>
<br><br>
<a href="https://www.producthunt.com/posts/siyuan?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-siyuan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=394475&theme=light" alt="SiYuan - WYSIWYG&#0032;Block&#0032;Ref&#0032;E2EE&#0032;Sync&#0032;Local&#0045;first | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
</p>
<p align="center">

10
app/electron/error.html
View file

@ -139,10 +139,12 @@
<div id="content"></div>
<div class="fn__flex-1"></div>
<div class="feedback">
<span>❤️ <a href="https://liuyun.io/article/1686530886208" target="_blank">Feedback and support</a></span>
<span>🏘️ <a href="https://ld246.com/article/1649901726096" target="_blank">求助反馈建议</a></span>
<span>🔖 <a href="https://b3log.org/siyuan/en/download.html" target="_blank">Download: <span class="version"></span></a></span>
<span>🔖 <a href="https://b3log.org/siyuan/download.html" target="_blank">下载：<span class="version"></span></a></span>
<span><a href="https://ld246.com/article/1649901726096" target="_blank">求助反馈建议</a></span>
<span><a href="https://b3log.org/siyuan/download.html" target="_blank">下载最新版</a></span>
</div>
<div class="feedback">
<span><a href="https://liuyun.io/article/1686530886208" target="_blank">Feedback and support</a></span>
<span><a href="https://b3log.org/siyuan/en/download.html" target="_blank">Download the latest version</a></span>
</div>
<div class="fn__flex-1"></div>
</div>

2
kernel/util/rhy.go
View file

@ -32,7 +32,7 @@ func GetRhyResult(force bool) (map[string]interface{}, error) {
rhyResultLock.Lock()
defer rhyResultLock.Unlock()
cacheDuration := int64(3600)
cacheDuration := int64(3600 * 6)
if ContainerDocker == Container {
cacheDuration = int64(3600 * 24)
}