djb-eapim/eapim-admin
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/KJB_DEV/eapim-bundle/bundles/260105-1/eapim-admin_incremental_2025-12-15.bundle into jenkins_with_weblogic

Browse Source
This commit is contained in:
Rinjae
2026-01-05 16:55:24 +09:00
parent 56bb309593 d5c9cf4eb9
commit 03a93ddf4d
6 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/js/common-en.js
+7 -9
View File
@@ -37,16 +37,14 @@ function isChromeBrowse() {
}
// find Context
function getContextName()
{
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos+1)
function getContextName() {
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos-sPos + 1);
}
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
function getToday()
{
WebContent/js/common-ko.js
+5 -6
View File
@@ -37,13 +37,12 @@ function isChromeBrowse() {
// find Context
function getContextName() {
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos + 1)
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos - sPos + 1);
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
WebContent/js/custom.js
+1 -1
View File
@@ -149,7 +149,7 @@ jQuery.showModalDialog = function(options) { $().showModalDialog(options); };
var originalError = options.error;
options.error = function(xhr, status, error) {
if(xhr.status === 401) {
var location = getContextName() + '/';
var location = getContextName();
comloadError(xhr, status, error, location);
return;
}
WebContent/jsp/js/common-en.js
+7 -9
View File
@@ -37,16 +37,14 @@ function isChromeBrowse() {
}
// find Context
function getContextName()
{
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos+1)
function getContextName() {
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos-sPos + 1);
}
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
function getToday()
{
WebContent/jsp/js/common-ko.js
+6 -8
View File
@@ -37,15 +37,13 @@ function isChromeBrowse() {
}
// find Context
function getContextName()
{
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos+1)
function getContextName() {
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos-sPos + 1);
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
function getToday()
src/main/resources/com/eactive/eai/apim/portalstatistics/EAILog-oracle.xml
+4 -4
View File
@@ -32,7 +32,7 @@
FROM (
SELECT
CLIENTID AS CLIENT_ID,
RAND() AS REQUEST_URI,
DBMS_RANDOM.VALUE AS REQUEST_URI,
'$startTime$' AS STATISTICS_TIME,
EAISVCNAME AS API_ID,
NULL AS API_NAME,
@@ -49,7 +49,7 @@
UNION ALL
SELECT
CLIENTID AS CLIENT_ID,
RAND() AS REQUEST_URI,
DBMS_RANDOM.VALUE AS REQUEST_URI,
'$startTime$' AS STATISTICS_TIME,
EAISVCNAME AS API_ID,
NULL AS API_NAME,
@@ -59,8 +59,8 @@
ORGID AS ORG_ID,
ORGNAME AS ORG_NAME,
CASE
WHEN SUBSTRING(RSPNSERRCDNAME, 1, 2) = 'RE' THEN 0
WHEN SUBSTRING(RSPNSERRCDNAME, 1, 2) = 'FE' THEN 0
WHEN SUBSTR(RSPNSERRCDNAME, 1, 2) = 'RE' THEN 0
WHEN SUBSTR(RSPNSERRCDNAME, 1, 2) = 'FE' THEN 0
ELSE 1
END AS END_COUNT,
0 AS START_COUNT