Commit @909a5ea37585c55c802ba64f6334431c2034b12c

이호영 2025-04-15

Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git

@909a5ea37585c55c802ba64f6334431c2034b12c

bdad04f

909a5ea

src/main/resources/egovframework/egovProps/globals_local.properties

--- src/main/resources/egovframework/egovProps/globals_local.properties

+++ src/main/resources/egovframework/egovProps/globals_local.properties


 
 # mysql
 Globals.DriverClassName=com.mysql.jdbc.Driver
-Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
+#Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
 Globals.UserName= mjonUr
 Globals.Password= mjon!@#$
 #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon

bdad04f

909a5ea

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp


 
 <script>
 $(document).ready(function (){
-	
-
-    $(document).on('click', '#id_text', function () {
-	    actionLogin_temp();
-	});
 
 	$(document).on('click', '#secuLoginFlag', function () {
 

 	});		
 }
 
-
-function actionLogin_temp(){
-	location.href='/web/user/login/login.do'
-	
-}
 
 function actionLogin() {
 // 	location.href="<c:url value='/web/user/login/login.do'/>";

 			    <input type="hidden" id="ip" name="ip" value="${userIp}">
 			    <input type="hidden" id="passFlag" name="passFlag">
 			    <input type="hidden" id="headerLoginResult" name="headerLoginResult">
+			    <input type="hidden" id="hp" name="hp" value="">
+			    <input type="hidden" id="num" name="num" value="">
 			    
         		<div id="login" class="login">
 		            <div class="inner">

 		                        <input type="text" placeholder="아이디를 입력해주세요"id="id_text" name="id_text" class="id_text" maxlength="20" size="18">
 		                        <label for="password_text" class="label"></label>
 <!-- 		                        <input type="password" placeholder="비밀번호를 입력해주세요"   id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin(); return false;}" onclick="actionLogin();"> -->
-		                        <input type="password" placeholder="비밀번호를 입력해주세요"   id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin_temp(); return false;}">
+		                        <input type="password" placeholder="비밀번호를 입력해주세요"   id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin(); return false;}">
 		                        <label for="login_button" class="label"></label>
-		                        <button type="button" id="login_button" class="btnType btnType1" class="login_button" onclick="actionLogin_temp();">로그인</button>
+		                        <button type="button" id="login_button" class="btnType btnType1" class="login_button" onclick="actionLogin();">로그인</button>
 		                    </div>
 		                    <div class="login_save">
 		                        <input type="checkbox" id="save_id" name="checkId">

Add a comment

Open 0
Closed 0

List

...	...	@@ -40,11 +40,6 @@
40	40
41	41	<script>
42	42	$(document).ready(function (){
43		-
44		-
45		- $(document).on('click', '#id_text', function () {
46		- actionLogin_temp();
47		- });
48	43
49	44	$(document).on('click', '#secuLoginFlag', function () {
50	45
...	...	@@ -344,11 +339,6 @@
344	339	});
345	340	}
346	341
347		-
348		-function actionLogin_temp(){
349		- location.href='/web/user/login/login.do'
350		-
351		-}
352	342
353	343	function actionLogin() {
354	344	// location.href="<c:url value='/web/user/login/login.do'/>";
...	...	@@ -1709,6 +1699,8 @@
1709	1699	<input type="hidden" id="ip" name="ip" value="${userIp}">
1710	1700	<input type="hidden" id="passFlag" name="passFlag">
1711	1701	<input type="hidden" id="headerLoginResult" name="headerLoginResult">
	1702	+ <input type="hidden" id="hp" name="hp" value="">
	1703	+ <input type="hidden" id="num" name="num" value="">
1712	1704
1713	1705	<div id="login" class="login">
1714	1706	<div class="inner">
...	...	@@ -1719,9 +1711,9 @@
1719	1711	<input type="text" placeholder="아이디를 입력해주세요"id="id_text" name="id_text" class="id_text" maxlength="20" size="18">
1720	1712	<label for="password_text" class="label"></label>
1721	1713	<!-- <input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin(); return false;}" onclick="actionLogin();"> -->
1722		- <input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin_temp(); return false;}">
	1714	+ <input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text" maxlength="30"size="18" onkeypress="if(event.keyCode==13) {actionLogin(); return false;}">
1723	1715	<label for="login_button" class="label"></label>
1724		- <button type="button" id="login_button" class="btnType btnType1" class="login_button" onclick="actionLogin_temp();">로그인</button>
	1716	+ <button type="button" id="login_button" class="btnType btnType1" class="login_button" onclick="actionLogin();">로그인</button>
1725	1717	</div>
1726	1718	<div class="login_save">
1727	1719	<input type="checkbox" id="save_id" name="checkId">

...	...	@@ -28,7 +28,8 @@
28	28
29	29	# mysql
30	30	Globals.DriverClassName=com.mysql.jdbc.Driver
31		-Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
	31	+#Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
	32	+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
32	33	Globals.UserName= mjonUr
33	34	Globals.Password= mjon!@#$
34	35	#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon

Delete comment