gagaframework.core에서 gagaframework.security 모듈 분리

style24.admin/pom.xml

@@ -52,9 +52,16 @@
 		<dependency>
 			<groupId>com.gagaframework</groupId>
 			<artifactId>gagaframework-web-core</artifactId>
-			<version>1.7-RELEASE</version>
+			<version>1.7.1-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-core-1.7.1-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-security</artifactId>
+			<version>1.7.1-RELEASE</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-core-1.7-RELEASE.jar</systemPath>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-security-1.7.1-RELEASE.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>com.gagaframework</groupId>

style24.admin/src/main/java/com/style24/admin/biz/web/TsaSystemController.java

@@ -30,8 +30,8 @@ import com.style24.persistence.domain.UserMenu;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.core.security.GagaPasswordEncoder;
 import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.security.GagaPasswordEncoder;
 
 /**
  * 운영관리 Controller

style24.admin/src/main/java/com/style24/admin/support/security/TsaAuthenticationProvider.java

@@ -18,7 +18,7 @@ import com.style24.persistence.domain.User;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.core.security.GagaPasswordEncoder;
+import com.gagaframework.web.security.GagaPasswordEncoder;
 import com.gagaframework.web.util.GagaCryptoUtil;
 
 /**

style24.admin/src/main/resources/config/application.yml

@@ -1,64 +1,64 @@
-spring:
-    messages:
-        cache-duration: -1
-        basename: classpath:i18n/messages/message
-        encoding: UTF-8
-    thymeleaf:
-        check-template-location: true
-        prefix: /WEB-INF/views/
-        suffix: .html
-    servlet:
-        multipart:
-            max-file-size: 30MB
-            max-request-size: 30MB
-
-server.error.whitelabel.enabled: false
-
-# 사방넷 API
-sabangnet:
-    wivis:
-        admin.id: hohomomo00
-        auth.key: TMYP5CEPHyuEx7K4xFPTAXPZd65NT88MyV
-    flyingtiger:
-        admin.id: js5353
-        auth.key: 36XBSHE2KW4MPBr3ZuT5FRF34MK9NK4uP
-
-# Instagram
-instagram:
-    api.url: https://api.instagram.com/v1
-    api.method: https://graph.instagram.com/[userId]/media?fields=id,media_type,media_url,permalink,thumbnail_url,username,caption,timestamp
-    token.url: https://graph.instagram.com/refresh_access_token?grant_type=ig_refresh_token
-
-# 네이버 API
-naver:
-    clientId: OMmbCMu7ac7GgYWgjlhv
-    clientSecret: jwRNdDbEBG
-    shortUrl: https://openapi.naver.com/v1/util/shorturl
-
-# SPEEDY Image Upload
-speedy:
-    ftp:
-        host: fileupload.cdn.cloudn.co.kr
-        port: 21
-        username: speedy_image-wivismall
-        pwd: wZ31jS_!@
-        
-#카카오 API        
-kakao:
-  appId : 399207
-  appName : WIVISMALL
-  companyName : 위비스
-  restApiKey: 8f8db3657b60b2c83df79a37d38becd4           
-  nativeAppKey : a4790e2102950309d87ad81a39c0597d
-  javascriptKey : f435c12d89ddb9cc6337f4cf0a05fd30
-  adminKey : 567e9476b15d2149c714aaecd0fee740
-  addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
-  
-# CJ대한통운
-cj:
-    logistic:
-        custid: 30321070
-    call:
-        tel1: 02
-        tel2: 1544
-        tel3: 4097
+spring:
+    messages:
+        cache-duration: -1
+        basename: classpath:i18n/messages/message
+        encoding: UTF-8
+    thymeleaf:
+        check-template-location: true
+        prefix: /WEB-INF/views/
+        suffix: .html
+    servlet:
+        multipart:
+            max-file-size: 30MB
+            max-request-size: 30MB
+
+server.error.whitelabel.enabled: false
+
+# 사방넷 API
+sabangnet:
+    wivis:
+        admin.id: hohomomo00
+        auth.key: TMYP5CEPHyuEx7K4xFPTAXPZd65NT88MyV
+    flyingtiger:
+        admin.id: js5353
+        auth.key: 36XBSHE2KW4MPBr3ZuT5FRF34MK9NK4uP
+
+# Instagram
+instagram:
+    api.url: https://api.instagram.com/v1
+    api.method: https://graph.instagram.com/[userId]/media?fields=id,media_type,media_url,permalink,thumbnail_url,username,caption,timestamp
+    token.url: https://graph.instagram.com/refresh_access_token?grant_type=ig_refresh_token
+
+# 네이버 API
+naver:
+    clientId: OMmbCMu7ac7GgYWgjlhv
+    clientSecret: jwRNdDbEBG
+    shortUrl: https://openapi.naver.com/v1/util/shorturl
+
+# SPEEDY Image Upload
+speedy:
+    ftp:
+        host: fileupload.cdn.cloudn.co.kr
+        port: 21
+        username: speedy_image-wivismall
+        pwd: wZ31jS_!@
+        
+#카카오 API        
+kakao:
+  appId : 399207
+  appName : WIVISMALL
+  companyName : 위비스
+  restApiKey: 8f8db3657b60b2c83df79a37d38becd4           
+  nativeAppKey : a4790e2102950309d87ad81a39c0597d
+  javascriptKey : f435c12d89ddb9cc6337f4cf0a05fd30
+  adminKey : 567e9476b15d2149c714aaecd0fee740
+  addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+  
+# CJ대한통운
+cj:
+    logistic:
+        custid: 30321070
+    call:
+        tel1: 02
+        tel2: 1544
+        tel3: 4097

style24.core/pom.xml

@@ -1,47 +1,54 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.style24</groupId>
-		<artifactId>root</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>com.style24.core</groupId>
-	<artifactId>style24.core</artifactId>
-	<packaging>jar</packaging>
-	<name>style24.core</name>
-	<description>STYLE24 Core</description>
-	
-	<dependencies>
-		<!-- /// WEB-INF lib -->
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-core</artifactId>
-			<version>1.7-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/lib/gagaframework-web-core-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-parameter</artifactId>
-			<version>1.7-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/lib/gagaframework-web-parameter-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-rest</artifactId>
-			<version>1.7.1-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/lib/gagaframework-web-rest-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-util</artifactId>
-			<version>1.7-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/lib/gagaframework-web-util-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<!-- \\\ WEB-INF lib -->
-	</dependencies>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.style24</groupId>
+		<artifactId>root</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>com.style24.core</groupId>
+	<artifactId>style24.core</artifactId>
+	<packaging>jar</packaging>
+	<name>style24.core</name>
+	<description>STYLE24 Core</description>
+	
+	<dependencies>
+		<!-- /// WEB-INF lib -->
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-core</artifactId>
+			<version>1.7.1-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/gagaframework-web-core-1.7.1-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-security</artifactId>
+			<version>1.7.1-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/gagaframework-web-security-1.7.1-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-parameter</artifactId>
+			<version>1.7-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/gagaframework-web-parameter-1.7-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-rest</artifactId>
+			<version>1.7.1-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/gagaframework-web-rest-1.7-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-util</artifactId>
+			<version>1.7-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/gagaframework-web-util-1.7-RELEASE.jar</systemPath>
+		</dependency>
+		<!-- \\\ WEB-INF lib -->
+	</dependencies>
 </project>

style24.core/src/main/java/com/style24/core/support/session/TscSession.java

@@ -5,7 +5,7 @@ import javax.servlet.http.HttpSession;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.core.security.GagaSession;
+import com.gagaframework.web.security.GagaSession;
 
 /**
  * Session

style24.scm/pom.xml

@@ -1,84 +1,91 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.style24</groupId>
-		<artifactId>root</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>com.style24.scm</groupId>
-	<artifactId>style24.scm</artifactId>
-	<packaging>war</packaging>
-	<name>style24.scm</name>
-	<description>STYLE24 SCM</description>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>nz.net.ultraq.thymeleaf</groupId>
-			<artifactId>thymeleaf-layout-dialect</artifactId>
-		</dependency>
-		
-		<!-- /// WEB-INF lib -->
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-core</artifactId>
-			<version>1.7-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-core-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-parameter</artifactId>
-			<version>1.7-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-parameter-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-rest</artifactId>
-			<version>1.7.1-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-rest-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.gagaframework</groupId>
-			<artifactId>gagaframework-web-util</artifactId>
-			<version>1.7-RELEASE</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-util-1.7-RELEASE.jar</systemPath>
-		</dependency>
-		<!-- \\\ WEB-INF lib -->
-	</dependencies>
-	
-	<build>
-		<finalName>${project.name}</finalName>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.xml</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.style24</groupId>
+		<artifactId>root</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>com.style24.scm</groupId>
+	<artifactId>style24.scm</artifactId>
+	<packaging>war</packaging>
+	<name>style24.scm</name>
+	<description>STYLE24 SCM</description>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>nz.net.ultraq.thymeleaf</groupId>
+			<artifactId>thymeleaf-layout-dialect</artifactId>
+		</dependency>
+		
+		<!-- /// WEB-INF lib -->
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-core</artifactId>
+			<version>1.7.1-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-core-1.7.1-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-security</artifactId>
+			<version>1.7.1-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-security-1.7.1-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-parameter</artifactId>
+			<version>1.7-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-parameter-1.7-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-rest</artifactId>
+			<version>1.7.1-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-rest-1.7-RELEASE.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.gagaframework</groupId>
+			<artifactId>gagaframework-web-util</artifactId>
+			<version>1.7-RELEASE</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/gagaframework-web-util-1.7-RELEASE.jar</systemPath>
+		</dependency>
+		<!-- \\\ WEB-INF lib -->
+	</dependencies>
+	
+	<build>
+		<finalName>${project.name}</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
 </project>

style24.scm/src/main/java/com/style24/scm/support/security/TssAuthenticationProvider.java

@@ -18,7 +18,7 @@ import com.style24.scm.biz.service.TssLoginService;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.core.security.GagaPasswordEncoder;
+import com.gagaframework.web.security.GagaPasswordEncoder;
 import com.gagaframework.web.util.GagaCryptoUtil;
 
 /**