소스 충돌파일 재 커밋

pom.xml

@@ -190,6 +190,17 @@
             <version>3.3.0</version>
         </dependency>
         
+        <!-- ajax (DIGITALSHIP JSYOO 2021.07.12)-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.7.3</version>
+        </dependency>
                 
         <!-- Tiles (DIGITALSHIP KNKIM 2021.07.06)-->
         <dependency>

src/main/java/nlib/security/SpringSecurityConfig.java

@@ -61,6 +61,10 @@ 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()

src/main/resources/nlib/nlib.properties

@@ -46,3 +46,11 @@ 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
 
+# \uba54\uc77c \uacbd\ub85c
+mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/mail/mail_template.html
+
+#\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 = Nlib

src/main/webapp/WEB-INF/tiles/tiles-layout.xml

@@ -10,6 +10,11 @@
         <put-attribute name="menu"      value="/WEB-INF/tiles/inc/menu.jsp" />
         <put-attribute name="footer"    value="/WEB-INF/tiles/inc/footer.jsp" />
     </definition>
+    <definition name="popup"         template="/WEB-INF/tiles/tiles-layout-popup.jsp">
+        <put-attribute name="header"    value="/WEB-INF/tiles/inc-popup/header.jsp" />
+        <put-attribute name="menu"      value="/WEB-INF/tiles/inc-popup/menu.jsp" />
+        <put-attribute name="footer"    value="/WEB-INF/tiles/inc-popup/footer.jsp" />
+    </definition>
     
     <definition name="*" extends="template">
         <put-attribute name="main" value="/WEB-INF/jsp/{1}.jsp" />
@@ -26,5 +31,10 @@
     <definition name="*/*/*/*" extends="template">
         <put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}/{3}/{4}.jsp" />
     </definition>
-
+    <definition name="*/*Popup" extends="popup">
+        <put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}*Popup.jsp" />
+    </definition>
+    <definition name="*/*/*Popup" extends="popup">
+          <put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}/{3}*Popup.jsp" />
+    </definition>
 </tiles-definitions>