Commit 938a335e by manxiaoqiang

二版

parent d40b99e5
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<!-- 单位是分钟--> <!-- 单位是分钟-->
<mail.valid_time>3</mail.valid_time> <mail.valid_time>3</mail.valid_time>
<report.url>http://172.31.1.122:9010</report.url> <report.url>http://10.3.20.41:9010</report.url>
<!--Redis setting--> <!--Redis setting-->
<redis.key.validtime>120</redis.key.validtime> <redis.key.validtime>120</redis.key.validtime>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<!-- 单位是分钟--> <!-- 单位是分钟-->
<mail.valid_time>3</mail.valid_time> <mail.valid_time>3</mail.valid_time>
<report.url>http://172.31.23.181:8003</report.url> <report.url>http://localhost:9010</report.url>
<!--Redis setting--> <!--Redis setting-->
<redis.key.validtime>120</redis.key.validtime> <redis.key.validtime>120</redis.key.validtime>
<redis.ip.requesttimes>5</redis.ip.requesttimes> <redis.ip.requesttimes>5</redis.ip.requesttimes>
......
...@@ -192,7 +192,7 @@ public class AccountFlowRestrictServiceImpl implements AccountFlowRestrictServic ...@@ -192,7 +192,7 @@ public class AccountFlowRestrictServiceImpl implements AccountFlowRestrictServic
} }
//是否流量用尽 //是否流量用尽
if(!ioFlag && !trackFlag){ if(trackFlag){
accountRestrict4Web.setIOFlowNotified(false); accountRestrict4Web.setIOFlowNotified(false);
} else{ } else{
accountRestrict4Web.setIOFlowNotified(true); accountRestrict4Web.setIOFlowNotified(true);
......
...@@ -90,22 +90,22 @@ public class AccountTask { ...@@ -90,22 +90,22 @@ public class AccountTask {
account4Web.setTrackLimit(restrict4Web.getTrackLimit()); account4Web.setTrackLimit(restrict4Web.getTrackLimit());
account4Web.setIoStatus(restrict4Web.getAllowBehavior()); account4Web.setIoStatus(restrict4Web.getAllowBehavior());
account4Web.setTrackStatus(restrict4Web.getTrackFlowNotified()); account4Web.setTrackStatus(restrict4Web.getTrackFlowNotified());
double f = 1.0; // double f = 1.0;
if((account4Web.getIo().doubleValue() != 0) && (null != account4Web.getIoLimit())){ // if((account4Web.getIo().doubleValue() != 0) && (null != account4Web.getIoLimit())){
if(account4Web.getIo().doubleValue() > account4Web.getIoLimit().doubleValue()){ // if(account4Web.getIo().doubleValue() > account4Web.getIoLimit().doubleValue()){
account4Web.setIoStatus(false); // account4Web.setIoStatus(false);
account4Web.setStatus("流量用尽"); // account4Web.setStatus("流量用尽");
}else{ // }else{
account4Web.setIoStatus(true); // account4Web.setIoStatus(true);
} // }
}else { // }else {
account4Web.setIoStatus(true); // account4Web.setIoStatus(true);
} // }
if(account4Web.getIoLimit().doubleValue() == -1){ // if(account4Web.getIoLimit().doubleValue() == -1){
account4Web.setIoStatus(true); // account4Web.setIoStatus(true);
account4Web.setStatus("已激活"); // account4Web.setStatus("已激活");
//
} // }
if(account4Web.getTrackLimit().doubleValue() == -1){ if(account4Web.getTrackLimit().doubleValue() == -1){
account4Web.setTrackStatus(true); account4Web.setTrackStatus(true);
account4Web.setStatus("已激活"); account4Web.setStatus("已激活");
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean> <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="tkioAccountTask" method="task" cron="0 10 10 * * ?"/> <task:scheduled ref="tkioAccountTask" method="task" cron="0 45 10 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean> <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment