gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-traffic-log' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into feature-traffic-log

Browse Source
This commit is contained in:
zhangwei
2019-01-26 20:20:40 +06:00
parent 9d6e3a3d4a 63882ac75e
commit 41e5202cbf
16 changed files with 1019 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/messages/message_en.properties
View File

@@ -1494,4 +1494,6 @@ everyWeek=Weekly
everyMonth=Monthly
on=On
validate_error=Unexpected error occurred while validating
is_schduler=Scheduler
is_schduler=Scheduler
v4_num=IPv4 Number
v4_num=IPv6 Number

4
src/main/resources/messages/message_ru.properties
View File

@@ -1499,4 +1499,6 @@ 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
validate_error=Unexpected error occurred while validating
v4_num=IPv4 Number
v4_num=IPv6 Number

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1491,4 +1491,6 @@ single=\u5355\u6B21
everyDay=\u6BCF\u5929
everyWeek=\u6BCF\u5468
everyMonth=\u6BCF\u6708
validate_error=\u9A8C\u8BC1\u65F6\u53D1\u751F\u610F\u5916\u9519\u8BEF
validate_error=\u9A8C\u8BC1\u65F6\u53D1\u751F\u610F\u5916\u9519\u8BEF
v4_num=IPv4 Number
v4_num=IPv6 Number

14
src/main/resources/spring-mvc.xml
View File

@@ -19,7 +19,9 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/cache
http://www.springframework.org/schema/cache/spring-cache.xsd">
http://www.springframework.org/schema/cache/spring-cache.xsd
http://www.springframework.org/schema/task
http://www.springframework.org/schema/task/spring-task.xsd">
@@ -49,6 +51,9 @@
<!-- 默认注解映射支持 -->
<mvc:annotation-driven />
<!-- 定时注解支持 -->
<!-- <task:annotation-driven /> -->
<!-- <bean class="com.nis.restful.SwaggerConfig" /> -->
<!-- redis 工具类-->
@@ -95,10 +100,15 @@
<!--事务控制驱动注解,发现注解@Transactional 时，找transactionManager事务管理器 -->
<tx:annotation-driven transaction-manager="transactionManager" />
<!-- autodetection of such annotated controllers -->
<context:component-scan base-package="com.nis.web"></context:component-scan>
<context:component-scan base-package="com.nis.restful"></context:component-scan>
<bean id="asnIpIask" class="com.nis.web.task.StatisticASNIpNumer"></bean>
<task:scheduled-tasks>
<task:scheduled ref="asnIpIask" method="calculateASNIp" cron=" 0 0 0 * * ?" />
</task:scheduled-tasks>
<!-- 定时任务配置 end -->
<!-- 默认的注解映射的支持，org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping -->
<mvc:annotation-driven