manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TimeUtils 新增多语言参数，formatDateAgo 重命名为 formatTime

Browse Source
This commit is contained in:
thinkgem
2022-04-22 14:50:38 +08:00
parent a0d6ef9097
commit b31364a794
5 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java
View File

@@ -62,7 +62,7 @@ public class FrontSearchController extends BaseController{
parmas.put("siteCode", siteCode);
}
page = articleService.searchPage(page, q, qand, qnot, bd, ed, parmas);
page.setPageInfo("匹配结果，共耗时 " + TimeUtils.formatDateAgo(System.currentTimeMillis() - start) + "。");
page.setPageInfo("匹配结果，共耗时 " + TimeUtils.formatTime(System.currentTimeMillis() - start) + "。");
model.addAttribute("page", page);
}

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java
View File

@@ -234,7 +234,7 @@ public class Log extends DataEntity<Log> {
if (executeTime == null) {
executeTime = 0L;
}
return TimeUtils.formatDateAgo(executeTime);
return TimeUtils.formatTime(executeTime);
}
/**

2
modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java
View File

@@ -105,7 +105,7 @@ public class OnlineController extends BaseController{
}
map.put("startTimestamp", DateUtils.formatDateTime(session.getStartTimestamp()));
map.put("lastAccessTime", DateUtils.formatDateTime(session.getLastAccessTime()));
map.put("timeout", TimeUtils.formatDateAgo(session.getTimeout()-(currentTime-session.getLastAccessTime().getTime())));
map.put("timeout", TimeUtils.formatTime(session.getTimeout()-(currentTime-session.getLastAccessTime().getTime())));
map.put("userCode", session.getAttribute("userCode"));
map.put("userName", session.getAttribute("userName"));
map.put("userType", session.getAttribute("userType"));