From 81390c7bb5821b64d03a5dcf6a25d3e59b425ccc Mon Sep 17 00:00:00 2001
From: snltty <1069410172@qq.com>
Date: Tue, 3 Jun 2025 22:15:36 +0800
Subject: [PATCH] kvm

---
 src/linker/Dockerfile-kvm    | 15 ++-------------
 src/linker/kvm/index.html    | 13 ++++++++++++-
 src/linker/kvm/linker-kvm.sh | 29 +++++++++++++++++++----------
 version.txt                  |  2 +-
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/linker/Dockerfile-kvm b/src/linker/Dockerfile-kvm
index d2626b8b..8ecaad9c 100644
--- a/src/linker/Dockerfile-kvm
+++ b/src/linker/Dockerfile-kvm
@@ -34,20 +34,9 @@ EXPOSE 623/tcp
 EXPOSE 623/udp
 
 
-COPY . /linker/
-COPY kvm/__init__.py /kvmd/plugins/hid/ch9329/__init__.py
-
-COPY kvm/index.html /usr/share/kvmd/web/linker/index.html
-COPY kvm/logo-linker.png /usr/share/kvmd/web/share/svg/logo-linker.png
-COPY kvm/logo.svg /usr/share/kvmd/web/share/svg/logo.svg
-COPY kvm/favicon-16x16.png /usr/share/kvmd/web/share/favicon-16x16.png
-COPY kvm/favicon-32x32.png /usr/share/kvmd/web/share/favicon-32x32.png
-COPY kvm/apple-touch-icon.png /usr/share/kvmd/web/share/apple-touch-icon.png
-COPY kvm/android-chrome-192x192.png /usr/share/kvmd/web/share/android-chrome-192x192.png
-
-RUN chmod +x /linker/kvm/linker-kvm.sh
-
 ENV SNLTTY_LINKER_IS_DOCKER="linker"
 ENV DOTNET_ThreadPool_UnfairSemaphoreSpinLimit=0
 
+COPY . /linker/
+RUN chmod +x /linker/kvm/linker-kvm.sh
 ENTRYPOINT ["/linker/kvm/linker-kvm.sh"]
\ No newline at end of file
diff --git a/src/linker/kvm/index.html b/src/linker/kvm/index.html
index 336fe282..61fa40ae 100644
--- a/src/linker/kvm/index.html
+++ b/src/linker/kvm/index.html
@@ -55,12 +55,23 @@
                 <li><div class="app"><a href="https://jq.qq.com/?_wv=1027&k=ucoIVfz4" target="_blank">📱<br>QQ群</a></div></li>
 	        </ul>
 	    </div>
+        <iframe src="#" width="810" height="740" id="iframe"></iframe>
       </div>
     </div>
     <script>
-        document.getElementById('manager').href = `http://${window.location.hostname}:1804`;
+        const url = `http://${window.location.hostname}:1804/`;
+        if (window.location.protocol == "http:")
+        {
+            document.getElementById('iframe').src = url;
+        }
+        else
+        {
+            document.getElementById('iframe').style="display:none;";
+        }
+        document.getElementById('manager').href = url;
     </script>
     <style>
+        iframe{border:0;}
         div#apps-box {
 	display: table;
 	margin: 0 auto;
diff --git a/src/linker/kvm/linker-kvm.sh b/src/linker/kvm/linker-kvm.sh
index 1a23f1a2..3d64c12f 100644
--- a/src/linker/kvm/linker-kvm.sh
+++ b/src/linker/kvm/linker-kvm.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-if [ ! -f /linker/kvm/supervisord.conf ]; then
-    cat >> /linker/kvm/supervisord.conf << EOF
-
+rm -rf /linker/kvm/supervisord.conf 2>/dev/null
+cat >> /linker/kvm/supervisord.conf << EOF
 [supervisord]
 logfile = /linker/kvm/supervisord.log
 logfile_maxbytes = 50MB           
@@ -27,17 +26,18 @@ stdout_logfile_maxbytes = 0
 redirect_stderr=true
 EOF
     
-    mkdir -p /usr/share/kvmd/extras/linker
-    cat >> /usr/share/kvmd/extras/linker/manifest.yaml << EOF
+rm -rf /usr/share/kvmd/extras/linker 2>/dev/null
+mkdir -p /usr/share/kvmd/extras/linker
+cat >> /usr/share/kvmd/extras/linker/manifest.yaml << EOF
 name: linker
 description: linker network
 icon: share/svg/logo-linker.png
 path: linker
 daemon: kvmd-linker
 place: 21
-
 EOF
-	python3 - <<END
+
+python3 - <<END
 # -*- coding: utf-8 -*-
 
 import json
@@ -53,10 +53,19 @@ with open("/usr/share/kvmd/web/share/i18n/i18n_zh.json", "w", encoding='utf-8')
 
 END
 
-    sed -i 's/8080/1806/g' /etc/kvmd/override.yaml
-    sed -i 's/4430/1807/g' /etc/kvmd/override.yaml
-fi
 
+sed -i 's/8080/1806/g' /etc/kvmd/override.yaml
+sed -i 's/4430/1807/g' /etc/kvmd/override.yaml
+
+
+cp -rf /linker/kvm/__init__.py /kvmd/plugins/hid/ch9329/__init__.py
+cp -rf /linker/kvm/index.html /usr/share/kvmd/web/linker/index.html
+cp -rf /linker/kvm/logo-linker.png /usr/share/kvmd/web/share/svg/logo-linker.png
+cp -rf /linker/kvm/logo.svg /usr/share/kvmd/web/share/svg/logo.svg
+cp -rf /linker/kvm/favicon-16x16.png /usr/share/kvmd/web/share/favicon-16x16.png
+cp -rf /linker/kvm/favicon-32x32.png /usr/share/kvmd/web/share/favicon-32x32.png
+cp -rf /linker/kvm/apple-touch-icon.png /usr/share/kvmd/web/share/apple-touch-icon.png
+cp -rf /linker/kvm/android-chrome-192x192.png /usr/share/kvmd/web/share/android-chrome-192x192.png
 
 supervisord -c /linker/kvm/supervisord.conf &
 
diff --git a/version.txt b/version.txt
index 729abc44..7393f2bd 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 v1.8.2
-2025-06-03 21:43:50
+2025-06-03 22:15:36
 1. 一些累计更新
 2. 测试发布，请使用1.8.2
\ No newline at end of file