diff --git a/build.gradle b/build.gradle
index 30e1fd2..c5bae19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -255,35 +255,6 @@ dependencies {
//-----------------------------------------------------------------------------------//
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
-
-
- //-----------------------------------------------------------------------------------//
- // Template engine : thymeleaf
- //-----------------------------------------------------------------------------------//
- //implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
- //implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.5.3'
- //implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE'
- //-----------------------------------------------------------------------------------//
-
- //-----------------------------------------------------------------------------------//
- // JSP
- //-----------------------------------------------------------------------------------//
- //compileOnly 'org.apache.tomcat.embed:tomcat-embed-jasper'
- //compileOnly 'javax.servlet:jstl'
- //-----------------------------------------------------------------------------------//
-
- //-----------------------------------------------------------------------------------//
- // Web library
- //-----------------------------------------------------------------------------------//
-// implementation 'org.webjars:webjars-locator:0.41'
-// implementation 'org.webjars:webjars-locator-core:0.47'
-// implementation 'org.webjars:bootstrap:5.1.0'
-// implementation 'org.webjars:font-awesome:5.15.3'
-// implementation 'org.webjars:popper.js:2.9.3'
-// implementation 'org.webjars:jquery:3.6.0'
-// implementation 'org.webjars:jquery-i18n-properties:1.10.2'
-// implementation 'org.webjars:momentjs:2.29.1'
- //-----------------------------------------------------------------------------------//
}
tasks.withType(JavaCompile) {
diff --git a/src/main/java/com/xit/core/config/aop/LoggerAspect.java b/src/main/java/com/xit/core/config/aop/LoggerAspect.java
index 08d1e51..b709843 100644
--- a/src/main/java/com/xit/core/config/aop/LoggerAspect.java
+++ b/src/main/java/com/xit/core/config/aop/LoggerAspect.java
@@ -34,7 +34,7 @@ public class LoggerAspect {
@Value("${api.reponse.logging}")
private boolean isResLogging;
- @Pointcut("execution(* com.xit..*Controller.*(..)) || execution(* graphql(..))") // 이런 패턴이 실행될 경우 수행
+ @Pointcut("execution(* com.xit..*Controller.*(..))") // 이런 패턴이 실행될 경우 수행
public void loggerPointCut() {
}
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index 4bc9d0b..9616384 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -32,12 +32,6 @@ spring:
date: yyyy-MM-dd
date-time: yyyy-MM-dd HH:mm:ss
time: HH:mm:ss
-
- # JSP 등 템플릿 엔진 사용시 설정
-# static-path-pattern: /static/**
-# view:
-# prefix: /WEB-INF/jsp/
-# suffix: .jsp
# ==================================================================================================================
# page setting
@@ -91,22 +85,6 @@ spring:
data-source-properties:
rewriteBatchedStatements: true
- # ==================================================================================================================
- # JTA setting
- # ==================================================================================================================
-# jta:
-# enabled: true
-# atomikos:
-# datasource:
-# #lw:
-# unique-resource-name: xaForLegacyDataSource
-# xa-data-source-class-name: com.mysql.cj.jdbc.MysqlXADataSource
-# xa-properties:
-# user:
-# password:
-# url: jdbc:mysql://localhost:3306/xit-framework?autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
-
-
# ==================================================================================================================
# JPA setting
# ==================================================================================================================
@@ -170,25 +148,7 @@ springdoc:
display-query-params-without-oauth2: true
csrf:
enabled: false
-
- # ==================================================================================================================
- # view template engine setting - 미사용
- # ==================================================================================================================
- #JSP와 같이 사용시 뷰 구분을 위해 컨트롤러가 뷰 이름을 반환시 thymeleaf/ 로 시작하면 타임리프로 처리하도록 view-names 지정
-# thymeleaf:
-# check-template: true
-# # templates 디렉토리에 파일이 있는지 없는지 체크, 없으면 에러
-# check-template-location: true
-# encoding: UTF-8
-# mode: HTML
-# prefix: classpath:templates/
-# suffix: .html
-# # profiles 별로 분리
-# #cache: false
-# view-names: thymeleaf/*
-
-
-
+
# ==================================================================================================================
# JPA logging lib setting
# ==================================================================================================================
@@ -204,32 +164,6 @@ decorator:
tracing:
include-parameter-values: true
-# ==================================================================================================================
-# graphql setting
-# ==================================================================================================================
-graphql:
- servlet:
- enabled: true
- mapping: /graphql
- corsEnabled: false
- cors:
- allowed-origins: http://localhost:3000
- allowed-methods: GET, HEAD, POST, PATCH
- exception-handlers-enabled: true
- context-setting: PER_REQUEST_WITH_INSTRUMENTATION
- async-mode-enabled: true
- tools:
- schema-location-pattern: "**/*.graphqls"
- introspection-enabled: true
- spqr:
- gui:
- enabled: true
-
-
-
-
-
-
# ==================================================================================================================
# xit-framework logging setting
# ==================================================================================================================
@@ -246,10 +180,6 @@ logging:
slack:
webhook-uri: https://hooks.slack.com/services/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
-#log4jdbc 설정
-#log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator
-#log4jdbc.dum.sql.maxlinelength=0
-
server:
# profiles 별로 정의
#port: 8080
diff --git a/src/main/resources/templates/csrAttracker.html b/src/main/resources/templates/csrAttracker.html
deleted file mode 100644
index f4a654f..0000000
--- a/src/main/resources/templates/csrAttracker.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
- Title
-
-
- CSRF Attacker
- Show Kittens Pictures
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/biz/cmm/boardManagement.html b/src/main/resources/templates/thymeleaf/biz/cmm/boardManagement.html
deleted file mode 100644
index 6676da3..0000000
--- a/src/main/resources/templates/thymeleaf/biz/cmm/boardManagement.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/biz/cmm/userManagement.html b/src/main/resources/templates/thymeleaf/biz/cmm/userManagement.html
deleted file mode 100644
index 6676da3..0000000
--- a/src/main/resources/templates/thymeleaf/biz/cmm/userManagement.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/error/404.html b/src/main/resources/templates/thymeleaf/error/404.html
deleted file mode 100644
index 2ba4716..0000000
--- a/src/main/resources/templates/thymeleaf/error/404.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Test Error Page!
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/error/error.html b/src/main/resources/templates/thymeleaf/error/error.html
deleted file mode 100644
index 5bcbe5c..0000000
--- a/src/main/resources/templates/thymeleaf/error/error.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Test Error Page!
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fluxHtml.html b/src/main/resources/templates/thymeleaf/fluxHtml.html
deleted file mode 100644
index dc87b5a..0000000
--- a/src/main/resources/templates/thymeleaf/fluxHtml.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fluxJson.html b/src/main/resources/templates/thymeleaf/fluxJson.html
deleted file mode 100644
index dc87b5a..0000000
--- a/src/main/resources/templates/thymeleaf/fluxJson.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fluxSample.html b/src/main/resources/templates/thymeleaf/fluxSample.html
deleted file mode 100644
index 7b55c18..0000000
--- a/src/main/resources/templates/thymeleaf/fluxSample.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
WebFlux!!!!!!!!!!!!!!!!!
-
-
name :
-
age :
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fragments/admin/footer.html b/src/main/resources/templates/thymeleaf/fragments/admin/footer.html
deleted file mode 100644
index be90177..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/admin/footer.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fragments/admin/header.html b/src/main/resources/templates/thymeleaf/fragments/admin/header.html
deleted file mode 100644
index b99c942..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/admin/header.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
- Tailwind Admin Starter Template : Tailwind Toolbox
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fragments/admin/menu.html b/src/main/resources/templates/thymeleaf/fragments/admin/menu.html
deleted file mode 100644
index 589bcae..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/admin/menu.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/fragments/admin/sidebar.html b/src/main/resources/templates/thymeleaf/fragments/admin/sidebar.html
deleted file mode 100644
index 3aab866..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/admin/sidebar.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fragments/dark/footer.html b/src/main/resources/templates/thymeleaf/fragments/dark/footer.html
deleted file mode 100644
index 9888dab..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/dark/footer.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/fragments/dark/header.html b/src/main/resources/templates/thymeleaf/fragments/dark/header.html
deleted file mode 100644
index a65e806..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/dark/header.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
- Tailwind Starter Template - Night Admin Template: Tailwind Toolbox
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/fragments/dark/menu.html b/src/main/resources/templates/thymeleaf/fragments/dark/menu.html
deleted file mode 100644
index 0fbf2e5..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/dark/menu.html
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/fragments/dark/sidebar.html b/src/main/resources/templates/thymeleaf/fragments/dark/sidebar.html
deleted file mode 100644
index 8a78404..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/dark/sidebar.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/fragments/include-link.html b/src/main/resources/templates/thymeleaf/fragments/include-link.html
deleted file mode 100644
index 76cc79b..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/include-link.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/fragments/include-script.html b/src/main/resources/templates/thymeleaf/fragments/include-script.html
deleted file mode 100644
index 30c84de..0000000
--- a/src/main/resources/templates/thymeleaf/fragments/include-script.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/index.html b/src/main/resources/templates/thymeleaf/index.html
deleted file mode 100644
index 2e9a1ce..0000000
--- a/src/main/resources/templates/thymeleaf/index.html
+++ /dev/null
@@ -1,299 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Total Revenue
- $3249
-
-
-
-
-
-
-
-
-
-
-
-
Total Users
- 249
-
-
-
-
-
-
-
-
-
-
-
-
-
Server Uptime
- 152 days
-
-
-
-
-
-
-
-
-
-
-
-
To Do List
- 7 tasks
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Table
-
-
-
-
-
- Name |
- Side |
- Role |
-
-
-
-
-
- Obi Wan Kenobi |
- Light |
- Jedi |
-
-
- Greedo |
- South |
- Scumbag |
-
-
- Darth Vader |
- Dark |
- Sith |
-
-
-
-
-
See More issues...
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/layouts/index-admin.html b/src/main/resources/templates/thymeleaf/layouts/index-admin.html
deleted file mode 100644
index 41ee70e..0000000
--- a/src/main/resources/templates/thymeleaf/layouts/index-admin.html
+++ /dev/null
@@ -1,446 +0,0 @@
-
-
-
-
-
-
-
- Tailwind Admin Starter Template : Tailwind Toolbox
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Total Revenue
- $3249
-
-
-
-
-
-
-
-
-
-
-
-
Total Users
- 249
-
-
-
-
-
-
-
-
-
-
-
-
-
Server Uptime
- 152 days
-
-
-
-
-
-
-
-
-
-
-
-
To Do List
- 7 tasks
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Graph
-
-
-
-
-
- Name |
- Side |
- Role |
-
-
-
-
-
- Obi Wan Kenobi |
- Light |
- Jedi |
-
-
- Greedo |
- South |
- Scumbag |
-
-
- Darth Vader |
- Dark |
- Sith |
-
-
-
-
-
See More issues...
-
-
-
-
-
-
-
-
-
-
-
Advert
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/layouts/index-dark.html b/src/main/resources/templates/thymeleaf/layouts/index-dark.html
deleted file mode 100644
index 5b000dc..0000000
--- a/src/main/resources/templates/thymeleaf/layouts/index-dark.html
+++ /dev/null
@@ -1,513 +0,0 @@
-
-
-
-
-
-
- Tailwind Starter Template - Night Admin Template: Tailwind Toolbox
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Total Revenue
- $3249
-
-
-
-
-
-
-
-
-
-
-
-
Total Users
- 249
-
-
-
-
-
-
-
-
-
-
-
-
-
Server Uptime
- 152 days
-
-
-
-
-
-
-
-
-
-
-
-
To Do List
- 7 tasks
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Table
-
-
-
-
-
- Name |
- Side |
- Role |
-
-
-
-
-
- Obi Wan Kenobi |
- Light |
- Jedi |
-
-
- Greedo |
- South |
- Scumbag |
-
-
- Darth Vader |
- Dark |
- Sith |
-
-
-
-
-
See More issues...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/layouts/layout-admin.html b/src/main/resources/templates/thymeleaf/layouts/layout-admin.html
deleted file mode 100644
index 430d846..0000000
--- a/src/main/resources/templates/thymeleaf/layouts/layout-admin.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/layouts/layout-dark.html b/src/main/resources/templates/thymeleaf/layouts/layout-dark.html
deleted file mode 100644
index 69876d9..0000000
--- a/src/main/resources/templates/thymeleaf/layouts/layout-dark.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/sample/exceldown.html b/src/main/resources/templates/thymeleaf/sample/exceldown.html
deleted file mode 100644
index 0646303..0000000
--- a/src/main/resources/templates/thymeleaf/sample/exceldown.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/sample/greeting.html b/src/main/resources/templates/thymeleaf/sample/greeting.html
deleted file mode 100644
index be4f042..0000000
--- a/src/main/resources/templates/thymeleaf/sample/greeting.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/templates/thymeleaf/sample/sample-admin.html b/src/main/resources/templates/thymeleaf/sample/sample-admin.html
deleted file mode 100644
index ef69576..0000000
--- a/src/main/resources/templates/thymeleaf/sample/sample-admin.html
+++ /dev/null
@@ -1,266 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Total Revenue
- $3249
-
-
-
-
-
-
-
-
-
-
-
-
Total Users
- 249
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Graph
-
-
-
-
-
- Name |
- Side |
- Role |
-
-
-
-
-
- Obi Wan Kenobi |
- Light |
- Jedi |
-
-
- Greedo |
- South |
- Scumbag |
-
-
- Darth Vader |
- Dark |
- Sith |
-
-
-
-
-
See More issues...
-
-
-
-
-
-
-
-
-
-
-
Advert
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/thymeleaf/sample/sample-dark.html b/src/main/resources/templates/thymeleaf/sample/sample-dark.html
deleted file mode 100644
index 7a9e4a9..0000000
--- a/src/main/resources/templates/thymeleaf/sample/sample-dark.html
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Total Revenue
- $3249
-
-
-
-
-
-
-
-
-
-
-
-
Total Users
- 249
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Table
-
-
-
-
-
- Name |
- Side |
- Role |
-
-
-
-
-
- Obi Wan Kenobi |
- Light |
- Jedi |
-
-
- Greedo |
- South |
- Scumbag |
-
-
- Darth Vader |
- Dark |
- Sith |
-
-
-
-
-
See More issues...
-
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/Test.jsp b/src/main/webapp/WEB-INF/jsp/Test.jsp
deleted file mode 100644
index 49d75f5..0000000
--- a/src/main/webapp/WEB-INF/jsp/Test.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%--
- Created by IntelliJ IDEA.
- User: Administrator
- Date: 2021-08-09
- Time: 20:49
- To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-
- Title
-
-
- JSP Test 에서 엑셀다운로드 테스트
-
-
-
-
-
diff --git a/src/test/java/com/xit/ApplicationTest.java b/src/test/java/com/xit/ApplicationTest.java
new file mode 100644
index 0000000..5a50887
--- /dev/null
+++ b/src/test/java/com/xit/ApplicationTest.java
@@ -0,0 +1,25 @@
+package com.xit;
+
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+//@DataJpaTest
+@ContextConfiguration(classes = Application.class)
+@ExtendWith(SpringExtension.class)
+@ActiveProfiles({"dev"})
+public class ApplicationTest {
+
+ @Test
+ void load(){
+
+ }
+
+}
diff --git a/src/test/java/com/xit/biz/ctgy/repository/RepositoryTest.java b/src/test/java/com/xit/biz/ctgy/repository/RepositoryTest.java
index 4581f67..694350e 100644
--- a/src/test/java/com/xit/biz/ctgy/repository/RepositoryTest.java
+++ b/src/test/java/com/xit/biz/ctgy/repository/RepositoryTest.java
@@ -6,6 +6,7 @@ import com.xit.biz.ctgy.entity.QMinSimsa680;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;