diff --git a/pom.xml b/pom.xml index 960f1c59..cd5ce8c8 100644 --- a/pom.xml +++ b/pom.xml @@ -126,12 +126,12 @@ commons-fileupload commons-fileupload 1.3.1 - + @@ -190,18 +190,7 @@ 3.3.0 - - - com.fasterxml.jackson.core - jackson-core - 2.7.3 - - - com.fasterxml.jackson.core - jackson-databind - 2.7.3 - - + org.apache.tiles @@ -218,7 +207,24 @@ tiles-jsp 3.0.8 - + + + + com.fasterxml.jackson.core + jackson-core + 2.11.4 + + + com.fasterxml.jackson.core + jackson-annotations + 2.11.4 + + + com.fasterxml.jackson.core + jackson-databind + 2.11.4 + + diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java index 2f0a2316..2a19a9f9 100644 --- a/src/main/java/nlib/security/SpringSecurityConfig.java +++ b/src/main/java/nlib/security/SpringSecurityConfig.java @@ -50,7 +50,9 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/css/**") .antMatchers("/images/**") .antMatchers("/js/**") + .antMatchers("/temp/**") .antMatchers("/favicon/**") + .antMatchers("/*/*Ajax.do") ; } @@ -59,10 +61,6 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { http.authorizeRequests() .antMatchers("/login/login*.do").permitAll() .antMatchers("/login/logout*.do").permitAll() - .antMatchers("/login/naver*.do").permitAll() - .antMatchers("/member/*.do").permitAll() - .antMatchers("/member/*.ajax").permitAll() - .antMatchers("/userInfo/*.do").permitAll() .antMatchers("/info/inform/*.do").permitAll() .antMatchers("/").permitAll() .antMatchers("/index.jsp").permitAll() diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 6fa5e4c8..dc0fd3be 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -33,7 +33,16 @@ dataapi.temp.xml.path = C:/iams/workspace/nlib/data/dataxml # Aria \uc54c\uace0\ub9ac\uc998 crypto.aria.defaultKey = TheFederationOfKoreaCultureCenter027042322 -# \uba54\uc77c \uc815\ubcf4 -mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/mail/mail_template.html -mailing.sender.membership.email = no-reply@nlib.org -mailing.sender.membership.name = Nlib + +#---------------------------------------- +# \ucca8\ubd80\ud30c\uc77c \uacbd\ub85c \uc815\ubcf4 +#---------------------------------------- +# \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 +fileupload.base.path = C:/iams/workspace/nlib/data/fileupload + +# \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 = /bbs/qna + diff --git a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml b/src/main/webapp/WEB-INF/tiles/tiles-layout.xml index a8f80fe6..d46d8c5c 100644 --- a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml +++ b/src/main/webapp/WEB-INF/tiles/tiles-layout.xml @@ -10,11 +10,7 @@ - - - - - + @@ -26,17 +22,9 @@ + - - - - - - - - -