diff --git a/src/main/java/nlib/cmm/web/EncryptorConfigTest.java b/src/main/java/nlib/cmm/web/EncryptorConfigTest.java new file mode 100644 index 00000000..c324d500 --- /dev/null +++ b/src/main/java/nlib/cmm/web/EncryptorConfigTest.java @@ -0,0 +1,50 @@ +package nlib.cmm.web; + +import java.util.List; + +import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; + +import nlib.cmm.NlibCommonController; + +/** + * 
+ * @Class Name : EncryptorConfigTest.java
+ * 
+ * @Description : properties 암호화 로그 및 테스트
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 12. 21. KNKIM 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP KNKIM + * @since 2021. 12. 21. + * @version 1.0 + * + */ +@Controller +public class EncryptorConfigTest { + + private static final Logger log = LoggerFactory.getLogger(EncryptorConfigTest.class); + + static void EncryptorTest(String key, List valueList) { + StandardPBEStringEncryptor pbeEnc = new StandardPBEStringEncryptor(); + pbeEnc.setAlgorithm("PBEWithMD5AndDES"); + pbeEnc.setPassword(key); // PBE 값(XML PASSWORD설정) + + for( int i = 0; i< valueList.size();i++) + { + log.debug(valueList.get(i).toString() +" : " + pbeEnc.encrypt(valueList.get(i).toString())); + } + + } +} \ No newline at end of file diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index b1e36509..7629bbaa 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -3,6 +3,7 @@ package nlib.cmm.web; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -11,7 +12,6 @@ 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; @@ -134,29 +134,7 @@ 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 d59115dd..428b71b6 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 = ENC(ZOAYPkDYSoB/UM5h9/nzQoswgHYfhjA/) +Globals.maria.Password = ENC(79UHzZdkigwDg939vEgnjcPYfRYHh88y) # \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 = ENC(4hXQB6LLZ6nDK/aCkIEPOg9EKQar02JgzRq/qjEVh40=) +system.notification.email.sender.password = ENC(AlvwMj7hcqcIZYJiU/RvSABIRl0WmVMzqIPecTeH2Uw=) system.notification.email.sender.name = \ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c diff --git a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml index 42e550c2..1cb817ea 100644 --- a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml @@ -1,61 +1,60 @@ - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/spring/context-common.xml b/src/main/resources/egovframework/spring/context-common.xml index c5f305a8..d27d6b8e 100644 --- a/src/main/resources/egovframework/spring/context-common.xml +++ b/src/main/resources/egovframework/spring/context-common.xml @@ -65,13 +65,14 @@ - + + - + - + diff --git a/src/main/resources/egovframework/spring/context-oauth.xml b/src/main/resources/egovframework/spring/context-oauth.xml index 2ecf958c..0d62d862 100644 --- a/src/main/resources/egovframework/spring/context-oauth.xml +++ b/src/main/resources/egovframework/spring/context-oauth.xml @@ -37,18 +37,18 @@ - - - + - - - + + + + + diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index dd5d4087..0c3100d9 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -1,265 +1,264 @@ -#----------------------------------------------------------------------- -# nlib.properties : \uc628\ub77c\uc778\uc790\ub8cc\ub300\ucd9c\uad00\ub9ac\uc2dc\uc2a4\ud15c -# -# @\ud504\ub85c\uc81d\ud2b8\uba85: \uc9c0\ubc29\ubb38\ud654\uc6d0 \ud1b5\ud569\uc790\ub8cc\uad00\ub9ac\uc2dc\uc2a4\ud15c \uad6c\ucd95\uc0ac\uc5c5 (2021) -#----------------------------------------------------------------------- -# 1. key = value \uad6c\uc870\uc785\ub2c8\ub2e4. -# 2. key\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \ud3ec\ud568\ubd88\uac00, value\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \uac00\ub2a5 -# 3. key\uac12\uc73c\ub85c \ud55c\uae00\uc744 \uc0ac\uc6a9\ubd88\uac00, value\uac12\uc740 \ud55c\uae00\uc0ac\uc6a9\uc774 \uac00\ub2a5 -# 4. \uc904\uc744 \ubc14\uafc0 \ud544\uc694\uac00 \uc788\uc73c\uba74 '\'\ub97c \ub77c\uc778\uc758 \ub05d\uc5d0 \ucd94\uac00(\ub9cc\uc57d '\'\ubb38\uc790\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\ub294 \uacbd\uc6b0\ub294 '\\'\ub97c \uc0ac\uc6a9) -# 5. Windows\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '\\' or '/' ('\' \uc0ac\uc6a9\ud558\uba74 \uc548\ub428) -# 6. Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/' -# 7. \uc8fc\uc11d\ubb38 \ucc98\ub9ac\ub294 #\uc0ac\uc6a9 -# 8. value\uac12 \ub4a4\uc5d0 \uc2a4\ud398\uc774\uc2a4\uac00 \uc874\uc7ac\ud558\ub294 \uacbd\uc6b0 \uc11c\ube14\ub9bf\uc5d0\uc11c \ucc38\uc870\ud560\ub54c\ub294 \uc5d0\ub7ec\ubc1c\uc0dd\ud560 \uc218 \uc788\uc73c\ubbc0\ub85c trim()\ud558\uac70\ub098 \ub9c8\uc9c0\ub9c9 \uacf5\ubc31\uc5c6\uc774 properties \uac12\uc744 \uc124\uc815\ud560\uac83 -#----------------------------------------------------------------------- - -# \uba54\uc778\ud648\ud398\uc774\uc9c0 URI -home.uri = /index.do - -# \ub9c8\uc774\ud398\uc774\uc9c0 URI -mypage.uri = /index.do - -# \ub85c\uceec\ud638\uc2a4\ud2b8 \uc801\uc6a9 \ud638\uc2a4\ud2b8\uba85 -domain.host.localhost = nlib-dev - -#---------------------------------------- -# \ub85c\uadf8\uc778/\ud68c\uc6d0\uac00\uc785\uad00\ub828 URL \uc815\ubcf4 -#---------------------------------------- -member.new.url = /login/memberSnsForm.do - -# \ub85c\uadf8\uc778 \ub610\ub294 \uad8c\ud55c\uc5c6\ub294 \uacbd\uc6b0, \ub85c\uadf8\uc778\uc73c\ub85c \uc804\ud658\ucc98\ub9ac\ub418\uc5b4 \uc811\uc18d\ub418\ub294 \ucd5c\ucd08 \uc8fc\uc18c -login.url = /login/loginForm.do - -# \ub85c\uadf8\uc778 \ubb38\uc81c \ubc1c\uc0dd \uc2dc, \ub2e4\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 \uc8fc\uc18c -login.back.url = /login/loginGuide.do - -# \ud734\uba74\uacc4\uc88c \ud574\uc9c0\uc548\ub0b4 \uc8fc\uc18c -login.dormant.url = /login/activateDormantAccForm.do - -# \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 \ub85c\uadf8\uc778\ud654\uba74 URL \uc815\ubcf4 -nculture.login.redirect.uri = /login/loginForm.do - -# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ub85c\uadf8\uc778\uc6a9 -nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do - -# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ud68c\uc6d0\uac00\uc785\uc6a9 -nculture.login.post.member.redirect.uri = /member/selectMemberJoiningInfo.do - -# \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 \ud68c\uc6d0\uac00\uc785\ud654\uba74 URL \uc815\ubcf4 -nculture.member.redirect.uri = /login/memberSnsForm.do - -#---------------------------------------- -# NLIB \uc9c0\ubc29\ubb38\ud654\uc6d0\uc815\ubcf4 -#---------------------------------------- -# \uacf5\ud1b5 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc815\ubcf4 \ucf54\ub4dc -nlib.council.cd = KCCF -nlib.council.nm = \uc9c0\ubc29\ubb38\ud654\uc6d0 - -# \uac1c\ubc1c\uc11c\ubc84 -nlib.council.dns.host = nlib-dev -# \uc6b4\uc601\uc11c\ubc84 -#nlib.council.dns.host = nlib - - - -#---------------------------------------- -# DataAPI \uc811\uc18d\uc815\ubcf4 -#---------------------------------------- -# \uac1c\ubc1c\uc11c\ubc84 -dataapi.server.ip = 210.181.197.70 -dataapi.server.port = 8080 -dataapi.server.protocol = http - -# \uc6b4\uc601\uc11c\ubc84 -#dataapi.server.ip = 210.181.197.70 -#dataapi.server.port = 8088 -#dataapi.server.protocol = http - -# Aria \uc54c\uace0\ub9ac\uc998 -crypto.aria.defaultKey = gdyYs/IZqY86VcWhT8emCYfqY1ahw2vtLG+/FzNqtrQ= - -#---------------------------------------- -# \ubaa9\ub85d \ud398\uc774\uc9d5 -#---------------------------------------- -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\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 -# \uc6b4\ub3d9\uc11c\ubc84 -#main.banner.img.path = /kccf/nlibhome/images/bg/bg-mainbanner.jpg - -#---------------------------------------- -# Q&A \ucca8\ubd80\ud30c\uc77c \uc5c5\ub85c\ub4dc \uad00\ub828 -#---------------------------------------- - -# \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 - -# \ub85c\uceecPC -#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload -# \uac1c\ubc1c\uc11c\ubc84 -fileupload.base.path = /nfs_nas_dev/uac/nlib -# \uc6b4\uc601\uc11c\ubc84 -#fileupload.base.path = /nfs_nas/uac/nlib - -# \ucd5c\ub300 \ud30c\uc77c \ud06c\uae30 (MB) -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 = .jpg,.jpe,.jpge,.bmp,.gif,.png,.hwp,.hwpx,.pdf,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt - - -# \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 -fileupload.temp.subpath = /temp - -# \ubb3b\uace0\ub2f5\ud558\uae30 \uac8c\uc2dc\ud310 \uc11c\ube0c\uc704\uce58 : \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 \uc774\ud558\uc758 \uc704\uce58 \uc815\ubcf4\ub97c \uc124\uc815 -fileupload.bbs.qna.subpath = /qna - -#---------------------------------------- -# \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 - -# \uac1c\ubc1c\uc11c\ubc84 -mailing.sender.membership.signUpTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/signUp_mail_template.html -mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html -mailing.sender.membership.certTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html - -# \uc6b4\uc601\uc11c\ubc84 -#mailing.sender.membership.signUpTemplate = /kccf/webapps/nlibhome/WEB-INF/template/mail/signUp_mail_template.html -#mailing.sender.membership.pwdTemplate = /kccf/webapps/nlibhome/WEB-INF/template/mail/pwd_mail_template.html -#mailing.sender.membership.certTemplate = /kccf/webapps/nlibhome/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html - -#\uba54\uc77c \uc774\ubbf8\uc9c0 \uacbd\ub85c\uc6a9 \ub3c4\uba54\uc778 URL -# \ub85c\uceec\uc11c\ubc84 -host.name = https://nlib-dev.nculture.org -# \uac1c\ubc1c\uc11c\ubc84 -#host.name = https://nlib-dev.nculture.org -# \uc6b4\uc601\uc11c\ubc84 -#host.name = https://nlib.nculture.org - -#\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c -mailing.sender.membership.email = no-reply@nlib.org - -#\uba54\uc77c \ubcf4\ub0b4\ub294\uc0ac\ub78c \uc774\ub984 -mailing.sender.membership.name = [\ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c] - -#SMS \ubcf4\ub0b4\ub294\uc0ac\ub78c \ubc88\ud638 -sms.sender.phone.number = 027042322 -#---------------------------------------- -# \uac80\uc0c9\uc5d4\uc9c4 -#---------------------------------------- -# \uac1c\ubc1c\uc11c\ubc84 -search.searchIp = 210.181.197.67 -search.searchPort = 7800 -search.protocol = http -search.managerIp = 210.181.197.67 -search.managerPort = 7800 - -# \uc6b4\uc601\uc11c\ubc84 -#search.searchIp = 210.181.197.67 -#search.searchPort = 7800 -#search.protocol = http -#search.managerIp = 210.181.197.67 -#search.managerPort = 7800 - - -#---------------------------------------- -# SNS SSO \ucc98\ub9ac URL \uc815\ubcf4 (\ud074\ub77c\uc774\uc5b8\ud2b8 \uc124\uc815\uc815\ubcf4 : context-oauth.xml \ucc38\uc870) -#---------------------------------------- -# \ub124\uc774\ubc84 -oauth2.client.provider.naver.name = NAVER -oauth2.client.provider.naver.authorization-uri = https://nid.naver.com/oauth2.0/authorize -oauth2.client.provider.naver.token-uri = https://nid.naver.com/oauth2.0/token?grant_type=authorization_code -oauth2.client.provider.naver.user-info-uri = https://openapi.naver.com/v1/nid/me -oauth2.client.provider.naver.user-name-attribute = response - -# \uad6c\uae00 -oauth2.client.provider.google.name = GOOGLE -oauth2.client.provider.google.user-info-uri = https://openidconnect.googleapis.com/v1/userinfo - -# \uce74\uce74\uc624 -oauth2.client.provider.kakao.name = KAKAO -oauth2.client.provider.kakao.authorization-uri = https://kauth.kakao.com/oauth/authorize -oauth2.client.provider.kakao.token-uri = https://kauth.kakao.com/oauth/token?client_id= -oauth2.client.provider.kakao.user-info-uri = https://kapi.kakao.com/v2/user/me - -#---------------------------------------- -# \uc190\ub2d8\uc815\ubcf4 -#---------------------------------------- -guest.userid = GUEST - -#---------------------------------------- -# \uc0ac\uc6a9\uc790\uad8c\ud55c\uba85 -#---------------------------------------- -# \uc77c\ubc18\uc0ac\uc6a9\uc790 -auth.role.user = ROLE_USER -# \uad00\ub9ac\uc790 -auth.role.admin = ROLE_ADMIN -# \uc2dc\uc2a4\ud15c\uad00\ub9ac\uc790 -auth.role.system = ROLE_SYSTEM - - -#---------------------------------------- -# \uce74\ud2b8 \uad00\ub828 -#---------------------------------------- -# \ubbf8\ub85c\uadf8\uc778 \uc0ac\uc6a9\uc790\uc758 \uce74\ud2b8\uc815\ubcf4\uac00 \uc800\uc7a5\ub418\ub294 \ucfe0\ud0a4 \uc124\uc815 \ub3c4\uba54\uc778 -cart.cookie.domain = nculture.org -# \ubbf8\ub85c\uadf8\uc778 \uc0ac\uc6a9\uc790\uc758 \uce74\ud2b8\uc815\ubcf4\uac00 \uc800\uc7a5\ub418\ub294 \ucfe0\ud0a4\uba85 -cart.cookie.name = _NLIB_CART_COOKIE -cart.cookie.path = / - - -#---------------------------------------- -# \uc378\ub124\uc77c \uae30\ubcf8 \uc774\ubbf8\uc9c0 (\uc378\ub124\uc77c \uc5c6\uc74c) -#---------------------------------------- -thumbnail.image.url.small = /images/thumbnail/noimage-s.jpg -thumbnail.image.url.middle = /images/thumbnail/noimage-m.jpg -thumbnail.image.url.big = /images/thumbnail/noimage-b.jpg - -# \uac1c\ubc1c\uc11c\ubc84 -thumbnail.image.url.prefix = https://iams-dev.nculture.org/uac -# \uc6b4\uc601\uc11c\ubc84 -#thumbnail.image.url.prefix = https://iams.nculture.org/uac - - -#---------------------------------------- -# \ub2e8\ucd95URL -#---------------------------------------- -# \uac1c\ubc1c -shorturl.api = https://local-dev.nculture.org/yourls-api.php?signature=d48a5ab90c -# \uc6b4\uc601 -#shorturl.api = https://local.nculture.org/yourls-api.php?signature=6882eb3237 - - -#---------------------------------------- -# \uc6d0\ubb38\ubcf4\uae30 -#---------------------------------------- -# \uc6d0\ubb38\ubcf4\uae30 (PDF) -# \uac1c\ubc1c\uc11c\ubc84 -pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N -# \uc6b4\uc601\uc11c\ubc84 -#pdf.url = https://port.nculture.org/npdfView.do?npdf=N - -# \uc6d0\ubb38\ubcf4\uae30 (IMAGE) -# \uac1c\ubc1c\uc11c\ubc84 -image.url = https://port-dev.nculture.org/nImageView.do?nImage=N -# \uc6b4\uc601\uc11c\ubc84 -#image.url = https://port.nculture.org/nImageView.do?nImage=N - -# \uc6d0\ubb38\ubcf4\uae30 (VIDEO) -# \uac1c\ubc1c\uc11c\ubc84 -video.url = https://port-dev.nculture.org/cmm/nvodView.do?nvod=N -# \uc6b4\uc601\uc11c\ubc84 -#video.url = https://port.nculture.org/cmm/nvodView.do?nvod=N - +#----------------------------------------------------------------------- +# nlib.properties : \uc628\ub77c\uc778\uc790\ub8cc\ub300\ucd9c\uad00\ub9ac\uc2dc\uc2a4\ud15c +# +# @\ud504\ub85c\uc81d\ud2b8\uba85: \uc9c0\ubc29\ubb38\ud654\uc6d0 \ud1b5\ud569\uc790\ub8cc\uad00\ub9ac\uc2dc\uc2a4\ud15c \uad6c\ucd95\uc0ac\uc5c5 (2021) +#----------------------------------------------------------------------- +# 1. key = value \uad6c\uc870\uc785\ub2c8\ub2e4. +# 2. key\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \ud3ec\ud568\ubd88\uac00, value\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \uac00\ub2a5 +# 3. key\uac12\uc73c\ub85c \ud55c\uae00\uc744 \uc0ac\uc6a9\ubd88\uac00, value\uac12\uc740 \ud55c\uae00\uc0ac\uc6a9\uc774 \uac00\ub2a5 +# 4. \uc904\uc744 \ubc14\uafc0 \ud544\uc694\uac00 \uc788\uc73c\uba74 '\'\ub97c \ub77c\uc778\uc758 \ub05d\uc5d0 \ucd94\uac00(\ub9cc\uc57d '\'\ubb38\uc790\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\ub294 \uacbd\uc6b0\ub294 '\\'\ub97c \uc0ac\uc6a9) +# 5. Windows\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '\\' or '/' ('\' \uc0ac\uc6a9\ud558\uba74 \uc548\ub428) +# 6. Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/' +# 7. \uc8fc\uc11d\ubb38 \ucc98\ub9ac\ub294 #\uc0ac\uc6a9 +# 8. value\uac12 \ub4a4\uc5d0 \uc2a4\ud398\uc774\uc2a4\uac00 \uc874\uc7ac\ud558\ub294 \uacbd\uc6b0 \uc11c\ube14\ub9bf\uc5d0\uc11c \ucc38\uc870\ud560\ub54c\ub294 \uc5d0\ub7ec\ubc1c\uc0dd\ud560 \uc218 \uc788\uc73c\ubbc0\ub85c trim()\ud558\uac70\ub098 \ub9c8\uc9c0\ub9c9 \uacf5\ubc31\uc5c6\uc774 properties \uac12\uc744 \uc124\uc815\ud560\uac83 +#----------------------------------------------------------------------- + +# \uba54\uc778\ud648\ud398\uc774\uc9c0 URI +home.uri = /index.do + +# \ub9c8\uc774\ud398\uc774\uc9c0 URI +mypage.uri = /index.do + +# \ub85c\uceec\ud638\uc2a4\ud2b8 \uc801\uc6a9 \ud638\uc2a4\ud2b8\uba85 +domain.host.localhost = nlib-dev + +#---------------------------------------- +# \ub85c\uadf8\uc778/\ud68c\uc6d0\uac00\uc785\uad00\ub828 URL \uc815\ubcf4 +#---------------------------------------- +member.new.url = /login/memberSnsForm.do + +# \ub85c\uadf8\uc778 \ub610\ub294 \uad8c\ud55c\uc5c6\ub294 \uacbd\uc6b0, \ub85c\uadf8\uc778\uc73c\ub85c \uc804\ud658\ucc98\ub9ac\ub418\uc5b4 \uc811\uc18d\ub418\ub294 \ucd5c\ucd08 \uc8fc\uc18c +login.url = /login/loginForm.do + +# \ub85c\uadf8\uc778 \ubb38\uc81c \ubc1c\uc0dd \uc2dc, \ub2e4\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 \uc8fc\uc18c +login.back.url = /login/loginGuide.do + +# \ud734\uba74\uacc4\uc88c \ud574\uc9c0\uc548\ub0b4 \uc8fc\uc18c +login.dormant.url = /login/activateDormantAccForm.do + +# \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 \ub85c\uadf8\uc778\ud654\uba74 URL \uc815\ubcf4 +nculture.login.redirect.uri = /login/loginForm.do + +# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ub85c\uadf8\uc778\uc6a9 +nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do + +# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ud68c\uc6d0\uac00\uc785\uc6a9 +nculture.login.post.member.redirect.uri = /member/selectMemberJoiningInfo.do + +# \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 \ud68c\uc6d0\uac00\uc785\ud654\uba74 URL \uc815\ubcf4 +nculture.member.redirect.uri = /login/memberSnsForm.do + +#---------------------------------------- +# NLIB \uc9c0\ubc29\ubb38\ud654\uc6d0\uc815\ubcf4 +#---------------------------------------- +# \uacf5\ud1b5 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc815\ubcf4 \ucf54\ub4dc +nlib.council.cd = KCCF +nlib.council.nm = \uc9c0\ubc29\ubb38\ud654\uc6d0 + +# \uac1c\ubc1c\uc11c\ubc84 +nlib.council.dns.host = nlib-dev +# \uc6b4\uc601\uc11c\ubc84 +#nlib.council.dns.host = nlib + + + +#---------------------------------------- +# DataAPI \uc811\uc18d\uc815\ubcf4 +#---------------------------------------- +# \uac1c\ubc1c\uc11c\ubc84 +dataapi.server.ip = 210.181.197.70 +dataapi.server.port = 8080 +dataapi.server.protocol = http + +# \uc6b4\uc601\uc11c\ubc84 +#dataapi.server.ip = 210.181.197.70 +#dataapi.server.port = 8088 +#dataapi.server.protocol = http + +# Aria \uc54c\uace0\ub9ac\uc998 +crypto.aria.defaultKey = gdyYs/IZqY86VcWhT8emCYfqY1ahw2vtLG+/FzNqtrQ= + +#---------------------------------------- +# \ubaa9\ub85d \ud398\uc774\uc9d5 +#---------------------------------------- +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\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 +# \uc6b4\ub3d9\uc11c\ubc84 +#main.banner.img.path = /kccf/nlibhome/images/bg/bg-mainbanner.jpg + +#---------------------------------------- +# Q&A \ucca8\ubd80\ud30c\uc77c \uc5c5\ub85c\ub4dc \uad00\ub828 +#---------------------------------------- + +# \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 + +# \ub85c\uceecPC +#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload +# \uac1c\ubc1c\uc11c\ubc84 +fileupload.base.path = /nfs_nas_dev/uac/nlib +# \uc6b4\uc601\uc11c\ubc84 +#fileupload.base.path = /nfs_nas/uac/nlib + +# \ucd5c\ub300 \ud30c\uc77c \ud06c\uae30 (MB) +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 = .jpg,.jpe,.jpge,.bmp,.gif,.png,.hwp,.hwpx,.pdf,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt + + +# \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 +fileupload.temp.subpath = /temp + +# \ubb3b\uace0\ub2f5\ud558\uae30 \uac8c\uc2dc\ud310 \uc11c\ube0c\uc704\uce58 : \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 \uc774\ud558\uc758 \uc704\uce58 \uc815\ubcf4\ub97c \uc124\uc815 +fileupload.bbs.qna.subpath = /qna + +#---------------------------------------- +# \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 + +# \uac1c\ubc1c\uc11c\ubc84 +mailing.sender.membership.signUpTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/signUp_mail_template.html +mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html +mailing.sender.membership.certTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html + +# \uc6b4\uc601\uc11c\ubc84 +#mailing.sender.membership.signUpTemplate = /kccf/webapps/nlibhome/WEB-INF/template/mail/signUp_mail_template.html +#mailing.sender.membership.pwdTemplate = /kccf/webapps/nlibhome/WEB-INF/template/mail/pwd_mail_template.html +#mailing.sender.membership.certTemplate = /kccf/webapps/nlibhome/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html + +#\uba54\uc77c \uc774\ubbf8\uc9c0 \uacbd\ub85c\uc6a9 \ub3c4\uba54\uc778 URL +# \ub85c\uceec\uc11c\ubc84 +host.name = https://nlib-dev.nculture.org +# \uac1c\ubc1c\uc11c\ubc84 +#host.name = https://nlib-dev.nculture.org +# \uc6b4\uc601\uc11c\ubc84 +#host.name = https://nlib.nculture.org + +#\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c +mailing.sender.membership.email = no-reply@nlib.org + +#\uba54\uc77c \ubcf4\ub0b4\ub294\uc0ac\ub78c \uc774\ub984 +mailing.sender.membership.name = [\ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c] + +#SMS \ubcf4\ub0b4\ub294\uc0ac\ub78c \ubc88\ud638 +sms.sender.phone.number = 027042322 +#---------------------------------------- +# \uac80\uc0c9\uc5d4\uc9c4 +#---------------------------------------- +# \uac1c\ubc1c\uc11c\ubc84 +search.searchIp = 210.181.197.67 +search.searchPort = 7800 +search.protocol = http +search.managerIp = 210.181.197.67 +search.managerPort = 7800 + +# \uc6b4\uc601\uc11c\ubc84 +#search.searchIp = 210.181.197.67 +#search.searchPort = 7800 +#search.protocol = http +#search.managerIp = 210.181.197.67 +#search.managerPort = 7800 + + +#---------------------------------------- +# SNS SSO \ucc98\ub9ac URL \uc815\ubcf4 (\ud074\ub77c\uc774\uc5b8\ud2b8 \uc124\uc815\uc815\ubcf4 : context-oauth.xml \ucc38\uc870) +#---------------------------------------- +# \ub124\uc774\ubc84 +oauth2.client.provider.naver.name = NAVER +oauth2.client.provider.naver.authorization-uri = https://nid.naver.com/oauth2.0/authorize +oauth2.client.provider.naver.token-uri = https://nid.naver.com/oauth2.0/token?grant_type=authorization_code +oauth2.client.provider.naver.user-info-uri = https://openapi.naver.com/v1/nid/me +oauth2.client.provider.naver.user-name-attribute = response + +# \uad6c\uae00 +oauth2.client.provider.google.name = GOOGLE +oauth2.client.provider.google.user-info-uri = https://openidconnect.googleapis.com/v1/userinfo + +# \uce74\uce74\uc624 +oauth2.client.provider.kakao.name = KAKAO +oauth2.client.provider.kakao.authorization-uri = https://kauth.kakao.com/oauth/authorize +oauth2.client.provider.kakao.token-uri = https://kauth.kakao.com/oauth/token?client_id= +oauth2.client.provider.kakao.user-info-uri = https://kapi.kakao.com/v2/user/me + +#---------------------------------------- +# \uc190\ub2d8\uc815\ubcf4 +#---------------------------------------- +guest.userid = GUEST + +#---------------------------------------- +# \uc0ac\uc6a9\uc790\uad8c\ud55c\uba85 +#---------------------------------------- +# \uc77c\ubc18\uc0ac\uc6a9\uc790 +auth.role.user = ROLE_USER +# \uad00\ub9ac\uc790 +auth.role.admin = ROLE_ADMIN +# \uc2dc\uc2a4\ud15c\uad00\ub9ac\uc790 +auth.role.system = ROLE_SYSTEM + + +#---------------------------------------- +# \uce74\ud2b8 \uad00\ub828 +#---------------------------------------- +# \ubbf8\ub85c\uadf8\uc778 \uc0ac\uc6a9\uc790\uc758 \uce74\ud2b8\uc815\ubcf4\uac00 \uc800\uc7a5\ub418\ub294 \ucfe0\ud0a4 \uc124\uc815 \ub3c4\uba54\uc778 +cart.cookie.domain = nculture.org +# \ubbf8\ub85c\uadf8\uc778 \uc0ac\uc6a9\uc790\uc758 \uce74\ud2b8\uc815\ubcf4\uac00 \uc800\uc7a5\ub418\ub294 \ucfe0\ud0a4\uba85 +cart.cookie.name = _NLIB_CART_COOKIE +cart.cookie.path = / + + +#---------------------------------------- +# \uc378\ub124\uc77c \uae30\ubcf8 \uc774\ubbf8\uc9c0 (\uc378\ub124\uc77c \uc5c6\uc74c) +#---------------------------------------- +thumbnail.image.url.small = /images/thumbnail/noimage-s.jpg +thumbnail.image.url.middle = /images/thumbnail/noimage-m.jpg +thumbnail.image.url.big = /images/thumbnail/noimage-b.jpg + +# \uac1c\ubc1c\uc11c\ubc84 +thumbnail.image.url.prefix = https://iams-dev.nculture.org/uac +# \uc6b4\uc601\uc11c\ubc84 +#thumbnail.image.url.prefix = https://iams.nculture.org/uac + + +#---------------------------------------- +# \ub2e8\ucd95URL +#---------------------------------------- +# \uac1c\ubc1c +shorturl.api = https://local-dev.nculture.org/yourls-api.php?signature=d48a5ab90c +# \uc6b4\uc601 +#shorturl.api = https://local.nculture.org/yourls-api.php?signature=6882eb3237 + + +#---------------------------------------- +# \uc6d0\ubb38\ubcf4\uae30 +#---------------------------------------- +# \uc6d0\ubb38\ubcf4\uae30 (PDF) +# \uac1c\ubc1c\uc11c\ubc84 +pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N +# \uc6b4\uc601\uc11c\ubc84 +#pdf.url = https://port.nculture.org/npdfView.do?npdf=N + +# \uc6d0\ubb38\ubcf4\uae30 (IMAGE) +# \uac1c\ubc1c\uc11c\ubc84 +image.url = https://port-dev.nculture.org/nImageView.do?nImage=N +# \uc6b4\uc601\uc11c\ubc84 +#image.url = https://port.nculture.org/nImageView.do?nImage=N + +# \uc6d0\ubb38\ubcf4\uae30 (VIDEO) +# \uac1c\ubc1c\uc11c\ubc84 +video.url = https://port-dev.nculture.org/cmm/nvodView.do?nvod=N +# \uc6b4\uc601\uc11c\ubc84 +#video.url = https://port.nculture.org/cmm/nvodView.do?nvod=N diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index fe4ea689..d64782e8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -584,7 +584,7 @@ $(function(){ autoplay : false, pagination: { el: '.pagination .swiper-pagination', - /*type: 'fraction',*/ + type: 'fraction', }, breakpoints: { 768: { @@ -592,7 +592,7 @@ $(function(){ spaceBetween : 20, }, 1400: { - slidesPerView : 2, + slidesPerView : 4, spaceBetween : 30, }, 4989: { diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index e1497be5..6dcc98c7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -391,7 +391,7 @@ function fn_search_article(pageIndex) {
- 에 대한 검색결과는 총 + '' 에 대한 검색결과는 총 건 입니다. diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp index c0ffbe3f..14ebb300 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp @@ -127,14 +127,14 @@ function fn_search(reqStatusDivCd) { div.append($('
').attr('class', 'n-data').html("" + obj.title + "")); div.append($('
').attr('class', 'n-subscription').html('' + gfn_formatDateStr(obj.reqDd,"-") + '')); /* 신청일자 */ div.append($('
').attr('class', 'n-visit').html( - '' + gfn_formatDateStr(obj.hopeReqPridDtmFrom,"-") + - (!gfn_isEmpty(obj.hopeReqPridDtmFrom) && !gfn_isEmpty(obj.hopeReqPridDtmTo) ? " ~ " : "" ) + - gfn_formatDateStr(obj.hopeReqPridDtmTo,"") + '' + '' + '' + gfn_formatDateStr(obj.hopeReqPridDtmFrom,"-") + + (!gfn_isEmpty(obj.hopeReqPridDtmFrom) && !gfn_isEmpty(obj.hopeReqPridDtmTo) ? " ~ " : "" ) + '' + + '' + gfn_formatDateStr(obj.hopeReqPridDtmTo,"") + '' + '' )); /* 희망열람기간 */ div.append($('
').attr('class', 'n-return').html( - '' + gfn_formatTimeStr(obj.reqPsblDtmFrom,"-") + - (!gfn_isEmpty(obj.reqPsblDtmFrom) && !gfn_isEmpty(obj.reqPsblDtmTo) ? " ~ " : "" ) + - gfn_formatTimeStr(obj.reqPsblDtmTo, "") + '' + '' + '' + gfn_formatTimeStr(obj.reqPsblDtmFrom,"-") + + (!gfn_isEmpty(obj.reqPsblDtmFrom) && !gfn_isEmpty(obj.reqPsblDtmTo) ? " ~ " : "" ) + '' + + '' + gfn_formatTimeStr(obj.reqPsblDtmTo, "") + '' + '' )); /* 방문예정일자 */ var statusHtml1 = ""; diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index ddb1ab95..beffd901 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -155,7 +155,7 @@ section {clear:both;text-align: center;} section h3 {font-size:36px;font-weight: 500;margin-bottom: 5px;} section h3 span {color:#376795;} section .inner p.desc {font-size: 18px;color:#666;margin-bottom:40px;} -.contents {width:1400px;margin:0 auto;padding-bottom:140px;min-height:600px;} +.contents {width:1400px;margin:0 auto;padding-bottom:140px;min-height:400px;} /********** 메인섹션1 **********/ @@ -326,7 +326,7 @@ transition: all 0.2s ease-in-out; .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover ul li {line-height:23px;font-weight:100;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover ul li em {font-weight:500;border-right:1px solid #ccc;height:10px;line-height: 10px;display:inline-block;margin-right:5px;padding-right:5px;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box {position: absolute;bottom:30px;width:88%;text-align: center;margin:0;} -.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .view {float:left;width:63%;margin-right:2%} +.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .view {float:left;width:58%;margin-right:2%} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .RIS {float:left;width:35%;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .view a {background: #376795;color:#fff;display: block;border-radius: 3px;padding:8px 0px;font-size: 14px;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .RIS a {background: #666;color:#fff;display: block;border-radius: 3px;padding:8px 0px;font-size: 14px;} @@ -783,7 +783,8 @@ transform: rotate(45deg);} .cart .inner .visit-confirm .tabs_item .list-cart-wrap.confirm .list-cart div.list > div.t-date {width:18%;} /********** 소장자료 **********/ -.data .inner .row-bottom {position: relative;} +.data .inner .row-bottom {position: relative;padding-bottom:0;} +.data .inner .row-bottom .btn-box {margin-top:0;} .article-side {float: left;width:320px;margin-right:40px;} .culture-box {float: left;width:1040px;} .filter-wrap {border:1px solid #ddd;text-align: left;padding:30px;} @@ -911,9 +912,10 @@ transform: rotate(45deg);} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text1 {margin-bottom:5px;font-size:18px;color:#666;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 {margin-bottom:30px;font-size:24px;color:#333;font-weight: 500;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 span {color:#d47b1c;} -.data .inner .data-box .culture-box .tab > .title {height:36px;margin:30px 0px 0px;outline:0px solid red;} -.data .inner .data-box .culture-box .tab .title .count {float:left;font-size:16px;height:36px;line-height:36px;} +.data .inner .data-box .culture-box .tab > .title {height:36px;margin:30px 0px 0px;outline:0px solid red;text-align:left;} +.data .inner .data-box .culture-box .tab .title .count {display:inline-block;font-size:16px;height:auto;line-height:26px;text-align:left;} .data .inner .data-box .culture-box .tab .title .count em {color:#d47b1c;font-weight: 500;} +.data .inner .data-box .culture-box .tab .title .count strong {word-break: break-all;display: inline;padding-bottom:10px;} .data .inner .data-box .culture-box .tab .title .list-search-wrap {float:right;} .data .inner .data-box .culture-box .tab .title .list-search-wrap > div {float:left;font-size:12px;margin-left:10px;height:36px;line-height:36px;} .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.re-search {} @@ -1368,6 +1370,8 @@ transform: rotate(45deg);} .visit-data .inner .tabs_item .list-wrap .list-data div.list > div span.no-poss {color:#666;} .visit-data .inner .tabs_item .list-wrap .list-data .list.t-tit-line {background:#556676;border-bottom:0;padding:0;height:55px;line-height:55px;} .visit-data .inner .tabs_item .list-wrap .list-data .list.t-tit-line > div {color:#fff;line-height: 55px !important;padding:0 !important;font-size: 12px;} +.visit-data .inner .tabs_item .list-wrap .list-data div.list > div .date .date-start, +.visit-data .inner .tabs_item .list-wrap .list-data div.list > div .date .date-end {display:block;} /* 알림페이지 아코디언 목록 */ @@ -1809,8 +1813,8 @@ transform: rotate(45deg); /* 알림 팝업 */ -.pop-notice {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} -.pop-notice .inner {display:inline-block;width:100%;height: calc(100% - 220px);overflow:auto;padding:50px 0px;background: #fff;} +.pop-notice {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 400px;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-notice .inner {display:inline-block;width:100%;height: calc(100% - 156px);overflow:auto;padding:50px 0px;background: #fff;} .pop-notice .inner .row {padding:0px 60px 0px;text-align:center;} .pop-notice .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;} .pop-notice .Title h3 {font-size:24px;line-height:30px;margin-top:15px;color:#fff;font-weight: 300;} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index faac3e63..bc4cd51b 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -152,7 +152,7 @@ footer .family_site {right:10px;} .data.detail .inner .row-top .center {width:100%;} .data.detail .inner .row-bottom .con-4 .top h3 {width:100%;} .data.detail .inner .row-bottom .con-4 .top h3::before {content: '';width:100%;} -.data.detail .inner .row-bottom .DetailSwiper2 {max-width:auto;} +.data.detail .inner .row-bottom .DetailSwiper2 {max-width:auto;padding:1% 10% 4%;width:80%;} .data.detail .inner .row-top .center .right .con-2 .de-data ul li {width:100%;} .faq .inner .tab {position: relative;width:100%;margin:0 auto;} .article-side {width:22%;margin-right:2%;} @@ -251,7 +251,7 @@ footer .family_site {right:10px;} .wrap .nav-wrap #primary-nav {display:none !important;opacity:0 !important;} .data.detail .inner .row-top .center .title-box .tit-info {width:70%;} -.sec5 .popularSwiper .pagination {visibility:visible !important;} +.sec5 .popularSwiper .pagination {visibility: hidden;} /* .sec6 .swiper-button-next, .swiper-rtl .swiper-button-prev {visibility:visible !important;} .sec6 .swiper-button-prev, .swiper-rtl .swiper-button-next {visibility:visible !important;} @@ -686,12 +686,12 @@ footer .family_site {right:10px;} .data .inner .tabs li:first-child a { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } .data .inner .tabs li:last-child a { border-right: 1px solid #ddd; border-top-right-radius: 3px; border-bottom-right-radius: 3px; } .data .inner .data-box .culture-box .tab > .title { display: flex; flex-direction: column-reverse; height: auto; padding-right: 16px; } - .data .inner .data-box .culture-box .tab .title .count { display: flex; font-size: 14px; } + .data .inner .data-box .culture-box .tab .title .count { display: inline-block;font-size: 14px;flex-wrap: wrap;height: auto;line-height: 24px;margin-bottom: 10px; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.re-search { margin-left: 0; width: 100%; text-align: left; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-select, .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-select select { margin-left: 0; width: 100%; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input { margin-left: 0; width: 100%; box-sizing: border-box; margin: 10px 0 26px; display: flex; padding: 0 0 0 36px; } - .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input { width: 100%; height: 100%; } + .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input { width: 100%; height: 100%;padding-right:15%; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button[type="submit"] { background: url("/images/icon/icon-search-mo.png") no-repeat center; right: auto; left: 0; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button.filter-btn {display:inline-block;position: absolute;left: auto;right: 10px;top: 4px;width: 43px;height: 26px;background:#e6e7e9;color:#666;border-radius:50px;text-indent:0;} @@ -725,8 +725,10 @@ footer .family_site {right:10px;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 { margin-bottom: 16px; font-size: 18px; } .paging { width: 100%; display: flex; justify-content: center; } .paging li { margin: 0 !important; padding: 0 !important; min-width: auto; width: 24px !important; background-position: center !important; } - .paging .btn-prev a, - .paging .btn-next a { display: none; } + .paging .btn-prev, + .paging .btn-next { text-align:center; } + .paging .btn-prev a, + .paging .btn-next a { text-indent:-9999999px; } .paging li a { font-size: 14px; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button.btn_filter { position: absolute; top: 3px; right: 10px; background: #e6e7e9; width: 43px; height: 28px; border-radius: 30px; font-weight: 500; font-size: 12px; line-height: 18px; color: #666666; text-indent: 0; } @@ -1125,7 +1127,8 @@ footer .family_site {right:10px;} .visit-data .inner .tabs_item .list-wrap .list-data div.list > div.n-visit .date::before { content: "희망방문일: "; } .visit-data .inner .tabs_item .list-wrap .list-data div.list > div.n-return .date::before { content: "방문예정일: "; } .visit-data .inner .tabs li {width:30%;} - +.visit-data .inner .tabs_item .list-wrap .list-data div.list > div .date .date-start, +.visit-data .inner .tabs_item .list-wrap .list-data div.list > div .date .date-end {display:inline;} /* 대출관리 */ .loan-data .inner .tabs_item .list-wrap .list-data div.list > div.n-cultural { margin-top: 10px; } @@ -1191,11 +1194,12 @@ footer .family_site {right:10px;} .pop-advanced-search .depth1-check input[type="checkbox"] + label { visibility: hidden; } .pop-advanced-search .tab-name { font-size: 12px; } .pop-advanced-search .conditions-wrap .line { display: flex; flex-wrap: wrap; } - .pop-advanced-search .conditions-wrap .depth1 { width: 33.3%; } + .pop-advanced-search .conditions-wrap .depth1 { width: 33.2%; } .pop-advanced-search .conditions-wrap .depth1 .check { position: relative; } .pop-advanced-search .conditions-wrap .depth1:first-child { border-left: 1px solid #ddd; } - .pop-advanced-search .conditions-wrap .depth1:last-child { border-right: 1px solid #ddd; } - .pop-advanced-search .conditions-wrap.conditions-datype .depth1:last-child { width: 33.5%; } + .pop-advanced-search .conditions-wrap .depth1:last-child { border-right: 0px solid #ddd; } + .pop-advanced-search .conditions-wrap .depth1:nth-of-type(3n+3) {border-right:1px solid #ddd;} + .pop-advanced-search .conditions-wrap.conditions-datype .depth1:last-child { } .pop-advanced-search .conditions-wrap .depth1 .depth2 { top: 50px; height: auto; border-left: 1px solid #ddd; padding: 20px 10px; } .pop-advanced-search .conditions-wrap .depth1 .depth2 li { width: auto; margin-right: 6px; } .conditions-wrap .selected-conditions {min-height:40px;} @@ -1215,7 +1219,7 @@ footer .family_site {right:10px;} .conditions-wrap .selected-conditions .conditions li button {text-align:left;} /* 알림 팝업 */ - .pop-notice { width: 343px; height: 549px; left: calc(50% - 171.5px); } + .pop-notice { width: 343px; height: 440px; left: calc(50% - 171.5px); } .pop-notice .Title p { display: none; } .pop-notice .Title h3 { font-size: 22px; line-height: 33px; } .pop-notice .inner .Text p { font-size: 16px; line-height: 24px; }