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 2022-12-08 22:27:33 +08:00
commit a4bd5de1e9
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/stage/auth.html
View file

@ -135,6 +135,18 @@
a:hover {
text-decoration: underline;
}
.b3-code {
padding: 0.2em 0.4em;
margin: 0;
font-size: 85%;
border-radius: 3px;
font-family: "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Segoe UI Symbol", "Android Emoji", "EmojiSymbols";
word-break: break-word;
background-size: 20px 20px;
white-space: pre-wrap;
background-color: rgba(27, 31, 35, .05);
}
</style>
</head>
<body style="margin: 0;
@ -153,9 +165,8 @@
</div>
<button class="b3-button" onclick="submitAuth()">解锁 Unlock</button>
<div style="color: #5f6368;font-size: 14px;margin: 16px 0;">
如果你在使用中遇到问题，请到<a href="https://ld246.com/article/1649901726096" target="_blank">这里</a>反馈<br>
If you encounter problems, please report it on <a href="https://github.com/siyuan-note/siyuan/issues"
target="_blank">GitHub</a>
如果你忘记了授权码，可在工作空间<br>conf/conf.json 文件中搜索 <code class="b3-code">accessAuthCode</code><br><br>
If you forget the authorization code, you can search<br>for <code class="b3-code">accessAuthCode</code> in the workspace conf/conf.json
</div>
<button class="b3-button b3-button--white" onclick="exitSiYuan()">退出 Exit</button>
</div>
@ -397,7 +408,7 @@
exitSiYuan()
})
} catch (e) {
console.log(e)
// console.log(e)
}
const exitApp = () => {
@ -495,6 +506,7 @@
}, 6000)
})
}
// 用于授权页保持连接，避免非常驻内存内核自动退出 https://github.com/siyuan-note/insider/issues/1099
new WebSocket(`${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/ws?app=siyuan&id=auth`);
</script>