wuwei
2025-05-30 9084e3393212d75a758c8e6a28c665ddcc5fc03b
1.修改upgrade.sh脚本,升级完成后自动删除升级文件包
已删除1个文件
已修改40个文件
已添加6个文件
120 ■■■■ 文件已修改
local/app/MainControl 补丁 | 查看 | 原始文档 | blame | 历史
local/app/NetModule 补丁 | 查看 | 原始文档 | blame | 历史
local/app/fzBus 补丁 | 查看 | 原始文档 | blame | 历史
local/app/linkage 补丁 | 查看 | 原始文档 | blame | 历史
local/app/svr 补丁 | 查看 | 原始文档 | blame | 历史
local/bin/db 补丁 | 查看 | 原始文档 | blame | 历史
local/bin/msg 补丁 | 查看 | 原始文档 | blame | 历史
local/default/app.ini 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/default/iot_cfg.db 补丁 | 查看 | 原始文档 | blame | 历史
local/default/sysConfig.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/version 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/action/close1 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/action/close2 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/action/open-door 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/action/open-door-bak 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/action/open-door-do 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/bin.tgz 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/bin/db 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/bin/env.sh 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/bin/jsoner 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/bin/mail.sh 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/bin/msg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/device-debug/debug 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/device-vedio/ptz 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/do/query 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/download/download.cgi 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/login/login 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/route/add 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/sys-platform/etc-query 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/sys-platform/etc-save 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/sys-platform/post-test-data 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/sys-platform/query 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/sys-platform/query-etc-data 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/sys-platform/query-test-result 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/sys-platform/save 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/upload/start_upgrade 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/upload/upload.cgi 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/warn-list/clear 补丁 | 查看 | 原始文档 | blame | 历史
local/www/cgi-bin/warn-list/update-all 补丁 | 查看 | 原始文档 | blame | 历史
local/www/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/js/page/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/js/page/sys-set.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/sys-param-set.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/sys-set.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/www/web.tgz 补丁 | 查看 | 原始文档 | blame | 历史
upgrade/app.tgz 补丁 | 查看 | 原始文档 | blame | 历史
upgrade/upgrade.sh 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
local/app/MainControl
Binary files differ
local/app/NetModule
Binary files differ
local/app/fzBus
Binary files differ
local/app/linkage
Binary files differ
local/app/svr
Binary files differ
local/bin/db
Binary files differ
local/bin/msg
Binary files differ
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 "
local/default/iot_cfg.db
Binary files differ
local/default/sysConfig.json
@@ -7,5 +7,5 @@
    "name": "动环监控系统",
    "opPhone": "4006271116",
    "opVendor": "风正致远信息技术股份有限公司",
    "usedTime": "20250301"
    "usedTime": "20250501"
}
local/version
@@ -1,3 +1,3 @@
2025-05-22-v001
2025-05-29-v001
type=1
IGD5300
local/www/cgi-bin/action/close1
old mode 100644 new mode 100755
local/www/cgi-bin/action/close2
old mode 100644 new mode 100755
local/www/cgi-bin/action/open-door
old mode 100644 new mode 100755
@@ -1,5 +1,6 @@
#!/bin/sh
# è®¾ç½®DO状态 é«˜é€ŸETC用的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
local/www/cgi-bin/action/open-door-bak
old mode 100644 new mode 100755
local/www/cgi-bin/action/open-door-do
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
#!/bin/sh
# è®¾ç½®DO状态 é«˜é€ŸETC用的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
local/www/cgi-bin/bin.tgz
Binary files differ
local/www/cgi-bin/bin/db
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
/usr/local/bin/db
local/www/cgi-bin/bin/env.sh
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
/usr/local/bin/env.sh
local/www/cgi-bin/bin/jsoner
Binary files differ
local/www/cgi-bin/bin/mail.sh
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
/usr/local/bin/mail.sh
local/www/cgi-bin/bin/msg
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
/usr/local/bin/msg
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
local/www/cgi-bin/device-vedio/ptz
old mode 100644 new mode 100755
local/www/cgi-bin/do/query
old mode 100644 new mode 100755
local/www/cgi-bin/download/download.cgi
Binary files differ
local/www/cgi-bin/login/login
old mode 100644 new mode 100755
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\"}"
local/www/cgi-bin/sys-platform/etc-query
old mode 100644 new mode 100755
local/www/cgi-bin/sys-platform/etc-save
old mode 100644 new mode 100755
local/www/cgi-bin/sys-platform/post-test-data
old mode 100644 new mode 100755
local/www/cgi-bin/sys-platform/query
old mode 100644 new mode 100755
local/www/cgi-bin/sys-platform/query-etc-data
old mode 100644 new mode 100755
local/www/cgi-bin/sys-platform/query-test-result
old mode 100644 new mode 100755
local/www/cgi-bin/sys-platform/save
old mode 100644 new mode 100755
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\"}"
local/www/cgi-bin/upload/upload.cgi
Binary files differ
local/www/cgi-bin/warn-list/clear
old mode 100644 new mode 100755
local/www/cgi-bin/warn-list/update-all
old mode 100644 new mode 100755
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>
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();
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){
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>
local/www/sys-set.html
@@ -72,6 +72,32 @@
                                                </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>
local/www/web.tgz
Binary files differ
upgrade/app.tgz
Binary files differ
upgrade/upgrade.sh
@@ -10,3 +10,5 @@
echo "*********************************************"
echo "upgrade done."
cd ..
rm upgrade* -fr