diff --git a/src/main/java/kr/xit/framework/biz/cmm/FileUtil.java b/src/main/java/kr/xit/framework/biz/cmm/FileUtil.java
deleted file mode 100644
index cf47ba30..00000000
--- a/src/main/java/kr/xit/framework/biz/cmm/FileUtil.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package kr.xit.framework.biz.cmm;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.multipart.MultipartFile;
-
-public class FileUtil {
-
- public void makeBasePath(String path) {
- File dir = new File(path);
- if (!dir.exists()) {
- dir.mkdirs();
- }
- }
-
- public String saveFile(MultipartFile file, String basePath, String fileName){
- if (file == null || file.getName().equals("") || file.getSize() < 1) {
- return null;
- }
-
- makeBasePath(basePath);
- String serverFullPath = basePath + fileName;
-
- File file1 = new File(serverFullPath);
- try {
- file.transferTo(file1);
- } catch (IllegalStateException ex) {
- System.out.println("IllegalStateException: " + ex.toString());
- } catch (IOException ex) {
- System.out.println("IOException: " + ex.toString());
- }
-
- return serverFullPath;
- }
-
- public String getNewName() {
- SimpleDateFormat ft = new SimpleDateFormat("yyyyMMddhhmmssSSS");
- return ft.format(new Date()) + (int) (Math.random() * 10);
- }
-
- public String getFileExtension(String filename) {
- Integer mid = filename.lastIndexOf(".");
- return filename.substring(mid, filename.length());
- }
-
- public String getRealPath(String path, String filename) {
- return path + filename.substring(0,4) + "/";
- }
-
- public void fileDownload(HttpServletResponse response, String path, String filename) {
- String realPath = "";
-
- try {
- filename = URLEncoder.encode(filename, "UTF-8");
- } catch (UnsupportedEncodingException ex) {
- System.out.println("UnsupportedEncodingException");
- }
-
- realPath = path + filename;
-
- File file1 = new File(realPath);
- if (!file1.exists()) {
- return ;
- }
-
- response.setHeader("Content-Disposition", "attachment; filename=\""+filename+"\"");
- response.setContentType("application/octet-stream;");
- response.setHeader("Pragma", "no-cache");
- response.setHeader("Cache-Control", "no-cache, must-revalidate");
- response.setDateHeader("Expires", 0);
-
- try {
- OutputStream os = response.getOutputStream();
- FileInputStream fis = new FileInputStream(realPath);
-
- int ncount = 0;
-
- byte[] bytes = new byte[512];
-
- while((ncount = fis.read(bytes)) != -1 ) {
- os.write(bytes, 0, ncount);
- }
-
- fis.close();
- os.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/src/main/java/kr/xit/framework/biz/cmm/ImageEditor.java b/src/main/java/kr/xit/framework/biz/cmm/ImageEditor.java
deleted file mode 100644
index 2c9b5ec6..00000000
--- a/src/main/java/kr/xit/framework/biz/cmm/ImageEditor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package kr.xit.framework.biz.cmm;
-
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
-
-import sun.misc.BASE64Decoder;
-
-@Controller
-public class ImageEditor{
- //private String filePath = "c:/users/xitdev/temp";
- private String filePath = "/Users/minuk/temp";
-
- @RequestMapping(value = "/imageEditor")
- public String imageEditor() {
-
- return "imageEditor";
- }
-
- @RequestMapping(value = "/fileUpload")
- public void fileUpload(HttpServletResponse response, MultipartFile upfile) {
- if(upfile==null) return;
-
- try {
- FileUtil fu = new FileUtil();
- String filename = fu.getNewName();
- fu.saveFile(upfile, filePath, filename );
- response.getWriter().print(filename);
- } catch (Exception ex) {
- System.out.println("File Upload Error");
- }
- }
-
- @RequestMapping(value = "/fileDownload")
- public void fileDownload(HttpServletResponse response, String filename) {
- FileUtil fu = new FileUtil();
- fu.fileDownload(response, filePath, filename );
- }
-
- @RequestMapping(value = "/saveImage", method = RequestMethod.POST)
- public void saveImage(HttpServletRequest request, MultipartFile imageFile) {
- String filename = filePath +"/"+ request.getParameter("filename");
-
- try {
- byte[] Filebyte = imageFile.getBytes();
- imageFile.getInputStream().read(Filebyte);
-
- String encString = new String(Filebyte, "ASCII");
- encString = encString.replace("data:image/png;base64,", "");
-
- FileOutputStream fs = new FileOutputStream(filename);
- DataOutputStream ds = new DataOutputStream(fs);
-
- BASE64Decoder decoder = new BASE64Decoder();
- byte[] data = decoder.decodeBuffer(encString);
-
- for (byte dataB : data) {
- ds.writeByte(dataB);
- }
- ds.close();
- fs.close();
- } catch (IOException e) {
- System.out.println("IOException Error");
- }
- }
-}
diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/CmmFileDTO.java b/src/main/java/kr/xit/framework/biz/cmm/model/CmmFileDTO.java
index 4b841eba..4c4ee087 100644
--- a/src/main/java/kr/xit/framework/biz/cmm/model/CmmFileDTO.java
+++ b/src/main/java/kr/xit/framework/biz/cmm/model/CmmFileDTO.java
@@ -111,6 +111,7 @@ public class CmmFileDTO {
private String downloadUrl;
private boolean isEditor = false;
+ private String fileJobId;
}
@Getter
diff --git a/src/main/resources/props/local/globals.properties b/src/main/resources/props/local/globals.properties
index 33fd041f..381c0860 100644
--- a/src/main/resources/props/local/globals.properties
+++ b/src/main/resources/props/local/globals.properties
@@ -124,10 +124,10 @@ exception.log.trace=true
# k byte
file.upload.allow.max-size: 2048
file.upload.allow.ext=
-file.upload.root=/Users/minuk/data/fims/upload
-#file.upload.root=D:/data/fims/upload
+#file.upload.root=/Users/minuk/data/fims/upload
+file.upload.root=D:/data/fims/upload
file.upload.natl-newspaper.path=/natl-newspaper
-file.rcv.root=/Users/minuk/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0
-#file.rcv.root=D:/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0r
+#file.rcv.root=/Users/minuk/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0
+file.rcv.root=D:/project_data/fims/01. \uC5F0\uACC4/01. \uAD6D\uBBFC\uC2E0\uBB38\uACE0
file.rcv.natl-newspaper.path=/rcv
diff --git a/src/main/resources/sqlmapper/framework/cmm/cmm-file-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/cmm/cmm-file-mysql-mapper.xml
index efdb2a9a..09dc69b3 100644
--- a/src/main/resources/sqlmapper/framework/cmm/cmm-file-mysql-mapper.xml
+++ b/src/main/resources/sqlmapper/framework/cmm/cmm-file-mysql-mapper.xml
@@ -50,6 +50,7 @@
* tb_cmm_file_detail : 파일 공통 상세
************************************************************************************************************** -->
+ # noinspection SqlResolve @ any/"tcfd"
SELECT tcfd.file_mastr_id
, tcfd.file_id
, tcfd.orginl_file_nm
@@ -59,12 +60,12 @@
, tcfd.file_cours
, tcfd.regist_dt
, tcfd.register
- FROM tb_cmm_file_detail tcfd
@@ -72,6 +73,7 @@