修改关键字配置失效时，关联的已失效的配置再次失效的bug

增加分割删除nginx access.log的脚本
志总量，登陆用户名密码提示国际化文件修改
张微's avatar
修改proxy帮助文档，配置操作日志，增加音视频样例剪切工具下载
修正特定服务ajax动态新增的时候没有将编译ID获取的bug

src/main/resources/messages/message_en.properties

@@ -217,8 +217,8 @@ select=Please Select
 date_list=Data List
 confirm_message=Confirm?
 export_confirm_message=The maximum number of data exported
-fill_loginName=Please Enter Login Account
-fill_loginPassWord=Please Enter Login Password
+fill_loginName=Username
+fill_loginPassWord=Password
 loginName_error=Account or password wrong ,Please try again.
 system_error=There is a problem in the system. Please try again later!
 save_success=Save Success
@@ -612,7 +612,7 @@ version=Version
 encrypt_mode=Encrypt Mode
 hmac=Has HMAC
 tunnel_type=Tunnel Type
-log_total=Log Total Amount
+log_total=Total logs
 host_key=Host Key
 host_cookie=Host Cookie
 mac=Message Authentication Code
@@ -1365,4 +1365,5 @@ nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
 av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.
-asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
+asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
+keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration.

src/main/resources/messages/message_ru.properties

@@ -217,8 +217,8 @@ select=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435
 date_list=\u0421\u043F\u0438\u0441\u043E\u043A \u0434\u0430\u043D\u043D\u044B\u0445
 confirm_message=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C?
 export_confirm_message=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u043C\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
-fill_loginName=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043B\u043E\u0433\u0438\u043D
-fill_loginPassWord=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043F\u0430\u0440\u043E\u043B\u044C
+fill_loginName=\u041B\u043E\u0433\u0438\u043D
+fill_loginPassWord=\u041F\u0430\u0440\u043E\u043B\u044C
 loginName_error=\u041B\u043E\u0433\u0438\u043D \u0438\u043B\u0438 \u043F\u0430\u0440\u043E\u043B\u044C \u043D\u0435\u0432\u0435\u0440\u043D\u044B, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.
 system_error=\u0412 \u0441\u0438\u0441\u0442\u0435\u043C\u0435 \u0432\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0437\u0436\u0435!
 save_success=\u0423\u0441\u043F\u0435\u0448\u043D\u043E\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435
@@ -612,7 +612,7 @@ version=\u0412\u0435\u0440\u0441\u0438\u044F
 encrypt_mode=\u0420\u0435\u0436\u0438\u043C \u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u044F
 hmac=\u0418\u043C\u0435\u0435\u0442 HMAC
 tunnel_type=\u0422\u0438\u043F \u0442\u0443\u043D\u043D\u0435\u043B\u044F
-log_total=\u041E\u0431\u0449\u0430\u044F \u0441\u0443\u043C\u043C\u0430 \u0436\u0443\u0440\u043D\u0430\u043B\u0430
+log_total=\u0421\u0443\u043C\u043C\u0430 \u0416\u0443\u0440\u043D\u0430\u043B\u0430
 host_key=\u041A\u043B\u044E\u0447 \u0445\u043E\u0441\u0442\u0430
 host_cookie=Cookie \u0445\u043E\u0441\u0442\u0430
 mac=\u041A\u043E\u0434 \u0430\u0443\u0442\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u0438 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F
@@ -1153,7 +1153,7 @@ ip_reuse_policy_object=\u041E\u0431\u044A\u0435\u043A\u0442 \u043F\u043E\u043B\u
 area_group_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0440\u0435\u0433\u0438\u043E\u043D\u0430\u043C\u0438 \u043F\u043E \u0433\u0440\u0443\u043F\u043F\u0435
 stream_media_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u043F\u043E\u0442\u043E\u043A\u043E\u0432\u043E\u0433\u043E \u043C\u0443\u043B\u044C\u0442\u0438\u043C\u0435\u0434\u0438\u0430
 new_link=\u041D\u043E\u0432\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430
