From 9084e3393212d75a758c8e6a28c665ddcc5fc03b Mon Sep 17 00:00:00 2001
From: wuwei <wuquan-1230@q63.com>
Date: 星期五, 30 五月 2025 16:33:18 +0800
Subject: [PATCH] 1.修改upgrade.sh脚本，升级完成后自动删除升级文件包
---
local/www/cgi-bin/sys-platform/query | 0
local/www/index.html | 2
local/bin/db | 0
local/www/cgi-bin/bin/env.sh | 1
local/www/cgi-bin/bin.tgz | 0
local/www/cgi-bin/sys-platform/query-etc-data | 0
local/version | 2
local/www/cgi-bin/sys-platform/etc-query | 0
upgrade/app.tgz | 0
local/www/cgi-bin/bin/db | 1
local/www/cgi-bin/bin/mail.sh | 1
local/app/NetModule | 0
local/default/iot_cfg.db | 0
local/www/cgi-bin/device-vedio/ptz | 0
local/www/cgi-bin/do/query | 0
local/www/cgi-bin/upload/upload.cgi | 0
local/www/cgi-bin/action/close1 | 0
local/www/cgi-bin/action/close2 | 0
local/www/cgi-bin/sys-platform/query-test-result | 0
local/app/fzBus | 0
local/www/cgi-bin/action/open-door-do | 28 +++++++++
local/www/cgi-bin/bin/msg | 1
local/default/sysConfig.json | 2
local/www/cgi-bin/action/open-door-bak | 0
local/www/cgi-bin/download/download.cgi | 0
local/www/sys-param-set.html | 2
local/www/cgi-bin/device-debug/debug | 3
local/www/cgi-bin/route/add | 15 ++++
local/www/cgi-bin/upload/start_upgrade | 1
local/default/app.ini | 2
local/www/cgi-bin/warn-list/clear | 0
local/bin/msg | 0
local/www/cgi-bin/login/login | 0
local/www/cgi-bin/sys-platform/save | 0
local/www/js/page/sys-set.js | 3
local/www/sys-set.html | 26 ++++++++
local/www/cgi-bin/action/open-door | 26 ++------
local/www/cgi-bin/sys-platform/post-test-data | 0
local/www/cgi-bin/warn-list/update-all | 0
/dev/null | 0
local/app/svr | 0
local/app/MainControl | 0
local/www/cgi-bin/sys-platform/etc-save | 0
local/app/linkage | 0
local/www/js/page/index.js | 4
upgrade/upgrade.sh | 2
local/www/cgi-bin/bin/jsoner | 0
47 files changed, 94 insertions(+), 28 deletions(-)
diff --git a/local/app/MainControl b/local/app/MainControl
index a76a5b0..d97b0f6 100755
--- a/local/app/MainControl
+++ b/local/app/MainControl
Binary files differ
diff --git a/local/app/NetModule b/local/app/NetModule
index 0debcde..dd6b8cd 100755
--- a/local/app/NetModule
+++ b/local/app/NetModule
Binary files differ
diff --git a/local/app/fzBus b/local/app/fzBus
index f004295..8d370b7 100755
--- a/local/app/fzBus
+++ b/local/app/fzBus
Binary files differ
diff --git a/local/app/linkage b/local/app/linkage
index 262b888..553fc61 100755
--- a/local/app/linkage
+++ b/local/app/linkage
Binary files differ
diff --git a/local/app/svr b/local/app/svr
index a8b5657..e17015d 100755
--- a/local/app/svr
+++ b/local/app/svr
Binary files differ
diff --git a/local/bin/db b/local/bin/db
index e0b1a80..997da7a 100755
--- a/local/bin/db
+++ b/local/bin/db
Binary files differ
diff --git a/local/bin/msg b/local/bin/msg
index 4263c77..aaee5e1 100755
--- a/local/bin/msg
+++ b/local/bin/msg
Binary files differ
diff --git a/local/default/app.ini b/local/default/app.ini
index 3c791a4..b0c39b4 100644
--- a/local/default/app.ini
+++ b/local/default/app.ini
@@ -1,3 +1,4 @@
+vo=initvo
gate=fzBus
gui=gui
db=DataBase
@@ -7,5 +8,6 @@
dc=dclient
mul=MulticastIP
lk=linkage
+rtsp=rtsp
export applist=" $main $dc $net $gate $svr "
diff --git a/local/default/iot_cfg.db b/local/default/iot_cfg.db
index 19b21d3..77ce79b 100644
--- a/local/default/iot_cfg.db
+++ b/local/default/iot_cfg.db
Binary files differ
diff --git a/local/default/sysConfig.json b/local/default/sysConfig.json
index 2300746..e986ede 100755
--- a/local/default/sysConfig.json
+++ b/local/default/sysConfig.json
@@ -7,5 +7,5 @@
"name": "鍔ㄧ幆鐩戞帶绯荤粺",
"opPhone": "4006271116",
"opVendor": "椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�",
- "usedTime": "20250301"
+ "usedTime": "20250501"
}
diff --git a/local/version b/local/version
index 2d5f1b5..50b8724 100644
--- a/local/version
+++ b/local/version
@@ -1,3 +1,3 @@
-2025-05-22-v001
+2025-05-29-v001
type=1
IGD5300
diff --git a/local/www/cgi-bin/action/close1 b/local/www/cgi-bin/action/close1
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/action/close2 b/local/www/cgi-bin/action/close2
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/action/open-door b/local/www/cgi-bin/action/open-door
old mode 100644
new mode 100755
index 44ffcfc..36982c8
--- a/local/www/cgi-bin/action/open-door
+++ b/local/www/cgi-bin/action/open-door
@@ -1,5 +1,6 @@
#!/bin/sh
-# 璁剧疆DO鐘舵�� 楂橀�烢TC鐢ㄧ殑DO寮�闂�
+# 绔彛閰嶇疆-淇濆瓨
+#
echo -en "Content-type: text/html; charset=utf-8\n\n"
#*****************************************************
source ../bin/env.sh
@@ -7,22 +8,11 @@
jsoner="../bin/jsoner"
-read content
-id=`$jsoner $content id`
+read result
-if [ $? -eq 0 ]
-then
- echo "{\"code\":\"success\"}"
-else
- echo "{\"code\":\"error\"}"
-fi
-if [ $id -eq 7 ]
-then
- echo 1 > /usr/local/dev/do1
- exec /work/data/local/www/cgi-bin/action/close1
-else
- echo 1 > /usr/local/dev/do2
- exec /work/data/local/www/cgi-bin/action/close2
-fi
+id=`$jsoner $result id`
-#echo "query device list: $content"> log
+`/usr/local/bin/msg set $id 8 1`
+
+#echo $result > log
+
diff --git a/local/www/cgi-bin/action/open-door-bak b/local/www/cgi-bin/action/open-door-bak
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/action/open-door-do b/local/www/cgi-bin/action/open-door-do
new file mode 100755
index 0000000..44ffcfc
--- /dev/null
+++ b/local/www/cgi-bin/action/open-door-do
@@ -0,0 +1,28 @@
+#!/bin/sh
+# 璁剧疆DO鐘舵�� 楂橀�烢TC鐢ㄧ殑DO寮�闂�
+echo -en "Content-type: text/html; charset=utf-8\n\n"
+#*****************************************************
+source ../bin/env.sh
+db="../bin/db"
+jsoner="../bin/jsoner"
+
+
+read content
+id=`$jsoner $content id`
+
+if [ $? -eq 0 ]
+then
+ echo "{\"code\":\"success\"}"
+else
+ echo "{\"code\":\"error\"}"
+fi
+if [ $id -eq 7 ]
+then
+ echo 1 > /usr/local/dev/do1
+ exec /work/data/local/www/cgi-bin/action/close1
+else
+ echo 1 > /usr/local/dev/do2
+ exec /work/data/local/www/cgi-bin/action/close2
+fi
+
+#echo "query device list: $content"> log
diff --git a/local/www/cgi-bin/bin.tgz b/local/www/cgi-bin/bin.tgz
index 3bdc260..79b8d1c 100644
--- a/local/www/cgi-bin/bin.tgz
+++ b/local/www/cgi-bin/bin.tgz
Binary files differ
diff --git a/local/www/cgi-bin/bin/db b/local/www/cgi-bin/bin/db
new file mode 120000
index 0000000..41c678c
--- /dev/null
+++ b/local/www/cgi-bin/bin/db
@@ -0,0 +1 @@
+/usr/local/bin/db
\ No newline at end of file
diff --git a/local/www/cgi-bin/bin/env.sh b/local/www/cgi-bin/bin/env.sh
new file mode 120000
index 0000000..e88978e
--- /dev/null
+++ b/local/www/cgi-bin/bin/env.sh
@@ -0,0 +1 @@
+/usr/local/bin/env.sh
\ No newline at end of file
diff --git a/local/www/cgi-bin/bin/jsoner b/local/www/cgi-bin/bin/jsoner
new file mode 100755
index 0000000..4b08b6e
--- /dev/null
+++ b/local/www/cgi-bin/bin/jsoner
Binary files differ
diff --git a/local/www/cgi-bin/bin/mail.sh b/local/www/cgi-bin/bin/mail.sh
new file mode 120000
index 0000000..b0cc626
--- /dev/null
+++ b/local/www/cgi-bin/bin/mail.sh
@@ -0,0 +1 @@
+/usr/local/bin/mail.sh
\ No newline at end of file
diff --git a/local/www/cgi-bin/bin/msg b/local/www/cgi-bin/bin/msg
new file mode 120000
index 0000000..a6bc7cf
--- /dev/null
+++ b/local/www/cgi-bin/bin/msg
@@ -0,0 +1 @@
+/usr/local/bin/msg
\ No newline at end of file
diff --git a/local/www/cgi-bin/device-debug/debug b/local/www/cgi-bin/device-debug/debug
index b4aa0ca..07dc9a2 100755
--- a/local/www/cgi-bin/device-debug/debug
+++ b/local/www/cgi-bin/device-debug/debug
@@ -29,6 +29,7 @@
cid2=`$jsoner $arg cid2`
data=`$jsoner $arg data`
oid=`$jsoner $arg oid`
+community=`$jsoner $arg community`
case "$debug" in
@@ -39,7 +40,7 @@
string)
content=`msg string $type $ip $port $data`;;
snmp)
-content=`msg snmp $ver $ip $oid`;;
+content=`msg snmp $ver $ip $oid $port $community`;;
esac
#echo $content
diff --git a/local/www/cgi-bin/device-vedio/ptz b/local/www/cgi-bin/device-vedio/ptz
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/do/query b/local/www/cgi-bin/do/query
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/download/download.cgi b/local/www/cgi-bin/download/download.cgi
index 88b314e..773ea77 100755
--- a/local/www/cgi-bin/download/download.cgi
+++ b/local/www/cgi-bin/download/download.cgi
Binary files differ
diff --git a/local/www/cgi-bin/login/login b/local/www/cgi-bin/login/login
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/route/add b/local/www/cgi-bin/route/add
index 1927b36..d74457b 100755
--- a/local/www/cgi-bin/route/add
+++ b/local/www/cgi-bin/route/add
@@ -17,9 +17,9 @@
dev=`$jsoner $data Interface`
-cmd="route add -net $des gateway $gate netmask $mask dev $dev"
+cmd="route add -net $des netmask $mask dev $dev"
-str="route del -net $des gateway $gate netmask $mask dev $dev"
+str="route del -net $des netmask $mask dev $dev"
file="/work/route_list"
@@ -40,6 +40,17 @@
fi
done < "$file"
+if [ -f $file ]
+then
+ if [ -s $file ]
+ then
+ echo "" >>/dev/null
+ else
+ echo "$cmd" >> $file
+ fi
+else
+ echo "$cmd" >> $file
+fi
$cmd
echo "{\"code\":\"success\"}"
diff --git a/local/www/cgi-bin/sys-platform/etc-query b/local/www/cgi-bin/sys-platform/etc-query
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/sys-platform/etc-save b/local/www/cgi-bin/sys-platform/etc-save
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/sys-platform/post-test-data b/local/www/cgi-bin/sys-platform/post-test-data
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/sys-platform/query b/local/www/cgi-bin/sys-platform/query
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/sys-platform/query-etc-data b/local/www/cgi-bin/sys-platform/query-etc-data
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/sys-platform/query-test-result b/local/www/cgi-bin/sys-platform/query-test-result
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/sys-platform/save b/local/www/cgi-bin/sys-platform/save
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/upload/start_upgrade b/local/www/cgi-bin/upload/start_upgrade
index a1ca892..e83f553 100755
--- a/local/www/cgi-bin/upload/start_upgrade
+++ b/local/www/cgi-bin/upload/start_upgrade
@@ -20,6 +20,7 @@
then
chmod 777 /work/data/$filename
/work/data/$filename > /dev/null
+ /usr/local/script/update_sn > /dev/null
echo "{\"code\": \"success\"}"
else
echo "{\"code\": \"error\"}"
diff --git a/local/www/cgi-bin/upload/upload.cgi b/local/www/cgi-bin/upload/upload.cgi
index cde5185..248b509 100755
--- a/local/www/cgi-bin/upload/upload.cgi
+++ b/local/www/cgi-bin/upload/upload.cgi
Binary files differ
diff --git a/local/www/cgi-bin/warn-list/clear b/local/www/cgi-bin/warn-list/clear
old mode 100644
new mode 100755
diff --git a/local/www/cgi-bin/warn-list/update-all b/local/www/cgi-bin/warn-list/update-all
old mode 100644
new mode 100755
diff --git a/local/www/index.html b/local/www/index.html
index b0b7491..5ad741b 100644
--- a/local/www/index.html
+++ b/local/www/index.html
@@ -76,7 +76,7 @@
<a class="J_menuItem" data-id="0" href="record-his.html">鍘嗗彶鏁版嵁</a>
</li>
<li>
- <a class="J_menuItem" data-id="0" href="three-img.html" id="menu3DVld" >鍏ㄦ櫙瀵艰埅</a>
+ <a class="J_menuItem" data-id="0" style="display: none;" href="three-img.html" id="menu3DVld" >鍏ㄦ櫙瀵艰埅</a>
</li>
</ul>
diff --git a/local/www/js/page/index.js b/local/www/js/page/index.js
index 1360c9d..fba910a 100644
--- a/local/www/js/page/index.js
+++ b/local/www/js/page/index.js
@@ -90,7 +90,7 @@
if ("success" == status) {
window.SYS_SET = data;
//绯荤粺鍚嶇О
- // $("#sys-name").text(window.SYS_SET.name);
+ $("#sys-name").text(window.SYS_SET.name);
// $("#menu3DVld").hide();
if(window.SYS_SET.menu3DVld == 1){
$("#menu3DVld").show();
@@ -617,4 +617,4 @@
}else{
$("#"+id).removeClass("warn");
}
-}
\ No newline at end of file
+}
diff --git a/local/www/js/page/sys-set.js b/local/www/js/page/sys-set.js
index 4a39179..5cc306b 100644
--- a/local/www/js/page/sys-set.js
+++ b/local/www/js/page/sys-set.js
@@ -2,7 +2,7 @@
var laydate;
var form;
var test = {"name":"绯荤粺鍚嶇О","screenName":"澶у睆鍚嶇О","screenSlogan":"澶у睆鏍囪","opVendor":"杩愮淮鍘傚晢","opPhone":"180********"
- ,"contacter":"鑱旂郴浜�","usedTime":"2022-08-14 15:16:18","menu3DVld":"1"};
+ ,"contacter":"鑱旂郴浜�","usedTime":"2022-08-14 15:16:18","menu3DVld":"1", "etcPlat":"0", "linkage":"0"};
var sysInfo = {};
(function () {
layui.use(['layer', 'form', 'laydate'], function () {
@@ -65,6 +65,7 @@
// if(info.menu3DVld){
// sysInfo.menu3DVld = info.menu3DVld;
// }
+
if(info.mainShow){
sysInfo.mainShow = info.mainShow;
}else if(!sysInfo.mainShow){
diff --git a/local/www/sys-param-set.html b/local/www/sys-param-set.html
index b472eb1..0e1140d 100644
--- a/local/www/sys-param-set.html
+++ b/local/www/sys-param-set.html
@@ -39,7 +39,7 @@
<li class="layui-this"><span>绔彛璁剧疆</span></li>
<li class=""><span>骞冲彴璁剧疆</span></li>
<li class=""><span>缃戠粶璁剧疆</span></li>
- <li class=""><span>瀛樺偍璁剧疆</span></li>
+ <li class=""><span>瀛樺偍绠＄悊</span></li>
<li class=""><span>璺敱琛�</span></li>
<li class=""><span>鍥藉瘑閰嶇疆</span></li>
<li class=""><span>MQTT</span></li>
diff --git a/local/www/sys-set.html b/local/www/sys-set.html
index 2c7f4ac..435f1d9 100644
--- a/local/www/sys-set.html
+++ b/local/www/sys-set.html
@@ -71,7 +71,33 @@
</div>
</div>
</div>
+
+ <div class="layui-form-item layui-col-md12" style="display: none;">
+ <div class="layui-inline">
+ <label class="layui-form-label">ETC骞冲彴閰嶇疆椤甸潰锛�</label>
+ <div class="layui-input-block">
+<!-- <input type="text" name="screenSlogan" class="layui-input" placeholder="璇疯緭鍏�">-->
+ <select class="layui-select layui-input" id="etcPlat" name="etcPlat">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-col-md12" style="display: none;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱斿姩閰嶇疆锛�</label>
+ <div class="layui-input-block">
+<!-- <input type="text" name="screenSlogan" class="layui-input" placeholder="璇疯緭鍏�">-->
+ <select class="layui-select layui-input" id="linkage" name="linkage">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+
<div class="layui-form-item layui-col-md12">
<div class="layui-inline">
<label class="layui-form-label">杩愮淮鍘傚晢锛�</label>
diff --git a/local/www/web.tgz b/local/www/web.tgz
deleted file mode 100644
index 894f9f9..0000000
--- a/local/www/web.tgz
+++ /dev/null
Binary files differ
diff --git a/upgrade/app.tgz b/upgrade/app.tgz
index 5d0d6f6..1700ae9 100644
--- a/upgrade/app.tgz
+++ b/upgrade/app.tgz
Binary files differ
diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh
index 28877f9..c12bab7 100755
--- a/upgrade/upgrade.sh
+++ b/upgrade/upgrade.sh
@@ -10,3 +10,5 @@
echo "*********************************************"
echo "upgrade done."
+cd ..
+rm upgrade* -fr
--
Gitblit v1.9.3