diff --git a/.gitignore b/.gitignore
index 546de91..acaddd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -239,4 +239,7 @@ gradle-app.setting
Doc/
docs
build-gf63.sh
-gradle-gf63.sh
\ No newline at end of file
+gradle-gf63.sh
+
+
+eapim-admin-kjb/
\ No newline at end of file
diff --git a/WebContent/META-INF/persistence.xml b/WebContent/META-INF/persistence.xml
index 2668051..a013e0b 100644
--- a/WebContent/META-INF/persistence.xml
+++ b/WebContent/META-INF/persistence.xml
@@ -2,14 +2,11 @@
org.hibernate.jpa.HibernatePersistenceProvider
jdbc/dsOBP_EMS
-
-
-
+
+
+
- com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness
-
+ com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness
com.eactive.eai.data.entity.onl.unifbwk.UnifBwkTp
false
@@ -17,14 +14,11 @@
org.hibernate.jpa.HibernatePersistenceProvider
jdbc/dsOBP_EMS
-
-
-
+
+
+
- com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness
-
+ com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness
com.eactive.eai.data.entity.onl.unifbwk.UnifBwkTp
false
\ No newline at end of file
diff --git a/WebContent/WEB-INF/applicationContext-jpa.xml b/WebContent/WEB-INF/applicationContext-jpa.xml
index 932cf53..53b9b53 100644
--- a/WebContent/WEB-INF/applicationContext-jpa.xml
+++ b/WebContent/WEB-INF/applicationContext-jpa.xml
@@ -41,9 +41,7 @@
-
-
+
@@ -66,15 +64,10 @@
-
-
-
-
-
-
+
+
+
+
@@ -92,9 +85,9 @@
none
true
- true
- ${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect}
-
+ false
+ trace
+ ${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect}
100
100
diff --git a/WebContent/WEB-INF/applicationContext.xml b/WebContent/WEB-INF/applicationContext.xml
index 2c394c4..99fd189 100644
--- a/WebContent/WEB-INF/applicationContext.xml
+++ b/WebContent/WEB-INF/applicationContext.xml
@@ -52,8 +52,10 @@
-
+
+
+
+
diff --git a/WebContent/WEB-INF/properties/env.P.properties b/WebContent/WEB-INF/properties/env.P.properties
index 38759b7..2a732cc 100644
--- a/WebContent/WEB-INF/properties/env.P.properties
+++ b/WebContent/WEB-INF/properties/env.P.properties
@@ -14,5 +14,5 @@ eai.tableowner=EMSADM
# P/T/D/S
eai.systemmode=P
eai.drmode=N
-# black / blue / green / orange / yellow
+# black / blue / green / orange / yellow
theme.color=blue
diff --git a/WebContent/WEB-INF/weblogic.xml b/WebContent/WEB-INF/weblogic.xml
index ed59465..4fb5123 100644
--- a/WebContent/WEB-INF/weblogic.xml
+++ b/WebContent/WEB-INF/weblogic.xml
@@ -13,7 +13,7 @@
- org.apach.ignite.*
+ org.apach.ignite.*
org.slf4j.*
ch.qos.logback.*
diff --git a/WebContent/addon/request-header.jsp b/WebContent/addon/request-header.jsp
new file mode 100644
index 0000000..e3bde54
--- /dev/null
+++ b/WebContent/addon/request-header.jsp
@@ -0,0 +1,11 @@
+<%@ page import="java.util.Enumeration" %>
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="utf-8" trimDirectiveWhitespaces="true"%>
+<%
+ Enumeration names = request.getHeaderNames();
+ while (names.hasMoreElements()) {
+ String name = names.nextElement();
+ out.println(name + ": " + request.getHeader(name));
+ }
+%>
+---------
+request.getScheme(): <%=request.getScheme()%>
\ No newline at end of file
diff --git a/WebContent/jsp/common/screen/emergency.jsp b/WebContent/jsp/common/screen/emergency.jsp
index 01ab044..5ac9ffa 100644
--- a/WebContent/jsp/common/screen/emergency.jsp
+++ b/WebContent/jsp/common/screen/emergency.jsp
@@ -86,30 +86,33 @@
$("#loginForm").submit();
}
function changePwd(){
- if ($("input[name=userId]").val() == null || $("input[name=userId]").val().length == 0 ){
+ if ($("input[name=resetUserId]").val() == null || $("input[name=resetUserId]").val().length == 0 ){
alert("<%= localeMessage.getString("login.checkid") %>");
- $("input[name=userId]").trigger("focus");
+ $("input[name=resetUserId]").trigger("focus");
return;
}
- if ($("input[name=password]").val() == null || $("input[name=password]").val().trim().length == 0 ){
+ if ($("input[name=resetPassword]").val() == null || $("input[name=resetPassword]").val().trim().length == 0 ){
alert("<%= localeMessage.getString("login.checkpwd1") %>");
- $("input[name=password]").trigger("focus");
+ $("input[name=resetPassword]").trigger("focus");
return;
}
- if ($("input[name=password]").length == 0){
+ if ($("input[name=changePassword]").val() == null || $("input[name=changePassword]").val().trim().length == 0 ){
alert("<%= localeMessage.getString("login.checkpwd2") %>");
+ $("input[name=changePassword]").trigger("focus");
return ;
}
- if ($("input[name=changePassword]").length == 0){
+ if ($("input[name=confirmPassword]").val() == null || $("input[name=confirmPassword]").val().trim().length == 0 ){
alert("<%= localeMessage.getString("login.checkpwd3") %>");
return ;
}
- if ($("input[name=confirmPassword]").val() != $("input[name=changePassword]").val()){
+ if ($("input[name=confirmPassword]").val() != $("input[name=confirmPassword]").val()){
alert("<%= localeMessage.getString("login.checkpwd4") %>");
+ $("input[name=confirmPassword]").trigger("focus");
return ;
}
- if ($("input[name=userId]").val() == $("input[name=changePassword]").val()){
+ if ($("input[name=resetUserId]").val() == $("input[name=changePassword]").val()){
alert("<%= localeMessage.getString("login.checkpwd5") %>");
+ $("input[name=changePassword]").trigger("focus");
return ;
}
@@ -121,21 +124,6 @@
--%>
$("form").submit();
}
-
- function openPwdChgWindow() {
-
- <%
- if(sysMode.equals("T") || sysMode.equals("D")) {
- %>
- windowOpen("http://ssodev.kbankwithu.com:7010", "PopupWindow", 1024, 768);
- <%
- } else {
- %>
- windowOpen("https://ssoap.kbankwithu.com/nls3/clientLogin.jsp", "PopupWindow", 1024, 768);
- <%
- }
- %>
- }
$(document).ready(function() {
$("input[name=userId]").keydown(function(event){
@@ -215,18 +203,18 @@
<%=resultMsg %>
+
-<%--