diff --git a/pom.xml b/pom.xml
index be6c718b..0d45b2f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,11 @@
2.8.1
-->
+
+ org.jasypt
+ jasypt-spring3
+ 1.9.2
+
com.googlecode.json-simple
diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java
index 88544eef..b1e36509 100644
--- a/src/main/java/nlib/cmm/web/MainController.java
+++ b/src/main/java/nlib/cmm/web/MainController.java
@@ -11,6 +11,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication;
@@ -133,7 +134,29 @@ public class MainController extends NlibCommonController {
// 메인 화면 배너
List> listBannerInfos = mainService.listBannerInfos(mngOrgCd);
model.addAttribute("listBannerInfos", listBannerInfos);
-
+ StandardPBEStringEncryptor pbeEnc = new StandardPBEStringEncryptor();
+
+
+
+ pbeEnc.setAlgorithm("PBEWithMD5AndDES");
+
+ pbeEnc.setPassword("jasyptPass"); // PBE 값(XML PASSWORD설정)
+
+
+
+ String url = pbeEnc.encrypt("jdbc:oracle:thin:@127.0.0.1:1521:XE");
+
+ String username = pbeEnc.encrypt("system");
+
+ String password = pbeEnc.encrypt("uac_cltr");
+
+
+
+ System.out.println(url);
+
+ System.out.println(username);
+
+ System.out.println(password);
return "nlib/cmm/home";
}
diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties
index 98e0722d..95850de7 100644
--- a/src/main/resources/egovframework/egovProps/globals.properties
+++ b/src/main/resources/egovframework/egovProps/globals.properties
@@ -32,7 +32,7 @@ Globals.DbType = maria
Globals.maria.DriverClassName=org.mariadb.jdbc.Driver
Globals.maria.Url=jdbc:mariadb://210.181.197.70:3306/uac_cltr_db
Globals.maria.UserName = uac_cltr
-Globals.maria.Password = uac_cltr
+Globals.maria.Password = ENC(ZOAYPkDYSoB/UM5h9/nzQoswgHYfhjA/)
# \uad8c\ud55c \uc778\uc99d\ubc29\uc2dd(dummy, session, security) - \uc0ac\uc6a9\uc790\uc758 \ub85c\uadf8\uc778\uc2dc \uc778\uc99d \ubc29\uc2dd\uc744 \uacb0\uc815\ud568
# dummy : \ub354\ubbf8 \ubc29\uc2dd\uc73c\ub85c \uc0ac\uc6a9\uc790 \uad8c\ud55c\uc744 \uc778\uc99d\ud568
@@ -153,5 +153,5 @@ roughMap.appkey = b0fdac4f718d71a02d796f8fe3e12987
#\uba54\uc77c \uacc4\uc815 \uc815\ubcf4
system.notification.email.sender = teachteam02@gmail.com
-system.notification.email.sender.password = djhohubeosfspiek
+system.notification.email.sender.password = ENC(4hXQB6LLZ6nDK/aCkIEPOg9EKQar02JgzRq/qjEVh40=)
system.notification.email.sender.name = \ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c
diff --git a/src/main/resources/egovframework/spring/context-common.xml b/src/main/resources/egovframework/spring/context-common.xml
index cc683c40..c5f305a8 100644
--- a/src/main/resources/egovframework/spring/context-common.xml
+++ b/src/main/resources/egovframework/spring/context-common.xml
@@ -65,6 +65,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ classpath:/egovframework/egovProps/globals.properties
+
+
+
+
diff --git a/src/main/resources/egovframework/spring/context-oauth.xml b/src/main/resources/egovframework/spring/context-oauth.xml
index d9afd73f..2ecf958c 100644
--- a/src/main/resources/egovframework/spring/context-oauth.xml
+++ b/src/main/resources/egovframework/spring/context-oauth.xml
@@ -20,19 +20,35 @@
-->
+
+
+
+
+
+
-
+
-
+
diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties
index b9387452..4eb2e388 100644
--- a/src/main/resources/nlib/nlib.properties
+++ b/src/main/resources/nlib/nlib.properties
@@ -93,7 +93,7 @@ list.paging.page.size = 10
# \uba54\uc778\ud654\uba74 \uae30\ubcf8 \ubc30\ub108
#----------------------------------------
# \uba54\uc778\ud654\uba74 \uae30\ubcf8 \ubc30\ub108 \uc704\uce58
-# \ub85c\uceec LLLLLLLLLLLLLLL
+# \ub85c\uceec \uc11c\ubc84
#main.banner.img.path = C:/iams/workspace/nlib/src/main/webapp/images/bg/bg-mainbanner.jpg
# \uac1c\ubc1c\uc11c\ubc84
main.banner.img.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/images/bg/bg-mainbanner.jpg
@@ -111,7 +111,7 @@ fileupload.max.mbsize = 10
# \ucd5c\ub300 \ud30c\uc77c \uac1c\uc218
fileupload.max.files = 5
# \ud30c\uc77c \uc5c5\ub85c\ub4dc \uac00\ub2a5 \ud655\uc7a5\uc790
-fileupload.acceptable.ext = image/*,.hwp,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt
+fileupload.acceptable.ext = .jpg,.jpe,.jpge,.bmp,.gif,.png,.hwp,.hwpx,.pdf,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt
# \uc784\uc2dc \uc800\uc7a5 \uc704\uce58
@@ -121,8 +121,8 @@ fileupload.temp.subpath = /temp
fileupload.bbs.qna.subpath = /bbs/qna
fileupload.bbs.ancmnt.subpath = /bbs/ancmnt
-# \uba54\uc77c \uacbd\ub85c
-# \ub85c\uceec LLLLLLLLLLLLLLL
+# \uc774\uba54\uc77c \ud15c\ud50c\ub9bf \uacbd\ub85c
+# \ub85c\uceec\uc11c\ubc84
#mailing.sender.membership.signUpTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html
#mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html
#mailing.sender.membership.certTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/cert_mail_template.html
@@ -152,8 +152,7 @@ search.searchIp = 210.181.197.67
search.searchPort = 7800
search.protocol = http
-#search.managerIp = 210.181.197.67
-search.managerIp = search.nculture.org
+search.managerIp = 210.181.197.67
search.managerPort = 7800