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 diff --git a/README.md b/README.md index 8552712a..287b1ef1 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,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 ``` ** 주의 : 운영서버일 경우 vm옵션 추가 -Dspring.profiles.active=prod 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), -- 단위(직접입력) diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index b2a87d89..c376876e 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -35,13 +35,13 @@ - +