diff --git a/apps/user-service/build.gradle b/apps/user-service/build.gradle index 3596f42d..e3edefa5 100644 --- a/apps/user-service/build.gradle +++ b/apps/user-service/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-aop' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.h2database:h2' + runtimeOnly 'org.postgresql:postgresql' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.boot:spring-boot-testcontainers' diff --git a/apps/user-service/src/main/resources/application-develop.yml b/apps/user-service/src/main/resources/application-develop.yml index e69de29b..e6d842e0 100644 --- a/apps/user-service/src/main/resources/application-develop.yml +++ b/apps/user-service/src/main/resources/application-develop.yml @@ -0,0 +1,36 @@ +# application-develop.yml +spring: + config: + activate: + on-profile: develop + + # PostgreSQL 데이터베이스 연결 설정 + datasource: + url: jdbc:postgresql://localhost:5432/pre_process + username: postgres + password: password123 + driver-class-name: org.postgresql.Driver + + hikari: + connection-timeout: 30000 + idle-timeout: 600000 + max-lifetime: 1800000 + maximum-pool-size: 10 + minimum-idle: 5 + pool-name: HikariCP-MyBatis + + # JPA/Hibernate 설정 + jpa: + hibernate: + ddl-auto: update # create, create-drop, update, validate, none + show-sql: true + format-sql: true + database: postgresql + database-platform: org.hibernate.dialect.PostgreSQLDialect + properties: + hibernate: + format_sql: true + use_sql_comments: true + jdbc: + lob: + non_contextual_creation: true \ No newline at end of file diff --git a/apps/user-service/src/main/resources/application.properties b/apps/user-service/src/main/resources/application.properties deleted file mode 100644 index 79b5bda2..00000000 --- a/apps/user-service/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=user-service diff --git a/apps/user-service/src/main/resources/application.yml b/apps/user-service/src/main/resources/application.yml index e69de29b..278dfb11 100644 --- a/apps/user-service/src/main/resources/application.yml +++ b/apps/user-service/src/main/resources/application.yml @@ -0,0 +1,8 @@ +spring: + application: + name: mvp + profiles: + active: develop +mybatis: + # Mapper XML 파일 위치 + mapper-locations: classpath:mapper/**/*.xml \ No newline at end of file diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml index 4894236b..62dabdd0 100644 --- a/docker/local/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -28,7 +28,7 @@ services: PGADMIN_DEFAULT_EMAIL: admin@example.com PGADMIN_DEFAULT_PASSWORD: qwer1234 ports: - - "8080:80" + - "8888:80" volumes: - pgadmin_data:/var/lib/pgadmin depends_on: