Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test #125

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Test #125

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
docker pull ${{ secrets.DOCKER_USERNAME }}/dev:latest
docker stop app || true
docker rm app || true
docker run -d --name app --network monitoring -p 8080:8080 \
docker run -d --name app --network host \
--env-file /home/ubuntu/.env \
-v /home/ubuntu/cert:/cert \
-v /var/logs:/logs \
Expand Down
2 changes: 2 additions & 0 deletions core/core-api/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ server:
threads:
max: 600
min-spare: 100
max-keep-alive-requests: 1000
keep-alive-timeout: 30000

---
spring.config.activate.on-profile: local
Expand Down
1 change: 0 additions & 1 deletion core/core-domain/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
dependencies {
implementation("org.springframework.boot:spring-boot-starter")

// JWT
api("io.jsonwebtoken:jjwt-api:0.12.6")
api("io.jsonwebtoken:jjwt-impl:0.12.6")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,5 @@ class BusLocationService {
*
* @return 모든 버스의 위치 정보 리스트
*/
fun getBusLocations(): List<com.myongjiway.core.domain.buslocation.BusLocation> {
return busLocationMap.values.toList()
}
fun getBusLocations(): List<com.myongjiway.core.domain.buslocation.BusLocation> = busLocationMap.values.toList()
}
3 changes: 2 additions & 1 deletion storage/db-core/src/main/resources/db-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ storage:
jdbc-url: jdbc:mysql://${STORAGE_DATABASE_CORE_DB_URL}
username: ${STORAGE_DATABASE_CORE_DB_USERNAME}
password: ${STORAGE_DATABASE_CORE_DB_PASSWORD}
maximum-pool-size: 25
maximum-pool-size: 150
minimum-idle: 100
connection-timeout: 1100
keepalive-time: 30000
validation-timeout: 1000
Expand Down
Loading