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: 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 @@ AND SGG_CD = #{sggID} AND INST_CD = #{instCode} AND DEPT_CD IN (#{deptID}) - AND USE_YN = 'Y' - + AND USE_YN = 'Y' 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 @@ +CONCAT(#{addsFileRootPath}, DIR, DATE_FORMAT(CURRENT_DATE, '%Y/%m/%d/')) +(CASE + WHEN REPLACE(FILE_PATH,#{type},'/files/') LIKE '_:%' + THEN SUBSTR(REPLACE(FILE_PATH,#{type},'/files/'),3) + ELSE REPLACE(FILE_PATH,#{type},'/files/') + END) + SELECT INF_TYPE - , CONCAT(#{addsFileRootPath}, DIR, DATE_FORMAT(CURRENT_DATE, '/%Y/%m/%d/')) DIR + , 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 + , AS URL FROM TB_FILE A WHERE FILE_ID IN (#{fileID}) 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 + , AS URL FROM TB_FILE A AND A.INF_TYPE = #{infoType} 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 @@ - + 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