From 398c76f7db79203790fc0d805c3816eedda8ba75 Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Fri, 7 Nov 2025 13:14:58 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=EB=AC=BC=20=EC=9E=91=EC=84=B1=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/web.xml                     | 18 +++++-------------
 .../portalnotice/PortalNoticeManService.java   | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index aad14c7..f108b9c 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -51,6 +51,11 @@
 	  <filter-name>encodingFilter</filter-name>
 	  <url-pattern>*.file</url-pattern>
 	</filter-mapping>
+	<!-- Tomcat 에서는 필요. Weblogic 에서는 불필요함 -->
+	<filter-mapping>
+	  <filter-name>encodingFilter</filter-name>
+	  <url-pattern>*.json</url-pattern>
+	</filter-mapping>
 
 <!-- 
 	<filter>
@@ -68,19 +73,6 @@
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
 	</listener>
-
-	<!-- Weblogic 14.1.2 서블릿 설정 -->
-<!--
- 	<servlet>
-		<servlet-name>default</servlet-name>
-		<servlet-class>weblogic.servlet.FileServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>default</servlet-name>
-		<url-pattern>/static/*</url-pattern>
-	</servlet-mapping>
- -->    
-
 	<servlet>
 		<servlet-name>springapp</servlet-name>
 		<servlet-class>
diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java
index 9e125a3..64ffe55 100644
--- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java
@@ -5,9 +5,11 @@ import com.eactive.apim.portal.file.entity.FileInfo;
 import com.eactive.apim.portal.file.service.FileService;
 import com.eactive.apim.portal.file.service.FileTypeContext;
 import com.eactive.apim.portal.portalNotice.entity.PortalNotice;
+import com.eactive.eai.common.util.ContainerUtil;
 import com.eactive.eai.rms.common.base.BaseService;
 import com.eactive.eai.rms.data.entity.onl.apim.portalnotice.PortalNoticeService;
 import com.eactive.eai.rms.data.entity.onl.apim.portalnotice.PortalNoticeUISearch;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,19 +20,28 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
 @Service
 @Transactional(transactionManager = "transactionManagerForEMS")
+@Slf4j
 public class PortalNoticeManService extends BaseService {
 	private final PortalNoticeService portalNoticeService;
 	private final PortalNoticeUIMapper portalNoticeUIMapper;
-	private final FileService fileService;
+  	private final FileService fileService;
 
 	private String decodeString(String value) {
-//		return new String(value.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+		if (ContainerUtil.get() == ContainerUtil.TOMCAT) {
+			try {
+				return new String(value.getBytes("euc-kr"), StandardCharsets.UTF_8);
+			} catch (UnsupportedEncodingException e) {
+				log.warn("Failed euc-kr to UTF-8", e);
+				return value;
+			}
+		}
 		return new String(value.getBytes(Charset.defaultCharset()), StandardCharsets.UTF_8);
 	}
 
@@ -102,7 +113,7 @@ public class PortalNoticeManService extends BaseService {
 		if (file != null && !file.isEmpty()) {  // 새로운 파일이 업로드된 경우에만 처리
 			String decodedFileName = decodeString(portalNoticeUI.getFileName());
 			FileTypeContext.setFileType("notice");
-			FileInfo fileInfo = fileService.createOrUpdateSingleFile(portalNotice.getFileId(), file, decodedFileName);
+			FileInfo fileInfo = fileService.createOrUpdateSingleFile(portalNotice.getFileId(), file, decodedFileName, true);
 
 			if (fileInfo != null) {
 				portalNotice.setFileId(fileInfo.getFileId());