From a74b6fc8ed3f9d6155188b73a0ca41e0aac21702 Mon Sep 17 00:00:00 2001 From: common Date: Sat, 22 Feb 2025 00:31:43 +0900 Subject: [PATCH 1/4] 66 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08400dd..b0ede86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { ping -n 3 127.0.0.1 > nul echo "copy" - copy /Y /B "build\\libs\\*-plain.war" "C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war" + copy /Y /B "%WORKSPACE%\\build\\libs\\*-plain.war" "C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war" ping -n 5 127.0.0.1 > nul echo "start" From 17552d08675d6aba76550b390d2fc354dc4d28c2 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Tue, 25 Feb 2025 13:20:13 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=9A=A9=EC=96=B4=EC=A7=91=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20BlobUtil=20=EC=B6=94=E3=85=8F=E3=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/worddictController.java | 2 +- .../localhost/service/worddictyService.java | 21 +++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/worddictController.java b/src/main/java/io/company/localhost/controller/api/worddictController.java index 3748e29..4e72679 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -89,7 +89,7 @@ public class worddictController { } /** * 용어 등록 - 카테고리 등록 - * @param WRDDICCAT 카테고리 코드값 ,WRDDICTTL 용어,WRDDICCON 내용 ,WRDDICRIK 링크 ,CMNCODNAM 추가 등록 카테고리 이름 + * @param WRDDICCAT 카테고리 코드값 ,WRDDICTTL 용어,WRDDICCON 내용 ,WRDDICRIK 링크 ,CMNCODNAM 추가 등록 카테고리 이름 * @return */ @Member diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index fddf11e..b794b46 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.commoncodMapper; import io.company.localhost.mapper.worddictyMapper; +import io.company.localhost.utils.BlobUtil; import lombok.RequiredArgsConstructor; @Service @@ -32,9 +33,14 @@ public class worddictyService { private final worddictyMapper worddictymapper; private final commoncodMapper commoncodmapper; - public List getWordList(MapDto map) { List wordList = worddictymapper.getWordList(map); + for (MapDto word : wordList) { + Object content = word.get("WRDDICCON"); + // BlobUtil.procBlobToString으로 content 변환 + String contentString = BlobUtil.procBlobToString(content); + word.put("WRDDICCON", contentString); + } List processedList = new ArrayList<>(); // 데이터 가공 @@ -60,7 +66,6 @@ public class worddictyService { } return processedList; } - public Long insertWord(MapDto map) { if (map.containsKey("CMNCODNAM") && map.get("CMNCODNAM") != null) { @@ -68,28 +73,16 @@ public class worddictyService { } return worddictymapper.insertWord(map); } - public Long updateWord(MapDto map) { return worddictymapper.updateWord(map); } - public MapDto getWordDetail(MapDto map) { return worddictymapper.getWordDetail(map); } - public int getTotal(MapDto map) { return worddictymapper.getTotal(map); } - - public Long updateword(MapDto map) { return worddictymapper.updateword(map); } - - - - - - - } From ec5dd31c0dc8d62bb789d723e6ff3e8d829f0552 Mon Sep 17 00:00:00 2001 From: yoon Date: Tue, 25 Feb 2025 13:36:04 +0900 Subject: [PATCH 3/4] . --- src/main/resources/mapper/NetmemberMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/mapper/NetmemberMapper.xml b/src/main/resources/mapper/NetmemberMapper.xml index 7307fcf..f57d8cd 100644 --- a/src/main/resources/mapper/NetmemberMapper.xml +++ b/src/main/resources/mapper/NetmemberMapper.xml @@ -145,5 +145,4 @@ m.MEMBERLEA ="N" - From 54bb4d4cc973df8ebc317343d10b94fc5c5f84b0 Mon Sep 17 00:00:00 2001 From: yoon Date: Tue, 25 Feb 2025 13:37:02 +0900 Subject: [PATCH 4/4] . --- src/main/resources/mapper/NetprojctMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/mapper/NetprojctMapper.xml b/src/main/resources/mapper/NetprojctMapper.xml index a20e6c7..0c25047 100644 --- a/src/main/resources/mapper/NetprojctMapper.xml +++ b/src/main/resources/mapper/NetprojctMapper.xml @@ -92,5 +92,4 @@ WHERE PROJCTSEQ = #{projctSeq} -