From d626b25a007d849f27c0d7af7a3a716056813956 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Wed, 19 Feb 2025 12:05:12 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20sqlcon=20?= =?UTF-8?q?=EC=84=B8=ED=8C=85=20=ED=8C=8C=EC=9D=BC=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20config.properties=20>=20globals.propertie?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/seed/utils/SeedProperties.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/seed/utils/SeedProperties.java b/src/main/java/seed/utils/SeedProperties.java index 967920f3..5f97bbdc 100644 --- a/src/main/java/seed/utils/SeedProperties.java +++ b/src/main/java/seed/utils/SeedProperties.java @@ -16,6 +16,7 @@ public class SeedProperties { private static String configPath = null; private static File configFile = null; private static long propertiesLastModifyTime = 0l; + private String springProfilesActive = System.getProperty("spring.profiles.active"); public SeedProperties(){} @@ -39,7 +40,8 @@ public class SeedProperties { System.out.println("index :" + index); if(index > 0) configPath = configPath.substring(0, index+7); System.out.println("configPath2 :" + configPath); - configPath = configPath + "/classes/config/seed/config.properties"; + /*configPath = configPath + "/classes/config/seed/config.properties";*/ + configPath = configPath + "/classes/egovframework/egovProps/globals_"+springProfilesActive+".properties"; System.out.println("configPath3 :" + configPath); System.out.println("configProperties load="+configPath); From 48e0e197d606a643098e149c3e9338428f56d86a Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 19 Feb 2025 17:27:38 +0900 Subject: [PATCH 2/3] =?UTF-8?q?pdf=20=EB=B3=80=ED=99=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/pdf/service/impl/PdfServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcc/com/pdf/service/impl/PdfServiceImpl.java b/src/main/java/kcc/com/pdf/service/impl/PdfServiceImpl.java index 94fd9a63..b3df5f24 100644 --- a/src/main/java/kcc/com/pdf/service/impl/PdfServiceImpl.java +++ b/src/main/java/kcc/com/pdf/service/impl/PdfServiceImpl.java @@ -30,6 +30,7 @@ import kcc.com.cmm.LoginVO; import kcc.com.pdf.service.PdfService; import kcc.com.pdf.service.PdfVO; import kcc.com.utl.fcc.service.EgovStringUtil; +import seed.utils.SeedUtils; /* @@ -204,7 +205,7 @@ public class PdfServiceImpl extends EgovAbstractServiceImpl implements PdfServic { PdfVO.Options optionsFileBefore = new PdfVO.Options(); - optionsFileBefore.setMergeSrcUri(hostUri + "/gtm/case/pdfSubjectPop.do?caseNo=" + t.getCodeName()); + optionsFileBefore.setMergeSrcUri(hostUri + "/gtm/case/pdfSubjectPop.do?caseNo=" + SeedUtils.setReplaceNull(t.getCodeName()).replace(" ", "%20")); PdfVO.Option optionFileBefore = new PdfVO.Option(); optionFileBefore.setLabel(t.getCodeName()); optionFileBefore.setHtmlUrlResource(true); From beffc92b292e6a3af404916c56a1bae5e7e0290f Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 20 Feb 2025 11:42:21 +0900 Subject: [PATCH 3/3] Merge branch 'tolag3' --- .../clipreport4/crf/15_1_daytimeBusiness.crf | Bin 605587 -> 609621 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/webapp/WEB-INF/clipreport4/crf/15_1_daytimeBusiness.crf b/src/main/webapp/WEB-INF/clipreport4/crf/15_1_daytimeBusiness.crf index 9ac9b8f7be0a12eb4bf794a29628175df6cfc5de..f58cfcb0192cd653acb664d1dc27b15feb0d0b3f 100644 GIT binary patch delta 10692 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