From 6089b957bdd34b8f20a09b3b948d5ab4c9977eba Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Wed, 21 Jul 2021 09:42:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=B6=A9=EB=8F=8C?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9E=AC=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 209 +++++++++---------
 .../nlib/security/SpringSecurityConfig.java   |   4 +
 src/main/resources/nlib/nlib.properties       |   8 +
 .../webapp/WEB-INF/tiles/tiles-layout.xml     |  12 +-
 4 files changed, 133 insertions(+), 100 deletions(-)

diff --git a/pom.xml b/pom.xml
index 70814dc0..c1eace59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,114 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>nlib</groupId>
-	<artifactId>nlib</artifactId>
-	<packaging>war</packaging>
-	<version>1.0.0</version>
-	<name>nlib</name>
-	<url>http://www.egovframe.go.kr</url>
+    <artifactId>nlib</artifactId>
+    <packaging>war</packaging>
+    <version>1.0.0</version>
+    <name>nlib</name>
+    <url>http://www.egovframe.go.kr</url>
 
-	<licenses>
+    <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
     
-	<properties>
-	    <spring.maven.artifact.version>4.3.16.RELEASE</spring.maven.artifact.version>
-		<egovframework.rte.version>3.8.0</egovframework.rte.version>
-		<spring-security.version>4.2.5.RELEASE</spring-security.version>
-	</properties>
+    <properties>
+        <spring.maven.artifact.version>4.3.16.RELEASE</spring.maven.artifact.version>
+        <egovframework.rte.version>3.8.0</egovframework.rte.version>
+        <spring-security.version>4.2.5.RELEASE</spring-security.version>
+    </properties>
 
-	<repositories>
-		<repository>
-			<id>mvn2</id>
-			<url>http://repo1.maven.org/maven2/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>egovframe</id>
-			<url>http://www.egovframe.go.kr/maven/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>egovframe2</id>
-			<url>http://maven.egovframe.kr:8080/maven/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>mvn2</id>
+            <url>http://repo1.maven.org/maven2/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>egovframe</id>
+            <url>http://www.egovframe.go.kr/maven/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>egovframe2</id>
+            <url>http://maven.egovframe.kr:8080/maven/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<dependencies>
-		<!-- 표준프레임워크 실행환경 -->
+    <dependencies>
+        <!-- 표준프레임워크 실행환경 -->
         <dependency>
-		    <groupId>egovframework.rte</groupId>
-		    <artifactId>egovframework.rte.ptl.mvc</artifactId>
-		    <version>${egovframework.rte.version}</version>
-		    <exclusions>
-		    	<exclusion>
-		    		<artifactId>commons-logging</artifactId>
-		    		<groupId>commons-logging</groupId>
-		    	</exclusion>
-		    </exclusions>
+            <groupId>egovframework.rte</groupId>
+            <artifactId>egovframework.rte.ptl.mvc</artifactId>
+            <version>${egovframework.rte.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-		    <groupId>egovframework.rte</groupId>
-		    <artifactId>egovframework.rte.psl.dataaccess</artifactId>
-		    <version>${egovframework.rte.version}</version>
+            <groupId>egovframework.rte</groupId>
+            <artifactId>egovframework.rte.psl.dataaccess</artifactId>
+            <version>${egovframework.rte.version}</version>
         </dependency>
         <dependency>
-			<groupId>egovframework.rte</groupId>
-			<artifactId>egovframework.rte.fdl.idgnr</artifactId>
-			<version>${egovframework.rte.version}</version>
-		</dependency>
-       	<dependency>
-			<groupId>egovframework.rte</groupId>
-			<artifactId>egovframework.rte.fdl.property</artifactId>
-			<version>${egovframework.rte.version}</version>
-		</dependency>
-
+            <groupId>egovframework.rte</groupId>
+            <artifactId>egovframework.rte.fdl.idgnr</artifactId>
+            <version>${egovframework.rte.version}</version>
+        </dependency>
         <dependency>
-		    <groupId>javax.servlet</groupId>
-		    <artifactId>servlet-api</artifactId>
-		    <scope>provided</scope>
-		    <version>2.5</version>
+            <groupId>egovframework.rte</groupId>
+            <artifactId>egovframework.rte.fdl.property</artifactId>
+            <version>${egovframework.rte.version}</version>
         </dependency>
 
         <dependency>
-		    <groupId>javax.servlet</groupId>
-		    <artifactId>jstl</artifactId>
-		    <version>1.2</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
 
         <dependency>
-		    <groupId>taglibs</groupId>
-		    <artifactId>standard</artifactId>
-		    <version>1.1.2</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
         </dependency>
 
-		<dependency>
-	        <groupId>org.antlr</groupId>
-	        <artifactId>antlr</artifactId>
-	        <version>3.5</version>
-   		</dependency>
-   		
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>3.5</version>
+        </dependency>
+        
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -120,7 +120,7 @@
             <artifactId>egovframework.rte.fdl.crypto</artifactId>
             <version>${egovframework.rte.version}</version>
         </dependency>
-   		
+        
         <!-- fileupload -->
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -190,7 +190,18 @@
             <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>
@@ -225,26 +236,26 @@
             <version>2.11.4</version>
         </dependency>               
         
-	</dependencies>
+    </dependencies>
 
-	<build>
+    <build>
         <defaultGoal>install</defaultGoal>
         <directory>${basedir}/target</directory>
         <finalName>${artifactId}-${version}</finalName>
         <pluginManagement>
             <plugins>
                 <plugin>
-	                <groupId>org.apache.tomcat.maven</groupId>
-	                <artifactId>tomcat7-maven-plugin</artifactId>
-	                <version>2.2</version>
-	                <configuration>
-	                    <port>80</port>
-	                    <path>/</path>
-	                    <systemProperties>
-	                        <JAVA_OPTS>-Xms256m -Xmx768m -XX:MaxPermSize=256m</JAVA_OPTS>
-	                    </systemProperties>
-	                </configuration>
-	            </plugin>
+                    <groupId>org.apache.tomcat.maven</groupId>
+                    <artifactId>tomcat7-maven-plugin</artifactId>
+                    <version>2.2</version>
+                    <configuration>
+                        <port>80</port>
+                        <path>/</path>
+                        <systemProperties>
+                            <JAVA_OPTS>-Xms256m -Xmx768m -XX:MaxPermSize=256m</JAVA_OPTS>
+                        </systemProperties>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java
index d787ae43..16fc90b2 100644
--- a/src/main/java/nlib/security/SpringSecurityConfig.java
+++ b/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()
diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties
index 59789f0b..a4cdce3c 100644
--- a/src/main/resources/nlib/nlib.properties
+++ b/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
diff --git a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml b/src/main/webapp/WEB-INF/tiles/tiles-layout.xml
index 26dd24b0..f47231ad 100644
--- a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml
+++ b/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>