Merge branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/eapim-admin.git into jenkins_with_weblogic

WebContent/jsp/onl/kjb/statistics/apiStatsDayMan.jsp

@@ -48,8 +48,8 @@
 		}
 
 		function decimalFormatter(cellvalue, options, rowObject) {
-			if (cellvalue == null || cellvalue == '') return '0.000';
+			if (cellvalue == null || cellvalue == '') return '0';
-			return Number(cellvalue).toFixed(3);
+			return Math.round(Number(cellvalue)).toLocaleString();
 		}
 
 		function initCharts() {

WebContent/jsp/onl/kjb/statistics/apiStatsHourMan.jsp

@@ -49,8 +49,8 @@
 		}
 
 		function decimalFormatter(cellvalue, options, rowObject) {
-			if (cellvalue == null || cellvalue == '') return '0.000';
+			if (cellvalue == null || cellvalue == '') return '0';
-			return Number(cellvalue).toFixed(3);
+			return Math.round(Number(cellvalue)).toLocaleString();
 		}
 
 		function initCharts() {

WebContent/jsp/onl/kjb/statistics/apiStatsMinuteMan.jsp

@@ -41,8 +41,8 @@
 		}
 
 		function decimalFormatter(cellvalue, options, rowObject) {
-			if (cellvalue == null || cellvalue == '') return '0.000';
+			if (cellvalue == null || cellvalue == '') return '0';
-			return Number(cellvalue).toFixed(3);
+			return Math.round(Number(cellvalue)).toLocaleString();
 		}
 
 		function initCharts() {

WebContent/jsp/onl/kjb/statistics/apiStatsMonthMan.jsp

@@ -48,8 +48,8 @@
 		}
 
 		function decimalFormatter(cellvalue, options, rowObject) {
-			if (cellvalue == null || cellvalue == '') return '0.000';
+			if (cellvalue == null || cellvalue == '') return '0';
-			return Number(cellvalue).toFixed(3);
+			return Math.round(Number(cellvalue)).toLocaleString();
 		}
 
 		function initCharts() {

WebContent/jsp/onl/kjb/statistics/apiStatsYearMan.jsp

@@ -48,8 +48,8 @@
 		}
 
 		function decimalFormatter(cellvalue, options, rowObject) {
-			if (cellvalue == null || cellvalue == '') return '0.000';
+			if (cellvalue == null || cellvalue == '') return '0';
-			return Number(cellvalue).toFixed(3);
+			return Math.round(Number(cellvalue)).toLocaleString();
 		}
 
 		function initCharts() {

src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogServiceImpl.java

@@ -82,7 +82,6 @@ public class EAILogServiceImpl implements EAILogService {
 			apiMessageLogDTO.setApiServiceNumber(apiServiceNumber);
 			apiMessageLogDTO.setTxDate(eaiLog.getMsgprcssyms());
 			apiMessageLogDTO.setProcessNumber(Integer.parseInt(eaiLog.getId().getLogprcssserno()));
-			apiMessageLogDTO.setQueryString("");
 			apiMessageLogDTO.setClientId(eaiLog.getClientid());
 			apiMessageLogDTO.setKeymgtmsgctnt(eaiLog.getKeymgtmsgctnt());
 
@@ -102,6 +101,8 @@ public class EAILogServiceImpl implements EAILogService {
 				apiMessageLogDTO.setMethod(httpAdapterExtraLog.getHttpMethod());
 				apiMessageLogDTO.setHttpStatus(httpAdapterExtraLog.getHttpStatus());
 				apiMessageLogDTO.setUrl(httpAdapterExtraLog.getUrl());
+				
+				apiMessageLogDTO.setQueryString(StringUtils.substringAfter(httpAdapterExtraLog.getUrl(), "?"));
 			}
 		}