浏览代码

fix(self-check): websocket check invaild in remote mode

Jacky 2 月之前
父节点
当前提交
7e37664c64
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      api/system/router.go
  2. 2 1
      app/src/views/dashboard/ServerAnalytic.vue

+ 1 - 1
api/system/router.go

@@ -15,9 +15,9 @@ func InitPrivateRouter(r *gin.RouterGroup) {
 	r.GET("upgrade/current", GetCurrentVersion)
 	r.GET("upgrade/current", GetCurrentVersion)
 	r.GET("self_check", SelfCheck)
 	r.GET("self_check", SelfCheck)
 	r.POST("self_check/:name/fix", SelfCheckFix)
 	r.POST("self_check/:name/fix", SelfCheckFix)
-	r.GET("self_check/websocket", CheckWebSocket)
 }
 }
 
 
 func InitWebSocketRouter(r *gin.RouterGroup) {
 func InitWebSocketRouter(r *gin.RouterGroup) {
 	r.GET("upgrade/perform", PerformCoreUpgrade)
 	r.GET("upgrade/perform", PerformCoreUpgrade)
+	r.GET("self_check/websocket", CheckWebSocket)
 }
 }

+ 2 - 1
app/src/views/dashboard/ServerAnalytic.vue

@@ -185,7 +185,7 @@ function wsOnMessage(m: MessageEvent) {
           </p>
           </p>
           <p>
           <p>
             {{ $gettext('Load Average:') }}
             {{ $gettext('Load Average:') }}
-            <span class="load-avg-describe"> 1min:</span>{{ ` ${loadavg?.load1?.toFixed(2)}` }}
+            <span class="load-avg-describe"> 1min:</span>{{ loadavg?.load1?.toFixed(2) }}
             <span class="load-avg-describe"> | 5min:</span>{{ loadavg?.load5?.toFixed(2) }}
             <span class="load-avg-describe"> | 5min:</span>{{ loadavg?.load5?.toFixed(2) }}
             <span class="load-avg-describe"> | 15min:</span>{{ loadavg?.load15?.toFixed(2) }}
             <span class="load-avg-describe"> | 15min:</span>{{ loadavg?.load15?.toFixed(2) }}
           </p>
           </p>
@@ -440,6 +440,7 @@ function wsOnMessage(m: MessageEvent) {
 }
 }
 
 
 .load-avg-describe {
 .load-avg-describe {
+  margin-right: 2px;
   @media (max-width: 1600px) and (min-width: 1200px) {
   @media (max-width: 1600px) and (min-width: 1200px) {
     display: none;
     display: none;
   }
   }