From 5493b087bcb454624887a8076ac059c4ac5e08b0 Mon Sep 17 00:00:00 2001
From: Yui <44658840+HereIsYui@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:08:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81?=
=?UTF-8?q?=E7=99=BB=E5=BD=95APP=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
在账户中添加扫码登录APP功能，方便APP方向扫码登录
---
src/main/resources/js/settings.js | 18 ++++++++++++++++++
.../skins/classic/home/settings/account.ftl | 10 ++++++++++
.../classic/home/settings/macro-settings.ftl | 1 +
3 files changed, 29 insertions(+)
diff --git a/src/main/resources/js/settings.js b/src/main/resources/js/settings.js
index c7d7d6b6..19b4888e 100644
--- a/src/main/resources/js/settings.js
+++ b/src/main/resources/js/settings.js
@@ -247,6 +247,24 @@ var Settings = {
},
});
},
+ /**
+ * 加载扫码登录APP功能
+ */
+ initApiCode: function(){
+ $.ajax({
+ url: Label.servePath + '/getApiKeyInWeb',
+ type: 'GET',
+ cache: false,
+ success: function (result) {
+ if (result.apiKey !== "") {
+ $("#apiCode").append("
");
+ $("#apiCode").append("为了保护账号安全,请勿将本二维码以任何方式分享给他人,请勿在任何地点分享此二维码内容
");
+ $("#apiCode").append("
");
+ $("#apiCode").append("![](https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=login:" + result.apiKey + ")
");
+ }
+ },
+ });
+ },
/**
* 初始化背包
*/
diff --git a/src/main/resources/skins/classic/home/settings/account.ftl b/src/main/resources/skins/classic/home/settings/account.ftl
index 059ccbce..a4cda935 100644
--- a/src/main/resources/skins/classic/home/settings/account.ftl
+++ b/src/main/resources/skins/classic/home/settings/account.ftl
@@ -46,6 +46,16 @@
+
+