diff --git a/.classpath b/.classpath
index 36064bc1..a50c6c85 100644
--- a/.classpath
+++ b/.classpath
@@ -12,7 +12,11 @@
-
+
+
+
+
+
diff --git a/src/main/java/com/urpsys/basefront/urpBaseJspApplication.java b/src/main/java/com/urpsys/basefront/urpBaseJspApplication.java
index 197e97b2..57acdef6 100644
--- a/src/main/java/com/urpsys/basefront/urpBaseJspApplication.java
+++ b/src/main/java/com/urpsys/basefront/urpBaseJspApplication.java
@@ -64,6 +64,12 @@ public class urpBaseJspApplication
System.out.println("############# kic_rel Env ######################");
System.out.println("################################################");
}
+ else if(activeProfile.equals("keiti_prod"))
+ {
+ System.out.println("################################################");
+ System.out.println("############# keiti_prod Env ###################");
+ System.out.println("################################################");
+ }
else
{
System.out.println("################################################");
diff --git a/src/main/java/com/urpsys/itmsfront/sys/controller/UserManageController.java b/src/main/java/com/urpsys/itmsfront/sys/controller/UserManageController.java
index 83df6e3a..438a7807 100644
--- a/src/main/java/com/urpsys/itmsfront/sys/controller/UserManageController.java
+++ b/src/main/java/com/urpsys/itmsfront/sys/controller/UserManageController.java
@@ -24,6 +24,7 @@ import org.springframework.web.servlet.ModelAndView;
import org.springmodules.validation.commons.DefaultBeanValidator;
import com.urpsys.basefront.common.service.CommonService;
+import com.urpsys.basefront.common.util.CommonUtil;
import com.urpsys.basefront.common.util.ConvertUtils;
import com.urpsys.basefront.common.util.RestApiCallUtil;
import com.urpsys.basefront.config.EgovMessageSource;
@@ -266,7 +267,7 @@ public class UserManageController
// Return Data Setting Start --------------------------
Map resultMap = (Map)returnMap.get("resultMap");
// Return Data Setting End --------------------------
-
+
UserManageVO userManageVO = ConvertUtils.convertToValueObjectAll(resultMap, UserManageVO.class);
model.addAttribute("userSearchVO", userSearchVO );
@@ -381,6 +382,8 @@ public class UserManageController
String userTyForPassword = (String) commandMap.get("userTyForPassword");
userManageVO.setUserTy(userTyForPassword);
+ log.info("strAdminYn=>"+strAdminYn);
+
model.addAttribute("userManageVO", userManageVO );
model.addAttribute("userSearchVO", userSearchVO );
model.addAttribute("adminYn" , strAdminYn );
@@ -586,11 +589,14 @@ public class UserManageController
String strReturnUrl="";
+ log.info("userManageVO : [{}]", userManageVO.getEmailAdres());
+
+ // /* 2025.08.22 나혁제 일단 체크하지 않음
beanValidator.validate(userManageVO, bindingResult);
if (bindingResult.hasErrors())
{
model.addAttribute("resultMsg", bindingResult.getAllErrors().get(0).getDefaultMessage());
- strReturnUrl = "forward:/sys/EgovUserManage.do";
+ strReturnUrl = "forward:/sys/UserManage.do";
}
else
{
@@ -621,14 +627,53 @@ public class UserManageController
if(strAdminYn.equals("Y"))
{
- return "forward:/sys/UserManage.do";
+ strReturnUrl = "forward:/sys/UserManage.do";
}
else
{
- return "redirect:/sys/UserSelectUpdtView.do?selectedId=";
+ strReturnUrl = "redirect:/sys/UserSelectUpdtView.do?selectedId=";
}
}
+ /*
+ String strReturnUrl="";
+
+ if ("".equals(userManageVO.getOrgnztId()))
+ {
+ userManageVO.setOrgnztId(null);
+ }
+
+ if ("".equals(userManageVO.getGroupId()))
+ {
+ userManageVO.setGroupId(null);
+ }
+
+ // Body Setting Start ---------------------------------
+ bodyMap = ConvertUtils.convertToMapAll(userManageVO);
+ // Body Setting End ---------------------------------
+
+ // RestApi Call Start ---------------------------------
+ returnMap = restApiCallUtil.RestApiCall(bodyMap, "/sys/UserSelectUpdt.do");
+ // RestApi Call End ---------------------------------
+
+ // Return Data Setting Start --------------------------
+ int iResult = (int)returnMap.get("iResult");
+ // Return Data Setting End --------------------------
+
+ //Exception 없이 진행시 수정성공메시지
+ model.addAttribute("resultMsg", "success.common.update");
+
+ if(strAdminYn.equals("Y"))
+ {
+ strReturnUrl = "forward:/sys/UserManage.do";
+ }
+ else
+ {
+ strReturnUrl = "redirect:/sys/UserSelectUpdtView.do?selectedId=";
+ }
+ */
+
+ log.info("strReturnUrl [{}]", strReturnUrl);
log.info("<<<<<<<<<<<<<<< /sys/UserSelectUpdt.do >>>>>>>>>>>>>>>");
return strReturnUrl;
diff --git a/src/main/resources/application-keiti_prod.yml b/src/main/resources/application-keiti_prod.yml
new file mode 100644
index 00000000..fd809d49
--- /dev/null
+++ b/src/main/resources/application-keiti_prod.yml
@@ -0,0 +1,47 @@
+ # Service port
+ server:
+ port: 443
+ servlet:
+ session:
+ timeout: 120m
+ cookie:
+ name: BASEJSP_JSESSIONID
+ ssl:
+ enabled: true #Spring Security를 사용하는 경우 HTTPS 요청만 허용하도록 해주는 설정
+ key-store-type: PKCS12
+ key-store: classpath:sslkey/STAR.keiti.re.kr.jks
+ key-store-password: keiti123
+
+# JSP 설정
+ spring:
+ mvc:
+ view:
+ prefix: /WEB-INF/jsp/
+ suffix: .jsp
+ static-patn-pattern: /static/**
+
+ devtools:
+ livereload:
+ enabled: true
+
+# custom 설정
+ custom:
+ path:
+ phy_svy: /app/itsm_data/svy/
+ loc_svy: /svy/image/
+ file_store: /app/itsm_data/itsm_file_upload
+ auth_server: http://localhost:11000
+ api_server: http://localhost:11010
+# api_search_server: http://109.26.11.21:48381
+ api_search_server: http://192.168.100.76:48381
+ sendmail:
+ id: tW9kMpd3SiAnf3RQBOZapw==
+ password: Tkkj8p2PYfZ+AmpQMPLHF8ksj8vrtJouj6xczU8ShM8=
+ port: 587
+ host: smtp.gmail.com
+ sendEmail: hhjj0701@gmail.com
+ senderName: 나혁제
+ socketFactory-class: javax.net.ssl.SSLSocketFactory
+ supplier: gmail.com
+
+
\ No newline at end of file
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index 9dd49089..d8277ac3 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -6,6 +6,12 @@
timeout: 120m
cookie:
name: BASEJSP_JSESSIONID
+# ssl:
+# enabled: true #Spring Security를 사용하는 경우 HTTPS 요청만 허용하도록 해주는 설정
+# key-store-type: PKCS12
+# key-store: classpath:sslkey/STAR.keiti.re.kr.jks
+# key-store-password: keiti123
+# key-alias: keiti.re.kr
# JSP 설정
spring:
diff --git a/src/main/resources/sslkey/STAR.keiti.re.kr.jks b/src/main/resources/sslkey/STAR.keiti.re.kr.jks
new file mode 100644
index 00000000..41282059
Binary files /dev/null and b/src/main/resources/sslkey/STAR.keiti.re.kr.jks differ
diff --git a/src/main/resources/validator/urp/EgovValidator.xml b/src/main/resources/validator/urp/EgovValidator.xml
index a0e43313..b1f7955a 100644
--- a/src/main/resources/validator/urp/EgovValidator.xml
+++ b/src/main/resources/validator/urp/EgovValidator.xml
@@ -4129,10 +4129,12 @@
-
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/itms/sys/UserPasswordUpdt.jsp b/src/main/webapp/WEB-INF/jsp/itms/sys/UserPasswordUpdt.jsp
index df66e24d..710745af 100644
--- a/src/main/webapp/WEB-INF/jsp/itms/sys/UserPasswordUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/itms/sys/UserPasswordUpdt.jsp
@@ -48,13 +48,26 @@
{
if(validatePasswordChgVO(form))
{
- if(form.newPassword.value != form.newPassword2.value){
+ // 2025.08.23 나혁제 관리자는 이전 비밀번호 없이 변경가능
+ if(form.adminYn.value != "Y" )
+ {
+ if(form.oldPassword.value == "")
+ {
+ alert("이전 비밀번호을 입력해 주시기 바랍니다.");
+ return false;
+ }
+ }
+
+ if(form.newPassword.value != form.newPassword2.value)
+ {
alert("");
return false;
}
document.passwordChgVO.submit();
return true;
- }else{
+ }
+ else
+ {
return false;
}
}
@@ -133,6 +146,7 @@
+
| ${title}* |
@@ -140,6 +154,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/itms/sys/UserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/itms/sys/UserSelectUpdt.jsp
index 9f0fa291..bc8f1ac2 100644
--- a/src/main/webapp/WEB-INF/jsp/itms/sys/UserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/itms/sys/UserSelectUpdt.jsp
@@ -381,7 +381,7 @@
|
-
+
|