From 15a6dba4f37506618ba388c5cee860d842b469f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9E=A5=ED=98=84=EC=88=98?= Date: Wed, 14 Aug 2024 16:54:27 +0900 Subject: [PATCH 1/2] Update Backend-feedme/README.md --- Backend-feedme/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Backend-feedme/README.md b/Backend-feedme/README.md index 9e1f14b..efe1e8a 100644 --- a/Backend-feedme/README.md +++ b/Backend-feedme/README.md @@ -1,2 +1,2 @@ # backend -. +.x From 7d4e2c2955ac7301e848ceb29001a542f9f385c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=98=88=EB=B3=B8?= Date: Wed, 14 Aug 2024 17:07:55 +0900 Subject: [PATCH 2/2] Update Backend-feedme/feedme/src/main/resources/application.yml --- .../feedme/src/main/resources/application.yml | 354 +++++++++--------- 1 file changed, 177 insertions(+), 177 deletions(-) diff --git a/Backend-feedme/feedme/src/main/resources/application.yml b/Backend-feedme/feedme/src/main/resources/application.yml index 4d67da2..dfefdd1 100644 --- a/Backend-feedme/feedme/src/main/resources/application.yml +++ b/Backend-feedme/feedme/src/main/resources/application.yml @@ -1,184 +1,184 @@ +# spring: +# application: +# name: feedme +# admin: +# enabled: false # Spring Boot Admin 비활성화 +# jmx: +# enabled: false # JMX 비활성화 +# main: +# application-class: com.todoslave.FeedmeApplication + +# security: +# oauth2: +# client: +# registration: +# naver: +# client-id: ${NAVER_CLIENT_ID} +# client-secret: ${NAVER_CLIENT_SECRET} +# client-name: Naver +# redirect-uri: http://localhost:8080/login/oauth2/code/naver +# authorization-grant-type: authorization_code +# scope: +# - name +# - email +# kakao: +# client-id: ${KAKAO_CLIENT_ID} +# client-secret: ${KAKAO_CLIENT_SECRET} +# client-name: Kakao +# client-authentication-method: client_secret_post +# redirect-uri: http://localhost:8080/login/oauth2/code/kakao +# authorization-grant-type: authorization_code +# scope: +# - profile_nickname +# - account_email +# provider: +# naver: +# authorization-uri: https://nid.naver.com/oauth2.0/authorize +# token-uri: https://nid.naver.com/oauth2.0/token +# user-info-uri: https://openapi.naver.com/v1/nid/me +# user-name-attribute: response +# kakao: +# authorizationUri: https://kauth.kakao.com/oauth/authorize +# tokenUri: https://kauth.kakao.com/oauth/token +# userInfoUri: https://kapi.kakao.com/v2/user/me +# userNameAttribute: id + +# datasource: +# url: jdbc:mysql://localhost:3306/feedme +# username: ${DB_USERNAME} +# password: ${DB_PASSWORD} +# driver-class-name: com.mysql.cj.jdbc.Driver + +# data: +# mongodb: +# host: localhost +# port: 27017 +# database: feedme +# uri: mongodb://localhost:27017/feedme + +# jpa: +# hibernate: +# ddl-auto: update +# show-sql: true +# properties: +# hibernate: +# dialect: org.hibernate.dialect.MySQL8Dialect +# format_sql: true + +# logging: +# level: +# org: +# hibernate: +# SQL: debug +# type: trace + +# redis: +# host: localhost +# port: 6379 + +# jwt: +# issuer: todoslave@ssafy.com +# secret_key: ${JWT_SECRET_KEY} + + +# #이건 살림 +# openai: +# model: "gpt-3.5-turbo" +# api: +# key: ${GPT_SECRET_KEY} +# url: "https://api.openai.com/v1/chat/completions" + + + + spring: - application: - name: feedme - admin: - enabled: false # Spring Boot Admin 비활성화 - jmx: - enabled: false # JMX 비활성화 - main: - application-class: com.todoslave.FeedmeApplication - - security: - oauth2: - client: - registration: - naver: - client-id: ${NAVER_CLIENT_ID} - client-secret: ${NAVER_CLIENT_SECRET} - client-name: Naver - redirect-uri: http://localhost:8080/login/oauth2/code/naver - authorization-grant-type: authorization_code - scope: - - name - - email - kakao: - client-id: ${KAKAO_CLIENT_ID} - client-secret: ${KAKAO_CLIENT_SECRET} - client-name: Kakao - client-authentication-method: client_secret_post - redirect-uri: http://localhost:8080/login/oauth2/code/kakao - authorization-grant-type: authorization_code - scope: - - profile_nickname - - account_email - provider: - naver: - authorization-uri: https://nid.naver.com/oauth2.0/authorize - token-uri: https://nid.naver.com/oauth2.0/token - user-info-uri: https://openapi.naver.com/v1/nid/me - user-name-attribute: response - kakao: - authorizationUri: https://kauth.kakao.com/oauth/authorize - tokenUri: https://kauth.kakao.com/oauth/token - userInfoUri: https://kapi.kakao.com/v2/user/me - userNameAttribute: id - - datasource: - url: jdbc:mysql://localhost:3306/feedme - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - driver-class-name: com.mysql.cj.jdbc.Driver - - data: - mongodb: - host: localhost - port: 27017 - database: feedme - uri: mongodb://localhost:27017/feedme - - jpa: - hibernate: - ddl-auto: update - show-sql: true - properties: - hibernate: - dialect: org.hibernate.dialect.MySQL8Dialect - format_sql: true + application: + name: feedme + admin: + enabled: false # Spring Boot Admin 비활성화 + jmx: + enabled: false # JMX 비활성화 + main: + application-class: com.todoslave.FeedmeApplication + allow-circular-references: true #뺄지도? + security: + oauth2: + client: + registration: + naver: + client-id: ${NAVER_CLIENT_ID} + client-secret: ${NAVER_CLIENT_SECRET} + client-name: Naver + redirect-uri: https://i11b104.p.ssafy.io/api/login/oauth2/code/naver + authorization-grant-type: authorization_code + scope: + - name + - email + kakao: + client-id: ${KAKAO_CLIENT_ID} + client-secret: ${KAKAO_CLIENT_SECRET} + client-name: Kakao + client-authentication-method: client_secret_post + redirect-uri: https://i11b104.p.ssafy.io/api/login/oauth2/code/kakao + authorization-grant-type: authorization_code + scope: + - profile_nickname + - account_email + provider: + naver: + authorization-uri: https://nid.naver.com/oauth2.0/authorize + token-uri: https://nid.naver.com/oauth2.0/token + user-info-uri: https://openapi.naver.com/v1/nid/me + user-name-attribute: response + kakao: + authorizationUri: https://kauth.kakao.com/oauth/authorize + tokenUri: https://kauth.kakao.com/oauth/token + userInfoUri: https://kapi.kakao.com/v2/user/me + userNameAttribute: id -logging: - level: - org: - hibernate: - SQL: debug - type: trace + datasource: + url: jdbc:mysql://mysql:3306/feedme # MySQL 컨테이너 이름 사용 + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver -redis: - host: localhost - port: 6379 + data: + mongodb: + host: mongodb # MongoDB 컨테이너 이름 사용 + port: 27017 + database: feedme + uri: mongodb://mongodb:27017/feedme + + redis: + host: redis + port: 6379 -jwt: - issuer: todoslave@ssafy.com - secret_key: ${JWT_SECRET_KEY} + jpa: + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + format_sql: true + +logging: + level: + org: + hibernate: + SQL: debug + type: trace + +jwt: + issuer: todoslave@ssafy.com + secret_key: ${JWT_SECRET_KEY} - #이건 살림 openai: - model: "gpt-3.5-turbo" - api: - key: ${GPT_SECRET_KEY} - url: "https://api.openai.com/v1/chat/completions" - - - - -#spring: -# application: -# name: feedme -# admin: -# enabled: false # Spring Boot Admin 비활성화 -# jmx: -# enabled: false # JMX 비활성화 -# main: -# application-class: com.todoslave.FeedmeApplication -# allow-circular-references: true #뺄지도? -# security: -# oauth2: -# client: -# registration: -# naver: -# client-id: ${NAVER_CLIENT_ID} -# client-secret: ${NAVER_CLIENT_SECRET} -# client-name: Naver -# redirect-uri: https://i11b104.p.ssafy.io/api/login/oauth2/code/naver -# authorization-grant-type: authorization_code -# scope: -# - name -# - email -# kakao: -# client-id: ${KAKAO_CLIENT_ID} -# client-secret: ${KAKAO_CLIENT_SECRET} -# client-name: Kakao -# client-authentication-method: client_secret_post -# redirect-uri: https://i11b104.p.ssafy.io/api/login/oauth2/code/kakao -# authorization-grant-type: authorization_code -# scope: -# - profile_nickname -# - account_email -# provider: -# naver: -# authorization-uri: https://nid.naver.com/oauth2.0/authorize -# token-uri: https://nid.naver.com/oauth2.0/token -# user-info-uri: https://openapi.naver.com/v1/nid/me -# user-name-attribute: response -# kakao: -# authorizationUri: https://kauth.kakao.com/oauth/authorize -# tokenUri: https://kauth.kakao.com/oauth/token -# userInfoUri: https://kapi.kakao.com/v2/user/me -# userNameAttribute: id -# -# datasource: -# url: jdbc:mysql://mysql:3306/feedme # MySQL 컨테이너 이름 사용 -# username: ${DB_USERNAME} -# password: ${DB_PASSWORD} -# driver-class-name: com.mysql.cj.jdbc.Driver -# -# data: -# mongodb: -# host: mongodb # MongoDB 컨테이너 이름 사용 -# port: 27017 -# database: feedme -# uri: mongodb://mongodb:27017/feedme -# -# redis: -# host: redis -# port: 6379 -# -# -# jpa: -# hibernate: -# ddl-auto: update -# show-sql: true -# properties: -# hibernate: -# dialect: org.hibernate.dialect.MySQL8Dialect -# format_sql: true -# -#logging: -# level: -# org: -# hibernate: -# SQL: debug -# type: trace -# -#jwt: -# issuer: todoslave@ssafy.com -# secret_key: ${JWT_SECRET_KEY} -# -#openai: -# model: "gpt-3.5-turbo" -# api: -# key: ${GPT_SECRET_KEY} -# url: "https://api.openai.com/v1/chat/completions" -# -#server: -# port: 8085 + model: "gpt-3.5-turbo" + api: + key: ${GPT_SECRET_KEY} + url: "https://api.openai.com/v1/chat/completions" + +server: + port: 8085