diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 056ab64..83d92f3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,13 +1,11 @@ spring: cache: type: simple - config: - import: "optional:application-secret.yml" datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/bloom - username: root - password: jiwon1923 + url: ${SPRING_DATASOURCE_URL} + username: ${SPRING_DATASOURCE_USERNAME} + password: ${SPRING_DATASOURCE_PASSWORD} jpa: hibernate: ddl-auto: update @@ -26,15 +24,38 @@ spring: max-request-size: 10MB data: redis: - host: localhost - port: 6379 + host: ${SPRING_DATA_REDIS_HOST:localhost} + port: ${SPRING_DATA_REDIS_PORT:6379} timeout: 6000ms oauth: kakao: + client-id: ${OAUTH_KAKAO_CLIENT_ID} + client-secret: ${OAUTH_KAKAO_CLIENT_SECRET} + redirect-uri: ${OAUTH_KAKAO_REDIRECT_URI} uri: - authorization-url: https://kauth.kakao.com/oauth/authorize token-url: https://kauth.kakao.com/oauth/token user-info-url: https://kapi.kakao.com/v2/user/me - user-name-attribute: id +jwt: + secret_key: ${JWT_SECRET_KEY} + access_token: + valid_time: ${JWT_ACCESS_TOKEN_VALID_TIME} + refresh_token: + valid_time: ${JWT_REFRESH_TOKEN_VALID_TIME} + +cloud: + aws: + credentials: + access-key: ${CLOUD_AWS_CREDENTIALS_ACCESS_KEY} + secret-key: ${CLOUD_AWS_CREDENTIALS_SECRET_KEY} + region: + static: ap-northeast-2 + stack: + auto: false + s3: + bucket: ${CLOUD_AWS_S3_BUCKET_NAME} + +ai: + api: + key: ${AI_API_KEY} \ No newline at end of file diff --git a/src/test/resources/application-secret.yml b/src/test/resources/application-secret.yml deleted file mode 100644 index 84bc6cc..0000000 --- a/src/test/resources/application-secret.yml +++ /dev/null @@ -1,34 +0,0 @@ -oauth: - kakao: - client-id: 1234 - client-secret: 1234 - redirect-uri: http://localhost:8080/api/auth/oauth/kakao - -jwt: - secret_key: dG9rZW5fa2V5X2Zvcl9ibG9vbTI0MDkwN19kRzlyWlc1ZmEyVjVYMlp2Y2w5aWJHOXZiVEkwTURrd053 - access_token: - valid_time: 604800000 - refresh_token: - valid_time: 604800000 - -cloud: - aws: - credentials: - access-key: 1234 - secret-key: 1234 - region: - static: ap-northeast-2 - stack: - auto: false - s3: - bucket: 1234 - -ai: - api: - key: 1234 - -claude: - api: - key: 1234 - model: 1234 - anthropic-version: 1234 \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index c8b09be..dea8ea4 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -1,6 +1,6 @@ spring: - config: - import: "optional:application-secret.yml" + cache: + type: simple datasource: driver-class-name: org.h2.Driver url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MODE=MYSQL @@ -32,8 +32,31 @@ spring: oauth: kakao: + client-id: 1234 + redirect-uri: http://localhost:8080/api/auth/oauth/kakao uri: - authorization-url: https://kauth.kakao.com/oauth/authorize token-url: https://kauth.kakao.com/oauth/token user-info-url: https://kapi.kakao.com/v2/user/me - user-name-attribute: id \ No newline at end of file + +jwt: + secret_key: dG9rZW5fa2V5X2Zvcl9ibG9vbTI0MDkwN19kRzlyWlc1ZmEyVjVYMlp2Y2w5aWJHOXZiVEkwTURrd053 # 테스트용 + access_token: + valid_time: 1800 # 30분 (30 * 60) + refresh_token: + valid_time: 604800 # 7일 (7 * 24 * 60 * 60) + +cloud: + aws: + credentials: + access-key: 1234 + secret-key: 1234 + region: + static: ap-northeast-2 + stack: + auto: false + s3: + bucket: 1234 + +ai: + api: + key: 1234 \ No newline at end of file