From c256233a6dbfd8cea04845c31f2ac34546806224 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Mon, 8 Jul 2024 16:20:01 +0900
Subject: [PATCH 1/3] =?UTF-8?q?upload-support=20=EA=B2=BD=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/include/tail.jsp  |  2 +-
 .../resources/js/base/upload-support.js       | 23 -------------------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 src/main/webapp/resources/js/base/upload-support.js

diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
index 1c306b2..0e4e40a 100644
--- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
@@ -21,7 +21,7 @@
 <!-- base -->
 <script src="<c:url value="/webjars/js/base/base.js"/>"></script>
 <script src="<c:url value="/webjars/js/base/dataset.js"/>"></script>
-<script src="<c:url value="/resources/js/base/upload-support.js?${ver}"/>"></script>
+<script src="<c:url value="/webjars/js/base/upload-support.js?${ver}"/>"></script>
 <script src="<c:url value="/webjars/js/base/code.js"/>"></script>
 <script src="<c:url value="/webjars/js/base/code-support.js"/>"></script>
 <script src="<c:url value="/webjars/js/base/menu.js"/>"></script>
diff --git a/src/main/webapp/resources/js/base/upload-support.js b/src/main/webapp/resources/js/base/upload-support.js
deleted file mode 100644
index 0340eb8..0000000
--- a/src/main/webapp/resources/js/base/upload-support.js
+++ /dev/null
@@ -1,23 +0,0 @@
-function uploadSupport(selector) {
-	let input = $(selector);
-	if (!input)
-		throw "Element not found: " + selector;
-		
-	let fileset = new Dataset({
-		keymapper: info => info.id
-	});
-	
-	input.change(function() {
-		var files = $(this).get(0).files,
-			length = files.length,
-			array = []
-		for (var i = 0; i < length; ++i) {
-			var file = files[i];
-			file.id = "file-" + new Date().getTime() + "-" + i;
-			file.url = (window.URL || window.webkitURL).createObjectURL(file);
-			array.push(file);
-		}
-		fileset.setData(array);
-	});
-	return fileset;
-}
\ No newline at end of file

From 4380fc9a9bb5259ef10b27304e50e1585edf410f Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Mon, 8 Jul 2024 16:34:01 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20header=20size=20100kb=EB=A1=9C=20?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d4ae033..38be294 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,8 @@
 server:
   shutdown: graceful
   port: 9077
-  
+  max-http-header-size: 100KB
+
   servlet:
     context-path: /
     session:

From 41e39107b463854c6de0520e86d0b521c65b6b52 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Mon, 8 Jul 2024 16:48:52 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fileDir,=20fileUrl=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/base/department-mapper.xml     |  3 +--
 .../resources/sql/mapper/base/file-mapper.xml | 21 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/department-mapper.xml b/src/main/resources/sql/mapper/base/department-mapper.xml
index 799fab6..ab7a1c0 100644
--- a/src/main/resources/sql/mapper/base/department-mapper.xml
+++ b/src/main/resources/sql/mapper/base/department-mapper.xml
@@ -41,8 +41,7 @@
   <if test="sggID != null"> AND SGG_CD = #{sggID}</if>
   <if test="instCode != null"> AND INST_CD = #{instCode}</if>
   <if test="deptIDs != null"> AND DEPT_CD IN (<foreach collection="deptIDs" item="deptID" separator=",">#{deptID}</foreach>)</if>
-  <if test="!includeAll"> AND USE_YN = 'Y'</if>
-  </where>
+  <if test="!includeAll"> AND USE_YN = 'Y'</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></select>
 
diff --git a/src/main/resources/sql/mapper/base/file-mapper.xml b/src/main/resources/sql/mapper/base/file-mapper.xml
index 357b61d..caff7b8 100644
--- a/src/main/resources/sql/mapper/base/file-mapper.xml
+++ b/src/main/resources/sql/mapper/base/file-mapper.xml
@@ -19,9 +19,16 @@
 	<result property="useYN" column="USE_YN"/>
 </resultMap>
 
+<sql id="fileDir">CONCAT(#{addsFileRootPath}, DIR, DATE_FORMAT(CURRENT_DATE, '%Y/%m/%d/'))</sql>
+<sql id="fileUrl">(CASE 
+        WHEN REPLACE(FILE_PATH,#{type},'/files/') LIKE '_:%'
+        THEN SUBSTR(REPLACE(FILE_PATH,#{type},'/files/'),3)
+        ELSE REPLACE(FILE_PATH,#{type},'/files/')
+        END)</sql>
+
 <sql id="fileDirs">
 SELECT INF_TYPE
-     , CONCAT(#{addsFileRootPath}, DIR, DATE_FORMAT(CURRENT_DATE, '/%Y/%m/%d/')) DIR
+     ,<include refid="cokr.xit.base.file.dao.FileMapper.fileDir" /> DIR
   FROM (
 	   SELECT '00' INF_TYPE, 'attachment' DIR FROM DUAL UNION
 	   SELECT '01' INF_TYPE, 'document' DIR FROM DUAL UNION
@@ -47,11 +54,7 @@ SELECT A.FILE_ID
      , A.USE_YN
      , A.REG_DT
      , A.RGTR
-     , (CASE 
-        WHEN REPLACE(FILE_PATH,#{type},'/files/') LIKE '_:%'
-        THEN SUBSTR(REPLACE(FILE_PATH,#{type},'/files/'),3)
-        ELSE REPLACE(FILE_PATH,#{type},'/files/')
-        END) AS URL
+     ,<include refid="cokr.xit.base.file.dao.FileMapper.fileUrl" /> AS URL
   FROM TB_FILE A
  WHERE FILE_ID IN (<foreach collection="fileIDs" item="fileID" separator=",">#{fileID}</foreach>)
  ORDER BY FILE_ID
@@ -71,11 +74,7 @@ SELECT A.FILE_ID
      , A.USE_YN
      , A.REG_DT
      , A.RGTR
-     , (CASE 
-        WHEN REPLACE(FILE_PATH,#{type},'/files/') LIKE '_:%'
-        THEN SUBSTR(REPLACE(FILE_PATH,#{type},'/files/'),3)
-        ELSE REPLACE(FILE_PATH,#{type},'/files/')
-        END) AS URL
+     ,<include refid="cokr.xit.base.file.dao.FileMapper.fileUrl" /> AS URL
   FROM TB_FILE A
 <where>
 <if test="infoType != null">  AND A.INF_TYPE = #{infoType}</if>