From cbc426c180e2a29a0b3a14ca54f58453d71db947 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <zklcdc@qq.com>
Date: Sun, 23 Feb 2025 22:14:27 +0800
Subject: [PATCH] =?UTF-8?q?[Feat]=20=E2=9C=A8=20Unified=20Entrance=20of=20?=
 =?UTF-8?q?Web=20Services?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/admin/Instances.vue        |  5 ++---
 frontend/src/views/users/InstanceList.vue     |  9 ++++-----
 services/instanceController/create.go         |  6 +++---
 services/instanceController/createInstance.go |  4 +---
 services/instanceController/patch.go          | 11 ++++++-----
 services/instanceController/restart.go        |  6 +++---
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/frontend/src/views/admin/Instances.vue b/frontend/src/views/admin/Instances.vue
index 66aabe7..5aff041 100644
--- a/frontend/src/views/admin/Instances.vue
+++ b/frontend/src/views/admin/Instances.vue
@@ -70,12 +70,11 @@
               :href="'http://' + data.code_server_address" target="_blank" v-tooltip.top="'VSCode Web'" />
             <Button v-else icon="pi pi-code" aria-label="Filter" v-tooltip.top="'VSCode Web'" disabled />
             <Button v-if="data.status == statusRunning" severity="info" icon="pi pi-inbox" aria-label="Filter" as="a"
-              :href="'http://' + data.jupyter_address + '/lab'" target="_blank" v-tooltip.top="'Jupyter Lab'" />
+              :href="'http://' + data.jupyter_address" target="_blank" v-tooltip.top="'Jupyter Lab'" />
             <Button v-else severity="info" icon="pi pi-inbox" aria-label="Filter" v-tooltip.top="'Jupyter Lab'"
               disabled />
             <Button v-if="data.status == statusRunning" severity="contrast" icon="pi pi-chart-bar" as="a"
-              :href="'http://' + data.grafana_address + '/public-dashboards/2c510f203876465ba76617510ce3e219'"
-              target="_blank" v-tooltip.top="'监控'" />
+              :href="'http://' + data.grafana_address" target="_blank" v-tooltip.top="'监控'" />
             <Button v-else severity="contrast" icon="pi pi-chart-bar" v-tooltip.top="'监控'" disabled />
             <Button v-if="!isAdmin" icon="pi pi-ellipsis-h" severity="secondary" aria-label="Bookmark"
               @click="showMenu($event, data)" />
diff --git a/frontend/src/views/users/InstanceList.vue b/frontend/src/views/users/InstanceList.vue
index 0fba46d..40c3331 100644
--- a/frontend/src/views/users/InstanceList.vue
+++ b/frontend/src/views/users/InstanceList.vue
@@ -74,12 +74,11 @@
               :href="'http://' + data.code_server_address" target="_blank" v-tooltip.top="'VSCode Web'" />
             <Button v-else icon="pi pi-code" aria-label="Filter" v-tooltip.top="'VSCode Web'" disabled />
             <Button v-if="data.status == statusRunning" severity="info" icon="pi pi-inbox" aria-label="Filter" as="a"
-              :href="'http://' + data.jupyter_address + '/lab'" target="_blank" v-tooltip.top="'Jupyter Lab'" />
+              :href="'http://' + data.jupyter_address" target="_blank" v-tooltip.top="'Jupyter Lab'" />
             <Button v-else severity="info" icon="pi pi-inbox" aria-label="Filter" v-tooltip.top="'Jupyter Lab'"
               disabled />
             <Button v-if="data.status == statusRunning" severity="contrast" icon="pi pi-chart-bar" as="a"
-              :href="'http://' + data.grafana_address + '/public-dashboards/2c510f203876465ba76617510ce3e219'"
-              target="_blank" v-tooltip.top="'监控'" />
+              :href="'http://' + data.grafana_address" target="_blank" v-tooltip.top="'监控'" />
             <Button v-else severity="contrast" icon="pi pi-chart-bar" v-tooltip.top="'监控'" disabled />
             <Button icon="pi pi-ellipsis-h" severity="secondary" aria-label="Bookmark"
               @click="showMenu($event, data)" />
@@ -126,13 +125,13 @@
         </Fieldset>
         <Fieldset legend="GPU">
           <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.gpu_type }} * {{ instanceDetail.gpu_count
-          }}</span>
+            }}</span>
           <span v-else>无卡模式</span>
         </Fieldset>
         <div class="flex flex-col md:flex-row gap-4">
           <Fieldset class="flex flex-wrap gap-2 w-full" legend="CPU">
             <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.cpu_count_per_gpu * instanceDetail.gpu_count
-            }}
+              }}
               核</span>
             <span v-else>1 核</span>
           </Fieldset>
diff --git a/services/instanceController/create.go b/services/instanceController/create.go
index 542591a..5573388 100644
--- a/services/instanceController/create.go
+++ b/services/instanceController/create.go
@@ -64,9 +64,9 @@ func Create(instance *models.Instances) (containerName, volumeName string, err e
 
 	instance.SshAddress = server.IP + ":" + portBindings["22"]
 	instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-	instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
-	instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
-	instance.CodeServerAddress = server.IP + ":" + portBindings["8080"]
+	instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
+	instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
+	instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 	instance.Status = 0
 	result = database.DB.Save(&instance)
diff --git a/services/instanceController/createInstance.go b/services/instanceController/createInstance.go
index 8dea2e5..1304b9e 100644
--- a/services/instanceController/createInstance.go
+++ b/services/instanceController/createInstance.go
@@ -40,10 +40,8 @@ func createInstance(ip string, port int, apikey string,
 		Memory:         strconv.Itoa(memorySize) + "GB",
 		ContainerPorts: []string{
 			"22",    // SSH
+			"80",    // Nginx
 			"6007",  // TensorBoard
-			"8888",  // Jupyter Notebook
-			"3000",  // Grafana
-			"8080",  // Code-Server
 			"34567", // Custom Port
 		},
 		Env: []string{
diff --git a/services/instanceController/patch.go b/services/instanceController/patch.go
index 4932d5a..da885de 100644
--- a/services/instanceController/patch.go
+++ b/services/instanceController/patch.go
@@ -104,8 +104,9 @@ func Patch(instance *models.Instances, gpuCount, volumeSize int, cpuOnly bool) (
 
 		instance.SshAddress = server.IP + ":" + portBindings["22"]
 		instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-		instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
-		instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
+		instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
+		instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
+		instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 		instance.CpuOnly = true
 		instance.GpuCount = 0
@@ -148,9 +149,9 @@ func Patch(instance *models.Instances, gpuCount, volumeSize int, cpuOnly bool) (
 
 	instance.SshAddress = server.IP + ":" + portBindings["22"]
 	instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-	instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
-	instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
-	instance.CodeServerAddress = server.IP + ":" + portBindings["8080"]
+	instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
+	instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
+	instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 	instance.CpuOnly = false
 	instance.GpuCount = gpuCount
diff --git a/services/instanceController/restart.go b/services/instanceController/restart.go
index 8aad689..23759fb 100644
--- a/services/instanceController/restart.go
+++ b/services/instanceController/restart.go
@@ -57,9 +57,9 @@ func Restart(instance *models.Instances) (err error) {
 
 	instance.SshAddress = server.IP + ":" + portBindings["22"]
 	instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-	instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
-	instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
-	instance.CodeServerAddress = server.IP + ":" + portBindings["8080"]
+	instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
+	instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
+	instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 	instance.Status = models.InstanceStatusRunning
 	result = database.DB.Save(&instance)