feat: update .gitignore

dargoner · Mar 23, 2022 · a28906f · a28906f
1 parent f37a347
commit a28906f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,8 +62,8 @@ apps/dgiot_parse/etc/dgiot_parse.conf
 apps/dgiot_jieshun/
 apps/dgiot_mingcheng/
 apps/dgiot_xinchuangwei/
+apps/dgiot_hikvision/
 apps/dgiot_meter_not_open_source/
-apps/dgiot_
 apps/dgiot_esports/
 apps/dgiot_http/etc/dgiot_http.conf
 apps/emqx_*

diff --git a/apps/dgiot_parse/etc/dgiot_parse.conf b/apps/dgiot_parse/etc/dgiot_parse.conf
@@ -23,4 +23,4 @@ parse.cache.max_size = 100000
 ## max_memory 最大内存数，单位byte
 parse.cache.max_memory = 1024000
 ## max_time 最大时间间隔，单位秒
-parse.cache.max_time = 60
+parse.cache.max_time = 60
diff --git a/dgiot_install.sh b/dgiot_install.sh
@@ -1295,6 +1295,12 @@ function pre_build_dgiot() {
 
     rm ${script_dir}/$plugin/apps/dgiot_http/etc/dgiot_http.conf -rf
     cp ${script_dir}/$plugin/apps/$plugin/conf/dgiot_http.conf ${script_dir}/$plugin/apps/dgiot_http/etc/dgiot_http.conf -rf
+
+    if [ -f ${script_dir}/$plugin/apps/$plugin/conf/other.sh ]; then
+      cd ${script_dir}/$plugin/apps/
+      echo | /bin/sh ${script_dir}/$plugin/apps/$plugin/conf/other.sh &> /dev/null
+    fi
+
     cd ${script_dir}/$plugin/
   }