Merge remote-tracking branch 'origin/master'

FishPiOffical · Nov 21, 2024 · f980c04 · f980c04
2 parents 5e2a9da + 9216be9
commit f980c04
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 136 deletions.
diff --git a/src/main/resources/css/base.css b/src/main/resources/css/base.css
diff --git a/src/main/resources/css/mobile-base.css b/src/main/resources/css/mobile-base.css
diff --git a/src/main/resources/js/chat-room.js b/src/main/resources/js/chat-room.js
diff --git 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("<label><svg><use xlink:href=\"#safe\"></use></svg> 请使用官方APP扫码以登录APP </label><br><br><br>");
+          $("#apiCode").append("<p>为了保护账号安全,请勿将本二维码以任何方式分享给他人,请勿在任何地点分享此二维码内容</p>");
+          $("#apiCode").append("<br>");
+          $("#apiCode").append("<img src='https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=login:" + result.apiKey + "'/>");
+        }
+      },
+    });
+  },
   /**
    * 初始化背包
    */

diff --git a/src/main/resources/scss/base.scss b/src/main/resources/scss/base.scss
@@ -2259,6 +2259,12 @@ a[class*=" icon-"]:hover {
   }
 }
 
+/* color userName */
+.ft-admin-user {
+  color: red;
+  font-weight: bold;
+}
+
 /*@keyframes swim {
   0% {
     transform: translate(0,0) rotateY(0deg);

diff --git a/src/main/resources/scss/mobile-base.scss b/src/main/resources/scss/mobile-base.scss
@@ -3535,4 +3535,10 @@ only screen and (device-width: 414px) and (device-height: 896px) and (-webkit-de
 .file__items .item__info .red {
   margin-top: 8px;
   width: 100%
+}
+
+/* color userName */
+.ft-admin-user {
+  color: red;
+  font-weight: bold;
 }
diff --git a/src/main/resources/skins/classic/home/settings/account.ftl b/src/main/resources/skins/classic/home/settings/account.ftl
@@ -46,6 +46,16 @@
     </div>
 </div>
 
+<div class="module">
+    <div class="module-header">
+        <h2>APP扫码登录</h2>
+    </div>
+    <div class="module-panel form fn-clear">
+        <div id="apiCode">
+        </div>
+    </div>
+</div>
+
 <div class="module">
     <div class="module-header">
         <h2>${userNameLabel} ${updateNameTipLabel}</h2>

diff --git a/src/main/resources/skins/classic/home/settings/macro-settings.ftl b/src/main/resources/skins/classic/home/settings/macro-settings.ftl
@@ -82,6 +82,7 @@
             <#if 'account' == type>Settings.initBag(${sysBag});</#if>
             <#if 'account' == type>Settings.initMetal(${sysMetal});</#if>
             <#if 'account' == type>Settings.initMFA();</#if>
+            <#if 'account' == type>Settings.initApiCode();</#if>
         </script>
     </body>
 </html>