sshd/client/client.go

@@ -61,7 +61,7 @@ func main() {
 		return
 	}
 
-	term() // 启动终端模拟器
+	term() // 启动终端模拟器卍
 }
 
 // SHELL终端模拟器

sshd/client/coupler.go

@@ -2,13 +2,13 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
-	"hnyfkj.com.cn/rtu/linux/baseapp"
 )
 
 const (
@@ -48,13 +48,13 @@ func (c *MQTTCoupler) init() error {
 
 	opts.OnConnect = func(client mqtt.Client) {
 		if !c.isConnected.Swap(true) {
-			baseapp.Logger.Infof("[%s] MQTT Broker连接成功", MODULE_NAME)
+			fmt.Printf("[%s] MQTT Broker连接成功", MODULE_NAME)
 		}
 	}
 
 	opts.OnConnectionLost = func(client mqtt.Client, err error) {
 		if c.isConnected.Swap(false) {
-			baseapp.Logger.Warnf("[%s] MQTT Broker连接丢失: %v!", MODULE_NAME, err)
+			fmt.Printf("[%s] MQTT Broker连接丢失: %v!", MODULE_NAME, err)
 		}
 	}
 
@@ -84,7 +84,7 @@ func (c *MQTTCoupler) tick() time.Duration {
 	}
 
 	if err := c.connect(); err != nil {
-		baseapp.Logger.Errorf("[%s] MQTT Broker连接失败: %v!!", MODULE_NAME, err)
+		fmt.Printf("[%s] MQTT Broker连接失败: %v!!", MODULE_NAME, err)
 	}
 
 	return SlowInterval

sshd/sshd.go

@@ -329,6 +329,7 @@ func (c *MQTTCoupler) execOneCmd(msg mqtt.Message) {
 	// Call-?：无效, 远端调用了还不支持的-方法
 	default:
 		resp = jsonrpc2.BuildError(req, jsonrpc2.ErrMethodNotFound, "")
+		goto retp
 	}
 
 retp:
@@ -368,7 +369,7 @@ func (c *MQTTCoupler) startExecutorReaper(interval, timeout time.Duration) {
 				ce.mu.Unlock()
 
 				if expired && idle { // 超时且状态空闲时则回收
-					ce.handleClose()
+					ce.handleClose() //// 该函数不能阻塞, 否则锁
 					delete(c.executorMap, id)
 				} // end if
 			} // end for2
@@ -395,7 +396,7 @@ func (ce *clientExecutor) handleClose() error {
 
 	var err error
 	if needInterrupt {
-		err = ce.executor.Interrupt()
+		err = ce.executor.Interrupt() // 发送"Ctrl+C"
 	}
 
 	return err

utils/shell/execute.go

@@ -17,7 +17,7 @@ import (
 )
 
 const (
-	defaultTimeout    = 8 * time.Second
+	defaultTimeout    = 3 * time.Second
 	gracePeriod       = 2 * time.Second
 	forceKillWait     = 2 * time.Second
 	exitTimeoutCode   = 124