소스충돌부분 push

pom.xml

@@ -126,12 +126,12 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.3.1</version>
-            <exclusions>
+<!--             <exclusions>
                 <exclusion>
                     <artifactId>commons-io</artifactId>
                     <groupId>commons-io</groupId>
                 </exclusion>
-            </exclusions>
+            </exclusions> -->
         </dependency>
         
         
@@ -190,18 +190,7 @@
             <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>
             <groupId>org.apache.tiles</groupId>
@@ -218,7 +207,24 @@
             <artifactId>tiles-jsp</artifactId>
             <version>3.0.8</version>
         </dependency>
-
+        
+        <!-- AJAX JSON (DIGITALSHIP KNKIM 2021.07.15)-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.11.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.11.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.11.4</version>
+        </dependency>               
+        
 	</dependencies>
 
 	<build>

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()

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
+# \ucca8\ubd80\ud30c\uc77c \uacbd\ub85c \uc815\ubcf4 
-mailing.sender.membership.name = Nlib
+#----------------------------------------
+# \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
+

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

@@ -10,11 +10,7 @@
         <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" />
     </definition>
@@ -26,17 +22,9 @@
     <definition name="*/*/*" extends="template">
         <put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}/{3}.jsp" />
     </definition>
+    
     <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>