From 288ed421bda621d9667d237c8f8957ee6433df2b Mon Sep 17 00:00:00 2001 From: jhseo Date: Mon, 26 Feb 2024 11:07:54 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B3=BC=EC=84=B8=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20feat:=20comm?= =?UTF-8?q?ons-compress=201.26.0=20=EB=B2=84=EC=A0=84=EC=97=85=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20=EC=97=91=EC=85=80=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EB=AC=B8=EC=A0=9C=EA=B0=80=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=EB=90=98=EC=96=B4=20commons-io=202.15.1=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/sisul/service/BizSisulService.java | 35 ++++++++++--------- mens-core/pom.xml | 6 ++++ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java index e074c41..2ece32d 100644 --- a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java +++ b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java @@ -484,7 +484,7 @@ public class BizSisulService extends AbstractService implements IBizSisulService String.valueOf(idx.get()), "unitySndngDetailId(파일유일키)", "필수(최대 20자)", d.getUnitySndngDetailId()}); } - if(Checks.isEmpty(d.getSndngDt()) || d.getSndngDt().length() != 14 || !Pattern.matches("20([2-9][0-9][0-1][1-9][0-3][0-9][0-2][0-9][0-5][0-9][0-5][0-9])", d.getSndngDt())){ + if(Checks.isEmpty(d.getSndngDt()) || d.getSndngDt().length() != 14 || !Pattern.matches("20([2-9][0-9][0-1][0-9][0-3][0-9][0-2][0-9][0-5][0-9][0-5][0-9])", d.getSndngDt())){ throw BizRuntimeException.create("fail.api.excel.upload.data", new String[]{ String.valueOf(idx.get()), "sndngDt(우편물요청일시)", "필수(14자)", d.getSndngDt()}); } @@ -527,13 +527,12 @@ public class BizSisulService extends AbstractService implements IBizSisulService + "\"title\": \"내역\"," + "\"item_type\": \"KEY_VALUE\"," + "\"properties\": {" - + "\"style\" : {" - + "\"highlight\" : {" - + "\"" + Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(), "") + "\" : {" - + "\"use-clipboard\" : true" - + "}" + + "\"hyperlinkTitle\" : [" + + "{" + + "\"title_name\": \"" + Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(), "") + "\"," + + "\"href_url\" : \"https://etax.seoul.go.kr/jsp/gojilink.jsp?nap_no=" + Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(), "") + "\"" + "}" - + "}" + + "]" + "}," + "\"elements\": [" + "{" @@ -584,7 +583,7 @@ public class BizSisulService extends AbstractService implements IBizSisulService + "{" + "\"key\": \"납세번호\"," + "\"value\": \""+ Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(),"") - +"\\\\n※ ETAX 납부 시 29자리 입력\"," + +"\\\\n※ 위 납부번호 클릭 시 ETAX 연결\"," + "\"level\": 1" + "}" + "]" @@ -687,7 +686,7 @@ public class BizSisulService extends AbstractService implements IBizSisulService + "\"title\" : \"\" ," + "\"item_type\" : \"PRE_TEXT\"," + "\"elements\" : \" \\n※ 2022.04.19.까지 연체료율 10%~15%\\n※ 체납 시 보중보험 청구, 재산 압류, 사용료 청구소송 등 조치가 이루어지며," - + " 금융기관 및 신용정보기관에 연체정보가 등록되어 금융거래 등 각종 경제활동에 불이익이 있을 수 있습니다.\"" + + " 금융기관 및 신용정보기관에 연체정보가 등록되어 금융거래 등 각종 경제활동에 불이익이 있을 수 있습니다.\"" + "}" + "]" +"}"; @@ -710,13 +709,12 @@ public class BizSisulService extends AbstractService implements IBizSisulService + "\"title\": \"내역\"," + "\"item_type\": \"KEY_VALUE\"," + "\"properties\": {" - + "\"style\" : {" - + "\"highlight\" : {" - + "\"" + Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(), "") + "\" : {" - + "\"use-clipboard\" : true" - + "}" + + "\"hyperlinkTitle\" : [" + + "{" + + "\"title_name\": \"" + Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(), "") + "\"," + + "\"href_url\" : \"https://etax.seoul.go.kr/jsp/gojilink.jsp?nap_no=" + Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(), "") + "\"" + "}" - + "}" + + "]" + "}," + "\"elements\": [" + "{" @@ -752,7 +750,7 @@ public class BizSisulService extends AbstractService implements IBizSisulService + "{" + "\"key\": \"납세번호\"," + "\"value\": \""+ Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(),"") - +"\\\\n※ ETAX 납부 시 29자리 입력\"," + +"\\\\n※ 위 납부번호 클릭 시 ETAX 연결\"," + "\"level\": 1" + "}" + "]" @@ -878,6 +876,11 @@ public class BizSisulService extends AbstractService implements IBizSisulService + "{" + "\"title\": \"서울시 세외수입 납부방법 안내\"," + "\"item_type\": \"KEY_VALUE\"," + + "\"properties\": {" + + "\"hyperlink\" : [" + + "\"https://etax.seoul.go.kr\"" + + "]" + + "}," + "\"elements\": [" + "{" + "\"key\": \"가상계좌\\\\n납부\"," diff --git a/mens-core/pom.xml b/mens-core/pom.xml index abbfcd1..a2bfaf9 100644 --- a/mens-core/pom.xml +++ b/mens-core/pom.xml @@ -204,6 +204,12 @@ 1.26.0 + + commons-io + commons-io + 2.15.1 + + org.hsqldb hsqldb