한국환경산업기술원 설치작업
This commit is contained in:
parent
23825b2d76
commit
b056973000
@ -12,7 +12,11 @@
|
||||
<attribute name="gradle_used_by_scope" value="main,test"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16/"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/openJDK16">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
|
||||
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
|
||||
<attributes>
|
||||
|
||||
@ -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("################################################");
|
||||
|
||||
@ -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;
|
||||
@ -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;
|
||||
|
||||
47
src/main/resources/application-keiti_prod.yml
Normal file
47
src/main/resources/application-keiti_prod.yml
Normal file
@ -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
|
||||
|
||||
|
||||
@ -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:
|
||||
|
||||
BIN
src/main/resources/sslkey/STAR.keiti.re.kr.jks
Normal file
BIN
src/main/resources/sslkey/STAR.keiti.re.kr.jks
Normal file
Binary file not shown.
@ -4129,10 +4129,12 @@
|
||||
<field property="newPassword" depends="required, password1, pwdCheckSeries, pwdCheckRepeat, pwdCheckComb3">
|
||||
<arg0 key="비밀번호" resource="true"/>
|
||||
</field>
|
||||
|
||||
<!-- 2025.08.23 나혁제 이전비밀번호는 화면에서 체크 -->
|
||||
<!--
|
||||
<field property="oldPassword" depends="required">
|
||||
<arg0 key="이전비밀번호" resource="true"/>
|
||||
</field>
|
||||
-->
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
@ -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("<spring:message code="fail.user.passwordUpdate2" />");
|
||||
return false;
|
||||
}
|
||||
document.passwordChgVO.submit();
|
||||
return true;
|
||||
}else{
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -133,6 +146,7 @@
|
||||
</tr>
|
||||
|
||||
<!-- 기존 비밀번호 -->
|
||||
<c:if test="${adminYn ne 'Y' }">
|
||||
<c:set var="title"><spring:message code="comUssUmt.userManagePasswordUpdt.oldPass" /></c:set>
|
||||
<tr>
|
||||
<th>${title}<span class="pilsu">*</span></th>
|
||||
@ -140,6 +154,7 @@
|
||||
<input name="oldPassword" id="oldPassword" type="password" size="20" value="" maxlength="100" >
|
||||
</td>
|
||||
</tr>
|
||||
</c:if>
|
||||
<!-- 비밀번호 -->
|
||||
<c:set var="title"><spring:message code="comUssUmt.userManagePasswordUpdt.pass" /></c:set>
|
||||
<tr>
|
||||
|
||||
@ -381,7 +381,7 @@
|
||||
<td class="left">
|
||||
<form:input path="emailAdres" id="mberEmailAdres" title="${title} ${inputTxt}" cssClass="txaIpUmt" size="30" maxlength="50" />
|
||||
<div><form:errors path="emailAdres" cssClass="error" /></div>
|
||||
<form:hidden id="hidEmail" path="emailAdres" />
|
||||
<hidden id="hidEmail" name="hidEmail" value="${userManageVO.emailAdres}" />
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user