fix: web war build fix

src/main/java/cokr/xit/adds/XitBootApplication.java

@@ -1,10 +1,23 @@
 package cokr.xit.adds;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.test.context.ContextConfiguration;
 
-import cokr.xit.base.boot.XitBaseApplication;
+import cokr.xit.base.boot.MvcConfig2;
+import cokr.xit.base.boot.SecurityConfig;
+import cokr.xit.foundation.boot.CommonConfig;
+import cokr.xit.foundation.boot.DatasourceConfig;
+import cokr.xit.foundation.boot.ServletConfig;
+import cokr.xit.foundation.boot.TransactionConfig;
 
-public class XitBootApplication extends XitBaseApplication {
+@SpringBootApplication
+@ImportAutoConfiguration({CommonConfig.class, ServletConfig.class, MvcConfig2.class, DatasourceConfig.class, TransactionConfig.class, SecurityConfig.class})
+@ContextConfiguration({"classpath:spring/context-*.xml"})
+public class XitBootApplication extends SpringBootServletInitializer {
 	public static void main(String[] args) {
 		SpringApplication.run(XitBootApplication.class, args);
 
@@ -16,4 +29,9 @@ public class XitBootApplication extends XitBaseApplication {
 		// application.addListeners(new ApplicationPidFileWriter( "adds-fo.pid"));
 		// application.run(args);
 	}
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(XitBootApplication.class);
+	}
 }

src/main/resources/application.yml

@@ -44,7 +44,7 @@ messageSource:
 
 propertyService:
   properties:
-    - tempDir: ${user.home}/temp
+    - tempDir: ${app.data.root.path}/temp
     - pageUnit: 10
     - pageSize: 10
       # 테스트를 위해 permitAccess 설정
@@ -58,9 +58,17 @@ propertyService:
 #      filename: classpath*:properties/your-file-02.properties
 
 app:
+  data:
+    root:
+      path: ${user.home}/data/adds
   file:
     root:
-      path: ${user.home}/data/adds/files/
+      path: ${app.data.root.path}/files/
+
+logging:
+  file:
+    path: ${app.data.root.path}/logs
+    name: ${spring.application.name}
 ---
 spring:
   config:
@@ -103,12 +111,11 @@ server:
 
 propertyService:
   properties:
-    - tempDir: /data/adds/temp
     - defaultPassword: 0
 
 app:
   api:
     host: http://211.119.124.9:9076
-  file:
+  data:
     root:
-      path: /data/adds/files/
+      path: /data/adds

src/main/resources/logback-spring.xml

@@ -2,8 +2,8 @@
 <!-- 60초마다 설정 파일의 변경을 확인 하여 변경시 갱신 -->
 <configuration scan="true" scanPeriod="60 seconds">
     <springProperty scope="context" name="applicationName" source="spring.application.name"/>
-    <property name="LOG_PATH" value="logs"/>
-    <property name="LOG_FILE_NAME" value="${applicationName}"/>
+    <!--    <property name="LOG_PATH" value="logs"/>-->
+    <!--    <property name="LOG_FILE_NAME" value="${applicationName}"/>-->
     <property name="ERR_LOG_FILE_NAME" value="${LOG_FILE_NAME}-error"/>
     <property name="LOG_PATTERN" value="%d{HH:mm:ss.SSS} %-5level [%logger{0}:%line] - %msg%n"/>
 
@@ -14,18 +14,18 @@
     </appender>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/${LOG_FILE_NAME}.log</file>
+        <file>${LOG_PATH}/${LOG_FILE}.log</file>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>${LOG_PATTERN}</pattern>
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- .gz,.zip 등을 넣으면 자동 일자별 로그파일 압축 -->
-            <fileNamePattern>${LOG_PATH}/${LOG_FILE_NAME}.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${LOG_FILE}.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
-            
+
             <maxHistory>30</maxHistory><!-- 로그파일 보관주기(일)-->
             <!--<MinIndex>1</MinIndex>
             <MaxIndex>10</MaxIndex>-->
@@ -38,15 +38,15 @@
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
-        
-        <file>${LOG_PATH}/${ERR_LOG_FILE_NAME}.log</file>
+
+        <file>${LOG_PATH}/${LOG_FILE}-error.log</file>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>${LOG_PATTERN}</pattern>
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- .gz,.zip 등을 넣으면 자동 일자별 로그파일 압축 -->
-            <fileNamePattern>${LOG_PATH}/${ERR_LOG_FILE_NAME}.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${LOG_FILE}-error.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <!-- 파일당 최고 용량 kb, mb, gb -->
                 <maxFileSize>10MB</maxFileSize>
@@ -62,17 +62,17 @@
         <appender-ref ref="Error"/>
     </root>
 
-	<logger name="jdbc" level="OFF"/>
-	<logger name="org.apache.commons" level="OFF" additivity="false"/>
-	<logger name="org.mariadb" level="OFF" additivity="false"/>
-	<logger name="jdbc.connection" level="OFF" additivity="false"/>
-	<logger name="jdbc.sqlonly" level="OFF" additivity="false"/>
-	<logger name="jdbc.resultset" level="OFF" additivity="false"/>
-	<logger name="jdbc.resultsettable" level="OFF" additivity="false"/>
-	<logger name="jdbc.audit" level="OFF" additivity="false"/>
-	<logger name="com.zaxxer" level="OFF" additivity="false"/>
-	<logger name="jdbc.sqltiming" level="DEBUG" />
-	<logger name="org.quartz" level="Error" additivity="false"/>
+    <logger name="jdbc" level="OFF"/>
+    <logger name="org.apache.commons" level="OFF" additivity="false"/>
+    <logger name="org.mariadb" level="OFF" additivity="false"/>
+    <logger name="jdbc.connection" level="OFF" additivity="false"/>
+    <logger name="jdbc.sqlonly" level="OFF" additivity="false"/>
+    <logger name="jdbc.resultset" level="OFF" additivity="false"/>
+    <logger name="jdbc.resultsettable" level="OFF" additivity="false"/>
+    <logger name="jdbc.audit" level="OFF" additivity="false"/>
+    <logger name="com.zaxxer" level="OFF" additivity="false"/>
+    <logger name="jdbc.sqltiming" level="DEBUG" />
+    <logger name="org.quartz" level="Error" additivity="false"/>
 
     <!-- 특정패키지 로깅레벨 설정 -->
     <logger name="cokr.xit" level="DEBUG" additivity="false">
@@ -81,4 +81,4 @@
         <appender-ref ref="Error"/>
     </logger>
 
-</configuration>
+</configuration>