From b16ba5c6db4185a439d25b78636af9649d7f2dd2 Mon Sep 17 00:00:00 2001 From: mimmimkim Date: Mon, 15 Sep 2025 15:05:49 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EC=A7=80=EB=8F=84=20=EC=9D=B8?= =?UTF-8?q?=ED=8F=AC=EC=9C=88=EB=8F=84=EC=9A=B0=20=EB=84=93=EC=9D=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/assets/css/map.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/WEB-INF/assets/css/map.css b/src/main/webapp/WEB-INF/assets/css/map.css index 463f9c8..41ebc82 100644 --- a/src/main/webapp/WEB-INF/assets/css/map.css +++ b/src/main/webapp/WEB-INF/assets/css/map.css @@ -51,6 +51,7 @@ border:1px solid #eee; } .balloon * { + width:200px; white-space: normal; /* 한 줄 고정 방지 */ word-break: break-word; /* 긴 단어 중간에서도 줄바꿈 */ overflow-wrap: anywhere; /* 브라우저가 어디서든 줄바꿈 허용 */ From a72cbc8d6325e4b27bc7402395fe14be9d072983 Mon Sep 17 00:00:00 2001 From: mimmimkim Date: Mon, 15 Sep 2025 21:39:27 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EC=A7=80=EB=8F=84=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 --- .../app/snapshot/qure/config/AwsConfig.java | 3 +- .../resources/config/mybatis/root-context.xml | 10 +- .../webapp/WEB-INF/views/facilities/map.jsp | 162 +++++++++--------- 3 files changed, 83 insertions(+), 92 deletions(-) diff --git a/src/main/java/app/snapshot/qure/config/AwsConfig.java b/src/main/java/app/snapshot/qure/config/AwsConfig.java index 57c909b..e42eb9d 100644 --- a/src/main/java/app/snapshot/qure/config/AwsConfig.java +++ b/src/main/java/app/snapshot/qure/config/AwsConfig.java @@ -4,13 +4,12 @@ import org.springframework.context.annotation.*; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; @Configuration -@PropertySource("classpath:application-db.properties") // 여길 읽게 함 +@PropertySource("classpath:application.properties") // 여길 읽게 함 public class AwsConfig { // 서블릿 컨텍스트에도 플레이스홀더 해석기를 등록 diff --git a/src/main/resources/config/mybatis/root-context.xml b/src/main/resources/config/mybatis/root-context.xml index 6fc4545..e251aee 100644 --- a/src/main/resources/config/mybatis/root-context.xml +++ b/src/main/resources/config/mybatis/root-context.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/facilities/map.jsp b/src/main/webapp/WEB-INF/views/facilities/map.jsp index 3e100f3..4a681ce 100644 --- a/src/main/webapp/WEB-INF/views/facilities/map.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/map.jsp @@ -18,7 +18,7 @@ - + @@ -44,7 +44,7 @@ - From e352dacc076d303c7dd54f875eca21b6f4dfa6d6 Mon Sep 17 00:00:00 2001 From: mimmimkim Date: Tue, 16 Sep 2025 09:31:18 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=EC=A0=90=EA=B2=80=20=EC=98=88?= =?UTF-8?q?=EC=A0=95=EC=9D=BC=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 - .../resources/mappers/FacilitiesMapper.xml | 51 ++++++++++++------- .../WEB-INF/views/facilities/facilities.jsp | 19 ++++--- .../views/facilities/facilities_detail.jsp | 1 + 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 81a6530..b06b525 100644 --- a/pom.xml +++ b/pom.xml @@ -212,7 +212,6 @@ - qure maven-compiler-plugin diff --git a/src/main/resources/mappers/FacilitiesMapper.xml b/src/main/resources/mappers/FacilitiesMapper.xml index b4c3b67..bce3362 100644 --- a/src/main/resources/mappers/FacilitiesMapper.xml +++ b/src/main/resources/mappers/FacilitiesMapper.xml @@ -348,28 +348,41 @@ + ]]> + + + - + @@ -34,7 +34,7 @@ WHERE TAG_ID = #{tagId} - + UPDATE FACILITY_TAGS SET ACTIVE='N', REVOKED_AT=SYSTIMESTAMP diff --git a/src/main/webapp/WEB-INF/assets/css/facilities.css b/src/main/webapp/WEB-INF/assets/css/facilities.css index 81200c6..d026274 100644 --- a/src/main/webapp/WEB-INF/assets/css/facilities.css +++ b/src/main/webapp/WEB-INF/assets/css/facilities.css @@ -1,5 +1,4 @@ -/* /resources/css/facilities.css */ - +/* 작성자: 김민서 */ :root{ --bg:#f6f6f6; --panel:#ffffff; diff --git a/src/main/webapp/WEB-INF/assets/css/facilities_add.css b/src/main/webapp/WEB-INF/assets/css/facilities_add.css index 1baf4c2..af83bc9 100644 --- a/src/main/webapp/WEB-INF/assets/css/facilities_add.css +++ b/src/main/webapp/WEB-INF/assets/css/facilities_add.css @@ -1,6 +1,4 @@ -/* ===================== facilities_add.css ===================== */ -/* 템플릿 CSS 건드리지 않고 facilities 전용으로 통일 */ - +/* 작성자: 김민서 */ html, body { height: 100%; margin: 0; diff --git a/src/main/webapp/WEB-INF/assets/css/login.css b/src/main/webapp/WEB-INF/assets/css/login.css index 32f7a33..472e57a 100644 --- a/src/main/webapp/WEB-INF/assets/css/login.css +++ b/src/main/webapp/WEB-INF/assets/css/login.css @@ -98,7 +98,6 @@ body { transform: scale(1); opacity: 0.9; } - z-index: 0; } .inner-container { diff --git a/src/main/webapp/WEB-INF/assets/css/map.css b/src/main/webapp/WEB-INF/assets/css/map.css index 41ebc82..1caadc3 100644 --- a/src/main/webapp/WEB-INF/assets/css/map.css +++ b/src/main/webapp/WEB-INF/assets/css/map.css @@ -1,3 +1,4 @@ +/* 작성자: 김민서 */ /* 레이아웃 */ .map-container { display:flex; height:100vh; overflow:hidden; } diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities.jsp index 3f6f971..0e954cf 100644 --- a/src/main/webapp/WEB-INF/views/facilities/facilities.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/facilities.jsp @@ -1,4 +1,6 @@ -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + +%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %> <%@ taglib prefix="fn" uri="jakarta.tags.functions" %> diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp index b636cbf..35a0479 100644 --- a/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp @@ -1,3 +1,5 @@ + + <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp index fef305a..fb557cd 100644 --- a/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp @@ -1,3 +1,5 @@ + + <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %> diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp index 31f93f6..c2cee67 100644 --- a/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp @@ -1,3 +1,5 @@ + + <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> diff --git a/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp b/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp index fd3ca4d..d1ca01d 100644 --- a/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp @@ -1,3 +1,5 @@ + + <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="jakarta.tags.core" %> diff --git a/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp b/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp index 65f203b..aa41705 100644 --- a/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp @@ -1,3 +1,5 @@ + + <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/src/main/webapp/WEB-INF/views/facilities/map.jsp b/src/main/webapp/WEB-INF/views/facilities/map.jsp index 4a681ce..f765913 100644 --- a/src/main/webapp/WEB-INF/views/facilities/map.jsp +++ b/src/main/webapp/WEB-INF/views/facilities/map.jsp @@ -1,3 +1,5 @@ + + <%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> diff --git a/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf b/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf index 01c9cc1..7e98539 100644 --- a/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf +++ b/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf @@ -1,3 +1,5 @@ + + <%@ taglib prefix="c" uri="jakarta.tags.core" %>