1、更新web到20.14版本

2、优化推送升级脚本

cust_data/web/anderson/css/chunk-2e2e088e.8711ef24.css

@@ -0,0 +1 @@
+.el-form-item__content[data-v-217ee6de]{border:1px solid #dcdfe6;border-radius:20px;padding:10px;background-color:#f2f6fc}.el-input[data-v-217ee6de]{border-radius:20px}

cust_data/web/anderson/css/chunk-34a49705.74ffe521.css

@@ -1 +0,0 @@
-.row-item[data-v-6b64f310]{display:-webkit-box;line-height:40px}.row-item-title[data-v-6b64f310]{font-weight:700;padding-right:10px}.row-item-content[data-v-6b64f310]{width:50%;white-space:nowrap;word-wrap:normal;word-break:keep-all;text-overflow:ellipsis;overflow:hidden}.disabledEdit[data-v-6b64f310]{.el-form-item__content{pointer-events:none}}

cust_data/web/anderson/css/chunk-48f71aa7.6d47c775.css

@@ -1 +0,0 @@
-.el-form-item__content[data-v-168e81a0]{border:1px solid #dcdfe6;border-radius:20px;padding:10px;background-color:#f2f6fc}.el-input[data-v-168e81a0]{border-radius:20px}

cust_data/web/anderson/css/chunk-996948dc.29bd96e9.css

@@ -0,0 +1 @@
+.row-item[data-v-48161ffa]{display:-webkit-box;line-height:40px}.row-item-title[data-v-48161ffa]{font-weight:700;padding-right:10px}.row-item-content[data-v-48161ffa]{width:50%;white-space:nowrap;word-wrap:normal;word-break:keep-all;text-overflow:ellipsis;overflow:hidden}.disabledEdit[data-v-48161ffa]{.el-form-item__content{pointer-events:none}}

cust_data/web/general/css/chunk-29deddf3.9f7f992d.css

@@ -1 +0,0 @@
-.el-form-item__content[data-v-62c78fc7]{border:1px solid #dcdfe6;border-radius:20px;padding:10px;background-color:#f2f6fc}.el-input[data-v-62c78fc7]{border-radius:20px}

cust_data/web/general/css/chunk-2e2e088e.8711ef24.css

@@ -0,0 +1 @@
+.el-form-item__content[data-v-217ee6de]{border:1px solid #dcdfe6;border-radius:20px;padding:10px;background-color:#f2f6fc}.el-input[data-v-217ee6de]{border-radius:20px}

cust_data/web/general/css/chunk-7fa676f8.7d983dc3.css

@@ -1 +0,0 @@
-.row-item[data-v-302d7a90]{display:-webkit-box;line-height:40px}.row-item-title[data-v-302d7a90]{font-weight:700;padding-right:10px}.row-item-content[data-v-302d7a90]{width:50%;white-space:nowrap;word-wrap:normal;word-break:keep-all;text-overflow:ellipsis;overflow:hidden}.disabledEdit[data-v-302d7a90]{.el-form-item__content{pointer-events:none}}

cust_data/web/general/css/chunk-c5cb3984.2ede895e.css

@@ -0,0 +1 @@
+.row-item[data-v-0222c882]{display:-webkit-box;line-height:40px}.row-item-title[data-v-0222c882]{font-weight:700;padding-right:10px}.row-item-content[data-v-0222c882]{width:50%;white-space:nowrap;word-wrap:normal;word-break:keep-all;text-overflow:ellipsis;overflow:hidden}.disabledEdit[data-v-0222c882]{.el-form-item__content{pointer-events:none}}

output/push/push.bat

@@ -1,8 +1,14 @@
 @ECHO OFF
 
-SET TARGET=pdutar
-SET IP=192.168.1.132
+SET IP=192.168.234.132
+
+SET BAT=0
+IF "%~1" NEQ "" (
+    SET IP=%1
+    SET BAT=1
+)
 
+SET TARGET=pdutar
 SET CURDIR=%~dp0
 SET CURDIR=%CURDIR:~0,-1%
 
@@ -19,8 +25,22 @@ SET PWD=123456
 ::send file
 ECHO send %TARGET% to device ...
 ECHO  y  | %PSCP% %OUTDIR%\%TARGET% root@%IP%:%DEVDIR%
-ECHO send finished!
+IF %ERRORLEVEL% NEQ 0 (
+    ECHO send failed!
+    EXIT /B 1
+)
 
-ECHO release %TARGET% now ...
+ECHO release %TARGET%
 ECHO  y  | %PLINK%  -ssh -t  -pw %PWD% %USR%@%IP% -m %FBAT%
+IF %ERRORLEVEL% NEQ 0 (
+    ECHO upgrade failed!
+    EXIT /B 2
+)
+
+IF %BAT% EQU 0  (
+    ECHO quit now ...
+    TIMEOUT /T 2 > NUL
+)
+
+EXIT /B 0
 

output/push/tools/script.sh

@@ -68,8 +68,10 @@ rm $obj
 set_net
 
 echo +++++++ upgrade ok! +++++++
-echo reboot device now ... 
-reboot -f
+echo reboot device
+
+reboot 1
+exit 0
 
 
 

output/push2/push.bat

@@ -2,10 +2,10 @@
 
 SET IP=192.168.1.132
 
-IF "%~1"=="" (
-    SET IP=%IP%
-) ELSE (
+SET BAT=0
+IF "%~1" NEQ "" (
     SET IP=%1
+    SET BAT=1
 )
 
 SET CURDIR=%~dp0
@@ -35,20 +35,21 @@ COPY /Y %%x  %TMPDIR%\
 ::send files
 ECHO send %TMPDIR% to device ...
 ECHO  y  | %PSCP% -r %TMPDIR% %USR%@%IP%:%DEVDIR%
-IF %ERRORLEVEL% EQU 0 (
-    ECHO send finished!
-)  ELSE (
+IF %ERRORLEVEL% NEQ 0 (
     ECHO send failed!
     EXIT /B 1
 )
 
-ECHO exec script now ...
+ECHO send finished, release files now ...
 ECHO  y  | %PLINK%  -ssh -t  -pw %PWD% %USR%@%IP% -m %FBAT%
-IF %ERRORLEVEL% EQU 0 (
-    ECHO exec bash ok!
-)  ELSE (
-    ECHO exec bash failed!
+IF %ERRORLEVEL% NEQ 0 (
+    ECHO upgrade failed!
     EXIT /B 2
 )
 
+IF %BAT% EQU 0 (
+    ECHO quit now ...
+    TIMEOUT /T 2 > NUL
+)
+
 EXIT /B 0

output/push2/tools/script.sh

@@ -71,7 +71,7 @@ rm -rf $tmpdir
 set_net
 
 echo +++++++ upgrade ok! +++++++
-echo  reboot device now ...
+echo  reboot device
 
 reboot -d 1
 exit 0

pro/src/app.c

@@ -1857,18 +1857,15 @@ void* ntp_thread(void *arg)
 
 int snmp_config(SNMPManager *m)
 {
-    char *path_conf="/root/run/app/snmp/conf/snmpd.conf";
-    //char *path_conf="/root/snmpd.conf";
+    char path[200];
+    char *conf="/snmp/conf/snmpd.conf";
     char user[100],pass[200],cmd[400];
 
-    if(strlen(m->crypt.auth.alg)<=1) {
-        return -1;
-    }
-
     //createUser afafafaf MD5 "md5123456" DES "des123456
+    sys_get_path(path, conf);
 
     //delete
-    sprintf(cmd, "sed -e /^createUser.*$/d -e /^rouser.*$/d -i %s", path_conf);
+    sprintf(cmd, "sed -e /^createUser.*$/d -e /^rouser.*$/d -i %s", path);
     system(cmd);
 
     if(m->version==2) {
@@ -1879,7 +1876,7 @@ int snmp_config(SNMPManager *m)
             strcat(pass, cmd);
         }
 
-        sprintf(cmd, "sed -e \"$ a %s\" -e \"$ a %s\" -i %s", pass, user, path_conf);
+        sprintf(cmd, "sed -e \"$ a %s\" -e \"$ a %s\" -i %s", pass, user, path);
         system(cmd);
     }
     system("/etc/init.d/S90PDUApp restart snmpd");