-active_link=\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430\u044F
+active_link=\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430
 traffic_ipactive_hour_trend=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 IP \u0422\u041E\u041F 10 \u0442\u0435\u043D\u0434\u0435\u043D\u0446\u0438\u044F \u0432 \u0442\u0435\u0447\u0435\u043D\u0438\u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u0433\u043E \u043E\u0434\u043D\u043E\u0433\u043E \u0447\u0430\u0441\u0430
 traffic_ipactive_hour_max=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 IP TOP10 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u0437\u0430 \u043E\u0434\u0438\u043D \u0447\u0430\u0441
 ip_addr=IP
@@ -1369,4 +1369,5 @@ nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
 av_tips=\u041A\u043E\u0433\u0434\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0446\u0435 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0431\u043E\u043B\u0435\u0435 1080p., \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F.
-asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
+asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
+keyword_log_tips=\u041A\u043E\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u043F\u043B\u043E\u0445\u0438\u043C, \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0434\u0435\u0434\u0443\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0433\u043E \u0436\u0443\u0440\u043D\u0430\u043B\u0430 \u0434\u0430\u043D\u043D\u043E\u0439 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E <20>\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 URL<52> \u0434\u043B\u044F \u043F\u043E\u0434\u0430\u0432\u0448\u0435\u0433\u043E \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430.

src/main/resources/messages/message_zh_CN.properties

@@ -1365,4 +1365,5 @@ nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
 av_tips=\u5BF9\u4E8E\u97F3\u89C6\u9891\u7F16\u7801\u7684\u7D22\u5F15\u4FE1\u606F\u5728\u97F3\u89C6\u9891\u6587\u4EF6\u5C3E\u90E8\u7684\u60C5\u51B5\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301\uFF0C\u5BF9\u4E8E\u5206\u8FA8\u7387\u5927\u4E8E4\u5146\u7684\u89C6\u9891\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301
-asn_ip_group_delete=(\u8BE5ASN\u7EC4\u4E0B\u7684IP\u914D\u7F6E\u4E5F\u4F1A\u88AB\u5220\u9664)
+asn_ip_group_delete=(\u8BE5ASN\u7EC4\u4E0B\u7684IP\u914D\u7F6E\u4E5F\u4F1A\u88AB\u5220\u9664)
+keyword_log_tips=\u6E05\u6D17\u540E\u7F51\u9875\u5173\u952E\u5B57\u65E5\u5FD7\uFF0C\u7F51\u9875\u5173\u952E\u5B57\u7BA1\u63A7\u72B6\u51B5\u4E0D\u7406\u60F3\u65F6\uFF0C\u53EF\u5C06\u6E05\u6D17\u540E\u5EFA\u8BAE\u7ED9\u51FA\u7684\u547D\u4E2D\u5173\u952E\u5B57\u7F51\u9875\u914D\u7F6E\u4E3AURL\u7BA1\u63A7

src/main/resources/scripts/auto_del_file.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+tomcat_install_dir=/home/ceiec/webTomcat
+find $tomcat_install_dir/logs/ -mtime +30 -name "*.log" -exec rm -rf {} \;
+find $tomcat_install_dir/logs/ -mtime +30 -name "*.txt" -exec rm -rf {} \;
+find $tomcat_install_dir/logs/ -mtime +30 -name "*catalina.out.*" -exec rm -rf {} \;
+find $tomcat_install_dir/webapps/ntc/WEB-INF/log/ -mtime +30 -name "*.log" -exec rm -rf {} \;

