增加定时器

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
This commit is contained in:
zhangwei
2019-01-26 19:01:41 +06:00
parent 87e07376fa
commit 9b304e3c13
38 changed files with 303 additions and 34 deletions

View File

@@ -1482,13 +1482,16 @@ intercep_domain_required_tip=Domain is required
packets=packets
GByte=GByte
#\u5B9A\u65F6\u5668\u53C2\u6570
interval=Interval
month=Month
day=Day
interval=Recure every
month=Months
day=Days
week=weeks
startTime=Start Time
endTime=End Time
single=Single
everyDay=Every Day
everyWeek=Every Week
everyMonth=Every Month
validate_error=Unexpected error occurred while validating
single=One Time
everyDay=Daily
everyWeek=Weekly
everyMonth=Monthly
on=On
validate_error=Unexpected error occurred while validating
is_schduler=Scheduler

View File

@@ -1490,10 +1490,13 @@ GByte=GByte
interval=\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u043A
month=\u041C\u0435\u0441\u044F\u0446\u044B
day=\u0414\u043D\u0438
week=weeks
startTime=\u041D\u0430\u0447\u0430\u0442\u044C
endTime=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C
single=\u041E\u0434\u043D\u043E\u043A\u0440\u0430\u0442\u043D\u043E
everyDay=\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u043E
everyWeek=\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u043E
everyMonth=\u0415\u0436\u0435\u043C\u0435\u0441\u044F\u0447\u043D\u043E
on=On
is_schduler=Scheduler
validate_error=Unexpected error occurred while validating