From aa0f6aa602aff26277e454e94c70de5ae5051dce Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Tue, 29 Jul 2025 21:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddashboard=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=97=A0=E6=B3=95=E6=98=8E=E6=96=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src2/components/JsiteServerOverview.vue   | 24 ++++++++++---------
 jcloud/api/aliyun_server_light.py             |  7 +++++-
 .../pagetype/jsite_server/jsite_server.js     |  2 +-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/dashboard/src2/components/JsiteServerOverview.vue b/dashboard/src2/components/JsiteServerOverview.vue
index c6bcfc9..2d68324 100644
--- a/dashboard/src2/components/JsiteServerOverview.vue
+++ b/dashboard/src2/components/JsiteServerOverview.vue
@@ -159,10 +159,11 @@
 						<div class="flex justify-between items-center">
 							<span class="text-gray-600">服务器密码:</span>
 							<div class="flex items-center space-x-2">
-								<span class="font-mono text-gray-900" :class="{ 'text-transparent select-none': !showPassword }">
-									{{ showPassword ? (decryptedPassword || '未设置') : '••••••••' }}
+								<span class="font-mono text-gray-900">
+									{{ showPassword ? decryptedPassword : ($jsiteServer.pg.password || '未设置') }}
 								</span>
 								<button
+									v-if="$jsiteServer.pg.password"
 									@click="togglePassword"
 									class="text-gray-500 hover:text-gray-700 transition-colors"
 									:title="showPassword ? '隐藏密码' : '显示密码'"
@@ -176,9 +177,12 @@
 							<span class="text-gray-600">密钥对名称:</span>
 							<span class="font-mono text-gray-900">{{ $jsiteServer.pg.key_pair_name || '未设置' }}</span>
 						</div>
-						<div class="flex justify-between">
-							<span class="text-gray-600">私钥:</span>
-							<span class="font-mono text-gray-900">{{ $jsiteServer.pg.private_key || '未设置' }}</span>
+						<div class="flex flex-col">
+							<span class="text-gray-600 mb-2">私钥:</span>
+							<div v-if="$jsiteServer.pg.private_key" class="bg-gray-50 p-3 rounded border">
+								<pre class="font-mono text-xs text-gray-900 whitespace-pre-wrap break-all">{{ $jsiteServer.pg.private_key }}</pre>
+							</div>
+							<span v-else class="font-mono text-gray-900">未设置</span>
 						</div>
 					</div>
 				</div>
@@ -449,27 +453,25 @@ export default {
 		},
 		togglePassword() {
 			if (this.showPassword) {
-				// 隐藏密码
 				this.showPassword = false;
 				this.decryptedPassword = null;
 			} else {
-				// 显示密码
 				const getPasswordRequest = createResource({
-					url: '/api/action/jingrow.client.get_password',
+					url: '/api/action/jcloud.api.aliyun_server_light.get_password',
 					params: {
 						pagetype: 'Jsite Server',
 						name: this.$jsiteServer.pg.name,
 						fieldname: 'password'
 					},
 					onSuccess: (response) => {
-						if (response.message) {
-							this.decryptedPassword = response.message;
+						if (response && response !== '') {
+							this.decryptedPassword = response;
 							this.showPassword = true;
 						} else {
 							toast.warning('当前没有保存的密码');
 						}
 					},
-					onError: () => {
+					onError: (error) => {
 						toast.error('获取密码失败');
 					}
 				});
diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py
index 13dc71c..e765647 100644
--- a/jcloud/api/aliyun_server_light.py
+++ b/jcloud/api/aliyun_server_light.py
@@ -1012,4 +1012,9 @@ def reset_server_key_pair(instance_id):
             
     except Exception as e:
         jingrow.log_error("重置密钥对失败", f"重置实例 {instance_id} 密钥对时发生错误: {str(e)}")
-        return {"success": False, "message": str(e)}
\ No newline at end of file
+        return {"success": False, "message": str(e)}
+
+@jingrow.whitelist()
+def get_password(pagetype, name, fieldname):
+
+	return jingrow.get_pg(pagetype, name).get_password(fieldname)
\ No newline at end of file
diff --git a/jcloud/jcloud/pagetype/jsite_server/jsite_server.js b/jcloud/jcloud/pagetype/jsite_server/jsite_server.js
index f4564f9..15c43fd 100644
--- a/jcloud/jcloud/pagetype/jsite_server/jsite_server.js
+++ b/jcloud/jcloud/pagetype/jsite_server/jsite_server.js
@@ -72,7 +72,7 @@ jingrow.ui.form.on("Jsite Server", {
 				if (password_field.$input.attr('type') === 'password') {
 					// 使用jingrow.call获取解密后的密码
 					jingrow.call({
-						method: 'jingrow.client.get_password',
+						method: 'jcloud.api.aliyun_server_light.get_password',
 						args: {
 							pagetype: 'Jsite Server',
 							name: frm.pg.name,