diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java index 02e76454..d4fde3af 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java @@ -112,6 +112,12 @@ public class DntController { @Resource(name = "egovCryptoUtil") private EgovCryptoUtil egovCryptoUtil; + @Value("#{globalSettings['Globals.ozFont']}") + private String ozFont; + + @Value("#{globalSettings['Globals.ozFontPath']}") + private String ozFontPath; + /** * 기일지정 상세 TODO daenge 기일지정 상세 * @@ -518,6 +524,11 @@ public class DntController { String serverName = req.getServerName(); String ozServerNm = IpUtil.getOzServerName(serverName); model.addAttribute("ozServerNm", ozServerNm); + + //오즈리포트 폰트 + model.addAttribute("ozFont", ozFont); + //오즈리포트 폰트 경로 + model.addAttribute("ozFontPath", ozFontPath); /* * 2022.01.06 우영두 추가 diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 3b2d8fec..3ffcb1e0 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -168,4 +168,13 @@ Globals.pdf.webpath=/pdf/out/ #\uac1c\ubc1c\uc11c\ubc84 Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 -#Globals.prod.islocal=real \ No newline at end of file +#Globals.prod.islocal=real + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c +#\uac1c\ubc1c\uc11c\ubc84 +Globals.ozFontPath=/home/oz80/fontTestDir/ +#\uc2e4\uc11c\ubc84 +#Globals.ozFontPath=/home/oz80/fontTestDir/ + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958 +Globals.ozFont=NanumSquareR.ttf \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 36fb1d53..8c683283 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -168,4 +168,13 @@ Globals.pdf.webpath=/pdf/out/ #\uac1c\ubc1c\uc11c\ubc84 Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 -#Globals.prod.islocal=real \ No newline at end of file +#Globals.prod.islocal=real + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c +#\uac1c\ubc1c\uc11c\ubc84 +Globals.ozFontPath=/home/oz80/fontTestDir/ +#\uc2e4\uc11c\ubc84 +#Globals.ozFontPath=/home/oz80/fontTestDir/ + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958 +Globals.ozFont=NanumSquareR.ttf \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index d40eb2aa..92cee3ba 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -168,4 +168,13 @@ Globals.pdf.webpath=/pdf/out/ #\uac1c\ubc1c\uc11c\ubc84 Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 -#Globals.prod.islocal=real \ No newline at end of file +#Globals.prod.islocal=real + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c +#\uac1c\ubc1c\uc11c\ubc84 +Globals.ozFontPath=/home/oz80/fontTestDir/ +#\uc2e4\uc11c\ubc84 +#Globals.ozFontPath=/home/oz80/fontTestDir/ + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958 +Globals.ozFont=NanumSquareR.ttf \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 0c91f0f0..f289b79c 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -166,4 +166,13 @@ Globals.pdf.webpath=/pdf/out/ #\uac1c\ubc1c\uc11c\ubc84 #Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 -Globals.prod.islocal=real \ No newline at end of file +Globals.prod.islocal=real + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c +#\uac1c\ubc1c\uc11c\ubc84 +#Globals.ozFontPath=/home/oz80/fontTestDir/ +#\uc2e4\uc11c\ubc84 +Globals.ozFontPath=/home/oz80/fontTestDir/ + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958 +Globals.ozFont=NanumSquareR.ttf \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml index 0cc7381b..c9914ee0 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml @@ -5,7 +5,6 @@ - adr_sbmt_line_mgr_usr diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp index eead8918..f6c0db8c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp @@ -150,7 +150,7 @@ - +