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

Merge branch 'Release-1.1' into develop

Browse Source
This commit is contained in:
doufenghu
2018-08-08 19:41:43 +08:00
parent 2f09138ea3 c7df6708a2
commit 329b79607e
8 changed files with 98 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/BaseLogService.java
View File

@@ -186,6 +186,7 @@ public abstract class BaseLogService {
try {
if (!StringUtil.isBlank(entity.getSearchFoundEndTime())) {
sdf.setLenient(false);
sdf.parse(entity.getSearchFoundEndTime());
}
} catch (ParseException e) {
@@ -201,6 +202,7 @@ public abstract class BaseLogService {
try {
if (!StringUtil.isBlank(entity.getSearchFoundStartTime())) {
sdf.setLenient(false);
sdf.parse(entity.getSearchFoundStartTime());
}
} catch (ParseException e) {

1
src/main/java/com/nis/web/service/ServicesRequestLogService.java
View File

@@ -105,6 +105,7 @@ public class ServicesRequestLogService {
log.setBusinessCode(businessCode);
log.setExceptionInfo(exceptionInfo);
log.setTraceCode(traceCode);
log.setRequestURI(requestURI);
try {
if(Constants.SERVCER_HOST!=null){
log.setServerIp(Constants.SERVCER_HOST);