From 6d208e0e745645d867ee9c68fd08f42c23b19115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 30 Jul 2025 10:44:54 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=EB=93=9C=EB=AF=B8=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 --- README.md | 13 +++--- .../mappers/researcher/ResearcherMapper.xml | 5 +-- docs/tomcat/front/setenv.sh | 3 +- .../web/EditorImageUploadController.java | 40 ------------------- 4 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java diff --git a/README.md b/README.md index 37f2f2b0..95a2aeed 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ ## πŸ“Œ ν”„λ‘œμ νŠΈ κ°œμš” -**KOREA-RESEARCH**λŠ” **ν—₯사고날 μ•„ν‚€ν…μ²˜(Ports & Adapters)** 기반의 Spring Boot λ©€ν‹°λͺ¨λ“ˆ μ‹œμŠ€ν…œμž…λ‹ˆλ‹€. -도메인 둜직과 μ™ΈλΆ€ μ˜μ‘΄μ„±μ„ λͺ…ν™•νžˆ λΆ„λ¦¬ν•˜μ—¬ **μœ μ§€λ³΄μˆ˜μ„±κ³Ό ν™•μž₯μ„±**을 κ·ΉλŒ€ν™”ν•˜μ˜€μŠ΅λ‹ˆλ‹€. +**KOREA-RESEARCH**λŠ” μž„κ°€ νŒ¨λ„μ˜ 일계뢀 μˆ˜μ§‘ 및 관리λ₯Ό μœ„ν•œ μ‹œμŠ€ν…œμž…λ‹ˆλ‹€. +이 μ‹œμŠ€ν…œμ€ ν—₯사고날 μ•„ν‚€ν…μ²˜(Ports & Adapters) νŒ¨ν„΄μ„ μ μš©ν•œ Spring Boot 기반의 λ©€ν‹°λͺ¨λ“ˆ ν”„λ ˆμž„μ›Œν¬λ₯Ό 기반으둜 ν•˜μ—¬ μž‘μ„± λ˜μ—ˆμŠ΅λ‹ˆλ‹€. --- @@ -25,7 +25,7 @@ ``` -> λͺ¨λ“  μ• ν”Œλ¦¬μΌ€μ΄μ…˜μ€ `core` λͺ¨λ“ˆμ„ μ€‘μ‹¬μœΌλ‘œ μœ μ¦ˆμΌ€μ΄μŠ€, 포트, μ–΄λŒ‘ν„° ꡬ쑰둜 κ΅¬μ„±λ©λ‹ˆλ‹€. +> λͺ¨λ“  μ• ν”Œλ¦¬μΌ€μ΄μ…˜μ€ `core` λͺ¨λ“ˆμ„ μ€‘μ‹¬μœΌλ‘œ 포트, μ–΄λŒ‘ν„° ꡬ쑰둜 κ΅¬μ„±λ©λ‹ˆλ‹€. ### πŸ“¦ ν—₯사고날 ꡬ쑰 μ˜ˆμ‹œ @@ -66,7 +66,7 @@ usecase/ ## πŸ’» 둜컬 ꡬ동 μ‹œ ν•„μˆ˜ μ„€μ • -둜컬 ν™˜κ²½μ—μ„œ ꡬ동 μ‹œ μ•„λž˜ JVM μ˜΅μ…˜λ“€μ„ ν™˜κ²½μ— 맞게 μ„€μ •ν•΄ μ£Όμ„Έμš”: +둜컬 ν™˜κ²½μ—μ„œ ꡬ동 μ‹œ μ•„λž˜ JVM μ˜΅μ…˜λ“€μ„ ν™˜κ²½μ— 맞게 μ„€μ •ν•΄ μ£Όμ„Έμš” ```bash -Dspring.profiles.active=local @@ -76,7 +76,6 @@ usecase/ -Djasypt.encryptor.algorithm=PBEWITHHMACSHA512ANDAES_256 ``` - > πŸ’‘ `-Djasypt.encryptor.password`와 `-Djasypt.encryptor.algorithm`λŠ” ν™˜κ²½μ— 따라 **μˆ˜μ • κ°€λŠ₯**ν•©λ‹ˆλ‹€. --- @@ -281,8 +280,8 @@ $ mvn clean package -P war ## 🧾 μš΄μ˜μ„œλ²„ μž„κ°€ 계정 λͺ©λ‘ -| κ°€κ΅¬λ²ˆν˜Έ | λΉ„λ°€λ²ˆν˜Έ | -| ------- | ------ | +| μž„κ°€λ²ˆν˜Έ | λΉ„λ°€λ²ˆν˜Έ | +|---------| ------ | | `22221` | `1111` | | `22222` | `1111` | diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index cb1aa1bd..6bd2e7c9 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -337,7 +337,6 @@ h.is_panel AS isPanel, r.researcher_name AS researcherName FROM v_household_with_code h - LEFT JOIN v_household_visit v ON h.seq = v.household_seq LEFT JOIN v_household_researcher r ON h.seq = r.household_seq ) AS hvr @@ -386,10 +385,10 @@ /* λ§΅ν•‘ μ—¬λΆ€ */ - AND r.researcher_name is not null + AND hvr.researcher_name is not null - AND r.researcher_name is null + AND hvr.researcher_name is null diff --git a/docs/tomcat/front/setenv.sh b/docs/tomcat/front/setenv.sh index 4abeacaf..664c070f 100644 --- a/docs/tomcat/front/setenv.sh +++ b/docs/tomcat/front/setenv.sh @@ -5,8 +5,9 @@ export CATALINA_OPTS="$CATALINA_OPTS \ -Dlogging.level.org.springframework.security=DEBUG \ -Dfile.encoding=UTF-8 \ -Djava.net.preferIPv4Stack=true \ +-Daes.secret-key=092HW829O0A0AVR0 \ +-Dpath.upload.storage=LOCAL \ -Dpath.upload.public=/home/etribe/data/upload \ -Dpath.upload.tmpdir=/home/etribe/data/upload/tmp \ --Daes.secret-key=092HW829O0A0AVR0 \ -Djasypt.encryptor.password=ko-research \ -Djasypt.encryptor.algorithm=PBEWITHHMACSHA512ANDAES_256" diff --git a/front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java b/front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java deleted file mode 100644 index a904bab7..00000000 --- a/front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java +++ /dev/null @@ -1,40 +0,0 @@ -package app.module.front.usecase.editor.adapters.web; - -import app.module.core.config.application.enums.FileStorageType; -import app.module.core.config.application.enums.FileUploadType; -import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn; -import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; -import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; - -@Controller -@RequiredArgsConstructor -public class EditorImageUploadController { - - private final SaveToStoragePortIn saveToStoragePortIn; - private final FileUrlPortIn fileUrlPortIn; - - @Value("${path.upload.storage}") - private String uploadStorageType; - - @PostMapping(path = "/api/front/editorImage/upload") - ResponseEntity editorImageUpload(MultipartFile editorImage) throws IOException { - SaveToStorage saveToStorage = - saveToStoragePortIn.operate(FileUploadType.EDITOR_IMAGE, editorImage).orElseThrow(); - - return ResponseEntity.status(HttpStatus.OK) - .body( - fileUrlPortIn.getInline( - FileStorageType.valueOf(uploadStorageType), - saveToStorage.getPath(), - saveToStorage.getName())); - } -}