clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

说明：1、修复api每天记录数不会重置 

2、其他细节调整
This commit is contained in:
xjs 2022-01-02 12:46:58 +08:00
parent 108c9508d4
commit a386b3eabe
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/views/business/warning/apiwarning/index.vue
View File

@ -56,11 +56,7 @@
<el-table-column label="API每天限制请求次数" align="center" prop="limitCount" :show-overflow-tooltip="true"/> <el-table-column label="API每天限制请求次数" align="center" prop="limitCount" :show-overflow-tooltip="true"/>
<el-table-column label="API每天请求次数" align="center" prop="dayCount"/> <el-table-column label="API每天请求次数" align="center" prop="dayCount"/>
<el-table-column label="调用时间" align="center" prop="updateTime" width="180"> <el-table-column label="调用时间" align="center" prop="updateTime" width="180"/>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true"> <el-table-column label="创建时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

3
xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java
View File

@ -22,8 +22,9 @@ class ChineseUtilTest {
@Test @Test
public void test2() { public void test2() {
Date date = DateUtil.parse("2022-01-01 23:59:59").toJdkDate();
long between = DateUtil long between = DateUtil
.between(new Date(), DateUtil.parseDate("2021-12-31 23:59:59").toJdkDate(), DateUnit.DAY); .between(new Date(), date, DateUnit.DAY);
System.out.println(between); System.out.println(between);
} }

6
xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java
View File

@ -154,11 +154,15 @@ public class ApiLogAspect {
//统计当前的请求次数，隔天清零 //统计当前的请求次数，隔天清零
haveApiRecord.setDayCount(haveApiRecord.getDayCount()+1L); haveApiRecord.setDayCount(haveApiRecord.getDayCount()+1L);
Date updateTime = haveApiRecord.getUpdateTime(); Date updateTime = haveApiRecord.getUpdateTime();
String dateTime = DateUtil.formatDateTime(updateTime);
Date date = DateUtil.parseDate(dateTime).toJdkDate();
//当前时间和最后一次修改时间间隔天数（超过1 就清零） //当前时间和最后一次修改时间间隔天数（超过1 就清零）
long compareTime = DateUtil.between(new Date(), updateTime, DateUnit.DAY); long compareTime = DateUtil.between(date, new Date(), DateUnit.DAY);
if (compareTime > 0) { if (compareTime > 0) {
haveApiRecord.setDayCount(0L); haveApiRecord.setDayCount(0L);
} }
//置为空让mp自动填充
haveApiRecord.setUpdateTime(null);
remoteWarningCRUDFeign.updateApiRecordForRPC(haveApiRecord); remoteWarningCRUDFeign.updateApiRecordForRPC(haveApiRecord);
//判断接口请求是否超过阈值 //判断接口请求是否超过阈值
if (haveApiRecord.getDayCount() > haveApiRecord.getLimitCount()) { if (haveApiRecord.getDayCount() > haveApiRecord.getLimitCount()) {

2
xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.xjs.service.impl; package com.xjs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.utils.DateUtils;
import com.xjs.domain.ApiRecord; import com.xjs.domain.ApiRecord;
import com.xjs.exception.BusinessException; import com.xjs.exception.BusinessException;
import com.xjs.mapper.ApiRecordMapper; import com.xjs.mapper.ApiRecordMapper;
@ -83,7 +82,6 @@ public class ApiWarningServiceImpl implements ApiWarningService {
*/ */
@Override @Override
public int updateApiRecord(ApiRecord apiRecord) { public int updateApiRecord(ApiRecord apiRecord) {
apiRecord.setUpdateTime(DateUtils.getNowDate());
return apiRecordMapper.updateApiRecord(apiRecord); return apiRecordMapper.updateApiRecord(apiRecord);
} }