src/main/resources/scripts/cut_nginx_logs.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+#function:cut nginx log files
+
+#set the path to nginx log files
+log_files_path="/home/ceiec/nginx/logs/"
+log_files_dir=${log_files_path}
+#set nginx log files you want to cut
+log_files_name=(access )
+#set the path to nginx.
+nginx_sbin="/home/ceiec/nginx/sbin/nginx"
+#Set how long you want to save
+save_days=30
+############################################
+#Please do not modify the following script #
+############################################
+#mkdir -p $log_files_dir
+log_files_num=${#log_files_name[@]}
+
+#cut nginx log files
+for((i=0;i<$log_files_num;i++));do
+mv ${log_files_path}${log_files_name[i]}.log ${log_files_dir}${log_files_name[i]}.log_$(date -d "yesterday" +"%Y-%m-%d")
+done
+
+#delete 30 days ago nginx log files
+find $log_files_path -mtime +$save_days -exec rm -rf {} \; 
+
+#restart nginx
+#$nginx_sbin -s reload
+systemctl restart nginx

src/main/resources/scripts/help

@@ -0,0 +1,8 @@
+crontab -e
+00 00 * * * /bin/sh  /home/ceiec/nginx/sbin/cut_nginx_logs.sh
+0 1 * * * /home/ceiec/webTomcat/bin/splitCatalinaOut.sh >/dev/null 2>&1
+0 2 * * * /home/ceiec/webTomcat/bin/auto_del_file.sh >/dev/null 2>&1
+/etc/rc.d/rc.local
+ng_daemon.sh
+redis_daemon.sh
+servieDaemon.sh

src/main/resources/scripts/ng_daemon.sh

@@ -0,0 +1,11 @@
+#! /bin/bash 
+nginxPath=/usr/local/nginx
+pidFile=$nginxPath/logs/nginx.pid
+logPath=$nginxPath/logs/daemon.log
+while true;do
+        if [ ! -f $pidFile ]; then
+			echo "时间：`date '+%Y-%m-%d %T'`     nginx进程不存在,开始启动nginx" >> $logPath
+        systemctl start nginx
+	fi
+sleep 60
+done

src/main/resources/scripts/redis_daemon.sh

@@ -0,0 +1,11 @@
+#! /bin/bash 
+redisPath=/home/ceiec/redis/instances/6379
+pidFile=$redisPath/redis.pid
+logPath=$redisPath/log/daemon.log
+while true;do
+        if [ ! -f $pidFile ]; then
+			echo "时间：`date '+%Y-%m-%d %T'`     redis进程不存在,开始启动redis" >> $logPath
+        systemctl start redis
+	fi
+sleep 5
+done

src/main/resources/scripts/servieDaemon.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+##tomcat安装位置
+tomcatPath=/home/ceiec/webTomcat
+#tomcatPath=/opt/mesasoft/tomcat
+##下面的不要改了,默认即可
+tomcatProcess=$tomcatPath/bin/bootstrap.jar
+tomcatName=$tomcatPath
+logPath=$tomcatPath/logs/daemon.log
+echo $logPath
+while true;do
+count=`ps -ef|grep ${tomcatProcess} |grep -v grep`
+if [ $? -ne 0 ]
+then
+	echo "时间：`date '+%Y-%m-%d %T'`     "$tomcatName"进程不存在,开始启动"$tomcatName >> $logPath
+	rm -rf $tomcatPath/work
+	nohup $tomcatPath/bin/startup.sh &
+else
+echo "时间：`date '+%Y-%m-%d %T'`     "$tomcatName"进程存在" >> $logPath
+fi
+sleep 60 
+
+done

src/main/resources/scripts/splitCatalinaOut.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# split catalina.out by day
+cd  `dirname $0`
+d=`date +%Y%m%d`
+d1=`date -d'1 day ago' +%Y%m%d`
+d7=`date -d'7 day ago' +%Y%m%d`
+d30=`date -d'30 day ago' +%Y%m%d`
+cd  ../logs/
+
+cp catalina.out catalina.out.${d1}
+echo "" > catalina.out 
+rm -rf catalina.out.${d30}