Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
19 changes: 9 additions & 10 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ spring:
- swagger.yml
- redis.yml
- auth.yml
- optional:classpath:env.properties
application:
name: taskflow2
name: taskflow
elasticsearch:
uris: ${ELASTIC_URI:127.0.0.1:9200}

Expand All @@ -24,21 +23,21 @@ server:
max: 600
min-spare: 100

logging:
level:
root: INFO
taskflow.clap.server: ERROR
org:
springframework: DEBUG
#logging:
# level:
# root: INFO
# taskflow.clap.server: ERROR
# org:
# springframework: DEBUG

---
spring.config.activate.on-profile: local
logging:
level:
root: INFO
taskflow.clap.server: ERROR
org:
springframework: DEBUG
# org:
# springframework: DEBUG

---
spring.config.activate.on-profile: dev
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spring:

datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflowdev}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true
url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflow}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true
username: ${DATABASE_USERNAME}
password: ${DATABASE_PASSWORD}
data-source-properties:
Expand Down
Loading