page1页面新增显示local-startup.service服务状态的显示

web-ui.service/page1_handler.go

@@ -312,6 +312,7 @@ var services = []struct {
 	{"yfkj-app-install.service", "/opt/yfkj/app-install.service", "app-install"},
 	{"yfkj-web-ui.service", "/opt/yfkj/web-ui.service", "web-ui"},
 	{"yfkj-upgrade.service", "/opt/yfkj/upgrade.service", "upgrade"},
+	{"yfkj-local-startup.service", "/opt/yfkj/local-startup.service", "startup.sh"},
 }
 
 func serviceStatusHandler(w http.ResponseWriter, r *http.Request) {
@@ -324,11 +325,17 @@ func serviceStatusHandler(w http.ResponseWriter, r *http.Request) {
 
 	for i, s := range services {
 		n := i + 1
-
 		status := noValue
-		if out, err := exec.Command("systemctl", "is-active", s.name).Output(); err == nil &&
-			strings.TrimSpace(string(out)) == "active" {
-			status = "🟢运行中..."
+
+		if out, err := exec.Command("systemctl", "show", s.name,
+			"-p", "ActiveState", "-p", "SubState").Output(); err == nil {
+			v := string(out)
+			switch {
+			case strings.Contains(v, "ActiveState=active") && strings.Contains(v, "SubState=running"):
+				status = "🟢运行中"
+			case strings.Contains(v, "ActiveState=active") && strings.Contains(v, "SubState=exited"):
+				status = "🔵已完成"
+			}
 		}
 
 		data[fmt.Sprintf("var%d", n)] = status

web-ui.service/web/pages/page1.html

@@ -68,6 +68,17 @@
       <div class="info-list">
         <div class="info-item">
           <div class="info-info">
+            <div class="info-name">开机任务执行</div>
+            <div class="info-desc">local-startup.service</div>
+          </div>
+          <span class="info-value" id="var9">--</span>
+          <span class="info-value"></span>
+          <span></span>
+          <span></span>
+        </div>
+
+        <div class="info-item">
+          <div class="info-info">
             <div class="info-name">设备自动联网</div>
             <div class="info-desc">networkd.service</div>
           </div>

web-ui.service/web/static/js/page1.js

@@ -156,6 +156,7 @@ function getServiceInfo(){
       document.getElementById("var6").textContent = data.var6 || "--";
       document.getElementById("var7").textContent = data.var7 || "--";
       document.getElementById("var8").textContent = data.var8 || "--";
+      document.getElementById("var9").textContent = data.var9 || "--";
       document.getElementById("var11").textContent = data.var11 || "--";
       document.getElementById("var22").textContent = data.var22 || "--";
       document.getElementById("var33").textContent = data.var33 || "--";
@@ -179,6 +180,7 @@ function getServiceInfo(){
       document.getElementById("var6").textContent = "--";
       document.getElementById("var7").textContent = "--";
       document.getElementById("var8").textContent = "--";
+      document.getElementById("var9").textContent = "--";
       document.getElementById("var11").textContent = "--";
       document.getElementById("var22").textContent = "--";
       document.getElementById("var33").textContent = "--";