|
@@ -438,15 +438,15 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
|
|
|
// Call-6: 升级RTU固件, 升级后程序会自动退出, 靠守护进程重新拉起, 替换新程序
|
|
// Call-6: 升级RTU固件, 升级后程序会自动退出, 靠守护进程重新拉起, 替换新程序
|
|
|
case "upgrade_app":
|
|
case "upgrade_app":
|
|
|
func() { // 使用闭包, 避免defer影响范围扩大
|
|
func() { // 使用闭包, 避免defer影响范围扩大
|
|
|
|
|
+ mcu.MCBSetMNTStateBit(mcu.AppUpgrading)
|
|
|
|
|
+ defer mcu.MCBSetMNTStateBit(mcu.Idle)
|
|
|
|
|
+
|
|
|
server, user, pass, rf, md5val1, err := parseUpgradeAppReq(req.Params)
|
|
server, user, pass, rf, md5val1, err := parseUpgradeAppReq(req.Params)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
resp = jsonrpc2.BuildError(req, -32700, err.Error())
|
|
resp = jsonrpc2.BuildError(req, -32700, err.Error())
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- mcu.MCBSetMNTStateBit(mcu.AppUpgrading)
|
|
|
|
|
- defer mcu.MCBSetMNTStateBit(mcu.Idle)
|
|
|
|
|
-
|
|
|
|
|
lf, err := ftpclient.DownloadFileFromFtp(r.ctx, server, user, pass, rf, ftpclient.DefaultDownloadTimeout)
|
|
lf, err := ftpclient.DownloadFileFromFtp(r.ctx, server, user, pass, rf, ftpclient.DefaultDownloadTimeout)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
resp = jsonrpc2.BuildError(req, -32700, err.Error())
|
|
resp = jsonrpc2.BuildError(req, -32700, err.Error())
|