Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/workspaces/eapim-bundle/bundles/251111/eapim-admin_incremental_2025-08-01.bundle into jenkins_with_weblogic
This commit is contained in:
Rinjae
@@ -1,41 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Context>
|
||||
|
||||
<!-- maxTotal: Maximum number of database connections in pool. Make sure you
|
||||
configure your mysqld max_connections large enough to handle
|
||||
all of your db connections. Set to -1 for no limit.
|
||||
-->
|
||||
|
||||
<!-- maxIdle: Maximum number of idle database connections to retain in pool.
|
||||
Set to -1 for no limit. See also the DBCP documentation on this
|
||||
and the minEvictableIdleTimeMillis configuration parameter.
|
||||
-->
|
||||
|
||||
<!-- maxWaitMillis: Maximum time to wait for a database connection to become available
|
||||
in ms, in this example 10 seconds. An Exception is thrown if
|
||||
this timeout is exceeded. Set to -1 to wait indefinitely.
|
||||
-->
|
||||
|
||||
<!-- username and password: MySQL username and password for database connections -->
|
||||
|
||||
<!-- driverClassName: Class name for the old mm.mysql JDBC driver is
|
||||
org.gjt.mm.mysql.Driver - we recommend using Connector/J though.
|
||||
Class name for the official MySQL Connector/J driver is com.mysql.jdbc.Driver.
|
||||
-->
|
||||
|
||||
<!-- url: The JDBC connection url for connecting to your MySQL database.
|
||||
-->
|
||||
|
||||
<Resource name="jdbc/dsOBP_AGW" auth="Container" type="javax.sql.DataSource"
|
||||
maxTotal="10" maxIdle="10" maxWaitMillis="10000"
|
||||
username="AGWAPP" password="AGWAPP123!" driverClassName="oracle.jdbc.OracleDriver"
|
||||
url="jdbc:oracle:thin:@192.168.240.177:1599:DAPM"/>
|
||||
<Resource name="jdbc/dsOBP_BAP" auth="Container" type="javax.sql.DataSource"
|
||||
maxTotal="10" maxIdle="10" maxWaitMillis="10000"
|
||||
username="BAPAPP" password="BAPAPP123!" driverClassName="oracle.jdbc.OracleDriver"
|
||||
url="jdbc:oracle:thin:@192.168.240.177:1599:DAPM"/>
|
||||
<Resource name="jdbc/dsOBP_EMS" auth="Container" type="javax.sql.DataSource"
|
||||
maxTotal="10" maxIdle="10" maxWaitMillis="10000"
|
||||
username="EMSAPP" password="EMSAPP123!" driverClassName="oracle.jdbc.OracleDriver"
|
||||
url="jdbc:oracle:thin:@192.168.240.177:1599:DAPM"/>
|
||||
</Context>
|
||||
@@ -14,5 +14,5 @@ eai.tableowner=EMSADM
|
||||
# P/T/D/S
|
||||
eai.systemmode=P
|
||||
eai.drmode=N
|
||||
# black / blue / green / orange / yellow
|
||||
theme.color=blue
|
||||
# black / blue / green / orange / yellow
|
||||
theme.color=blue
|
||||
|
||||
@@ -51,6 +51,11 @@
|
||||
<filter-name>encodingFilter</filter-name>
|
||||
<url-pattern>*.file</url-pattern>
|
||||
</filter-mapping>
|
||||
<!-- Tomcat 에서는 필요. Weblogic 에서는 불필요함 -->
|
||||
<filter-mapping>
|
||||
<filter-name>encodingFilter</filter-name>
|
||||
<url-pattern>*.json</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
<!--
|
||||
<filter>
|
||||
@@ -68,19 +73,6 @@
|
||||
org.springframework.web.context.ContextLoaderListener
|
||||
</listener-class>
|
||||
</listener>
|
||||
|
||||
<!-- Weblogic 14.1.2 서블릿 설정 -->
|
||||
<!--
|
||||
<servlet>
|
||||
<servlet-name>default</servlet-name>
|
||||
<servlet-class>weblogic.servlet.FileServlet</servlet-class>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>default</servlet-name>
|
||||
<url-pattern>/static/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
-->
|
||||
|
||||
<servlet>
|
||||
<servlet-name>springapp</servlet-name>
|
||||
<servlet-class>
|
||||
|
||||
@@ -6,5 +6,4 @@ while (names.hasMoreElements()) {
|
||||
out.println(name + ": " + request.getHeader(name));
|
||||
}
|
||||
%>
|
||||
|
||||
request.getScheme(): <%=request.getScheme()%>
|
||||
@@ -92,7 +92,8 @@
|
||||
'<%= localeMessage.getString("portalUser.roleName") %>',
|
||||
'<%= localeMessage.getString("portalUser.userStatus") %>',
|
||||
'<%= localeMessage.getString("portalUser.createOn") %>',
|
||||
'<%= localeMessage.getString("portalUser.approvalStatus") %>'
|
||||
'<%= localeMessage.getString("portalUser.approvalStatus") %>',
|
||||
'<%= localeMessage.getString("portalUser.accountLockYn") %>'
|
||||
],
|
||||
colModel: [
|
||||
{name: 'rowNum', align: 'center', width: '30', sortable: false},
|
||||
@@ -104,7 +105,8 @@
|
||||
{name: 'roleCodeDescription', align: 'center', width: "80"},
|
||||
{name: 'userStatusDescription', align: 'center', width: "50"},
|
||||
{name: 'createdDate', align: 'center', width: "100", formatter: timeStampFormat},
|
||||
{name: 'approvalStatusDescription', align: 'center', width: "50"}
|
||||
{name: 'approvalStatusDescription', align: 'center', width: "50"},
|
||||
{name: 'accountLockYn', align: 'center', width: "50"}
|
||||
],
|
||||
jsonReader: {
|
||||
repeatitems: false
|
||||
|
||||
@@ -184,6 +184,9 @@
|
||||
} else {
|
||||
$('#orgInfoSection').hide();
|
||||
}
|
||||
|
||||
$("select[name=accountLockYn]").val(data.accountLockYn);
|
||||
|
||||
|
||||
// 25.09.23 - 마스킹 해제 상태를 기본으로 적용 / Rinjae
|
||||
updateButtonStates($("#userStatus").val(), true);
|
||||
@@ -633,6 +636,19 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><%= getRequiredLabel(localeMessage.getString("portalUser.accountLockYn")) %></th>
|
||||
<td>
|
||||
<div class="select-style">
|
||||
<select name="accountLockYn" id="accountLockYn">
|
||||
<option value="Y">Y</option>
|
||||
<option value="N">N</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th></th>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user