From 60e06f9d45e2cf10dc30df0a95151f234112bec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 17:32:25 +0900 Subject: [PATCH 1/7] =?UTF-8?q?aws,=20api=20=EB=AA=A8=EB=93=88=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3365d4a0..579bbf68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,8 @@ WORKDIR /app # 소스 디렉토리를 컨테이너에 복사 COPY pom.xml . COPY core ./core -COPY aws ./aws COPY admin ./admin COPY front ./front -COPY api ./api # Maven을 이용해 프로젝트 빌드 RUN mvn --projects $TARGET_MODULE --also-make package -Dmaven.test.skip=true From a64e480ffb350ec66a7599e992178061b717ea66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 08:56:47 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/layout/layout.html | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 116e3144..e5c4c852 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -34,7 +34,6 @@ - From 4b7effad3a974bb1eb667603fc47eb0bf84b804e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 08:59:52 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/layout/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index e5c4c852..637228bb 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -40,6 +40,7 @@ +
From 15b4ac77b4c3bde28521b3a6c786ec30c3114d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 1 Jul 2025 10:55:47 +0900 Subject: [PATCH 4/7] =?UTF-8?q?vm=20=EC=98=B5=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index d8352145..23a754cf 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,12 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요. -Dfile.upload.sftp.id=etribe -Dfile.upload.sftp.password=Etribe@3415 -Dfile.upload.sftp.port=22 +-Dspring.datasource.hikari.maximum-pool-size=10 +-Dspring.datasource.hikari.minimum-idle=5 +-Dspring.datasource.hikari.idle-timeout=120000 +-Dspring.datasource.hikari.max-lifetime=900000 +-Dspring.datasource.hikari.connection-timeout=5000 +-Dspring.datasource.hikari.leak-detection-threshold=30000 ``` ** 주의 : 운영서버일 경우 -Dpath.upload.storage=SFTP로 설정 From ac6cb091c6b9a37dfe4aa24102534648c50aa37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 12:21:48 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[1=EC=B0=A8][DB]=20=EC=9D=BC=EA=B3=84?= =?UTF-8?q?=EB=B6=80=20=EC=A7=80=EC=B6=9C=EC=9D=98=20=EC=9A=A9=EB=8F=84=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B8=B8=EC=9D=B4=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 --- core/src/main/resources/sql/schema/02_create-record.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql index 49418152..398cffdf 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -212,7 +212,7 @@ CREATE TABLE daily_expense ( is_credit bool, -- 외상판매 여부 expense_kind varchar(100), -- 지출의 종류 expense_kind_mark varchar(10), -- 종류 부호 - source_purpose varchar(10), -- 지출원(용도) + source_purpose varchar(100), -- 지출원(용도) quantity varchar(10), -- 수량 unit_code varchar(255), -- 단위(매핑코드) unit_self varchar(100), -- 단위(직접입력) From 7f016af6fc474de6bda3203bc1eecbe9627396f2 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 7 Jul 2025 12:10:38 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[FO]=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20view=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 856896fde3f8a693badf6b587d92e53acd150053) --- .../core/config/adapters/persistence/entity/Household.java | 2 +- .../getUserFront/ports/application/domain/GetUserFront.java | 2 +- front/src/main/resources/mappers/userFront/GetUserMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java index 451785bb..1b196794 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java @@ -41,7 +41,7 @@ public class Household extends AuditEntity { private Integer scaleCode; - private Integer employmentCode; + private Integer employmentType; private Boolean isPanel; diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java b/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java index 6344122f..40a5f8cc 100644 --- a/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java +++ b/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java @@ -29,7 +29,7 @@ public class GetUserFront { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private String employmentCode; + private String employmentType; private Boolean isPanel; private String memo; private String dropReason; diff --git a/front/src/main/resources/mappers/userFront/GetUserMapper.xml b/front/src/main/resources/mappers/userFront/GetUserMapper.xml index e964818e..c56b99b7 100644 --- a/front/src/main/resources/mappers/userFront/GetUserMapper.xml +++ b/front/src/main/resources/mappers/userFront/GetUserMapper.xml @@ -22,7 +22,7 @@ industry_middle_code, industry_sub_middle, industry_detail, - employment_code, + employment_type, is_panel, memo, drop_reason, From 57bbe9d00da242a9ef64b928ffc501086d5a6fc8 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 4 Jul 2025 14:17:03 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[FO]=20=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 741c435687f070836f127ad271523fb98f7b32c9) --- .../getHousehold/ports/application/domain/GetHousehold.java | 2 +- .../src/main/resources/mappers/household/GetHouseholdMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java index 8db76c8a..25820236 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java @@ -32,7 +32,7 @@ public class GetHousehold { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private String employmentCode; + private String employmentType; private Boolean isPanel; private String memo; private String dropReason; diff --git a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml index 36fd2728..93a7544d 100644 --- a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml @@ -22,7 +22,7 @@ h.industry_middle_code, h.industry_sub_middle, h.industry_detail, - h.employment_code, + h.employment_type, h.is_panel, h.memo, h.drop_reason,