somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/main/java/nlib/col/web/RentController.java
	src/main/java/nlib/mail/EmailSender.java
	src/main/resources/egovframework/spring/context-mail.xml
This commit is contained in:
KNKIM 2021-09-15 16:58:56 +09:00
commit cbd381200e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/egovframework/egovProps/globals.properties
View File

@ -149,4 +149,9 @@ ldap.username = uid=admin,ou=system
ldap.password = secret ldap.password = secret
#\uc57d\ub3c4\uad00\ub9ac Kakao \uac1c\ubc1c\uc790 appkey \ubc1c\uae09 \ubc1b\uc544 \ub4f1\ub85d\ud574\uc11c \uae30\uc785 (\uce74\uce74\uc624\uac1c\ubc1c Dev \uc571\uad00\ub9ac \ub0b4\uc5d0\uc11c \ub3c4\uba54\uc778 \ub4f1\ub85d \ud544\uc694) #\uc57d\ub3c4\uad00\ub9ac Kakao \uac1c\ubc1c\uc790 appkey \ubc1c\uae09 \ubc1b\uc544 \ub4f1\ub85d\ud574\uc11c \uae30\uc785 (\uce74\uce74\uc624\uac1c\ubc1c Dev \uc571\uad00\ub9ac \ub0b4\uc5d0\uc11c \ub3c4\uba54\uc778 \ub4f1\ub85d \ud544\uc694)
roughMap.appkey = b0fdac4f718d71a02d796f8fe3e12987 roughMap.appkey = b0fdac4f718d71a02d796f8fe3e12987
#\uba54\uc77c \uacc4\uc815 \uc815\ubcf4
system.notification.email.sender = teachteam02@gmail.com
system.notification.email.sender.password = wltlrtkdjq11$$
system.notification.email.sender.name = \ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c