diff --git a/scripts/deploy.sh b/scripts/deploy.sh index cb66bf6..77034ff 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -11,7 +11,7 @@ DEPLOY_PATH=$BASE_PATH/jar/ cp $BUILD_PATH $DEPLOY_PATH echo "> 현재 구동중인 Set 확인" >> /home/ec2-user/deploy.log -CURRENT_PROFILE=$(curl -s https://feedb.shop/nginx/profile) +CURRENT_PROFILE=$(curl -s https://feedb.store/nginx/profile) echo "> $CURRENT_PROFILE" >> /home/ec2-user/deploy.log # 쉬고 있는 set 찾기: set1이 사용중이면 set2가 쉬고 있고 , 반대면 set1이 쉬고 있음 diff --git a/scripts/switch.sh b/scripts/switch.sh index 1e31a96..5847dd3 100644 --- a/scripts/switch.sh +++ b/scripts/switch.sh @@ -1,6 +1,6 @@ echo "> ============ switch.sh 실행 (nignx 동적 프록시 설정) ==============" >> /home/ec2-user/deploy.log echo "> 현재 구동중인 Port 확인" >> /home/ec2-user/deploy.log -CURRENT_PROFILE=$(curl -s https://feedb.shop/nginx/profile) +CURRENT_PROFILE=$(curl -s https://feedb.store/nginx/profile) # 쉬고 있는 set 찾기: set1이 사용중이면 set2가 쉬고 있고, 반대면 set1이 쉬고 있음 if [ $CURRENT_PROFILE == set1 ] @@ -19,7 +19,7 @@ echo "> 전환할 Port: $IDLE_PORT" >> /home/ec2-user/deploy.log echo "> Port 전환" >> /home/ec2-user/deploy.log echo "set \$service_url http://127.0.0.1:${IDLE_PORT};" |sudo tee /etc/nginx/conf.d/service-url.inc -PROXY_PORT=$(curl -s https://feedb.shop/nginx/profile) +PROXY_PORT=$(curl -s https://feedb.store/nginx/profile) echo "> Nginx Current Proxy Port: $PROXY_PORT" >> /home/ec2-user/deploy.log echo "> Nginx Reload" >> /home/ec2-user/deploy.log diff --git a/src/main/java/com/example/team_12_be/config/SwaggerConfig.java b/src/main/java/com/example/team_12_be/config/SwaggerConfig.java index 2b70cb2..a348814 100644 --- a/src/main/java/com/example/team_12_be/config/SwaggerConfig.java +++ b/src/main/java/com/example/team_12_be/config/SwaggerConfig.java @@ -9,7 +9,7 @@ @Configuration @OpenAPIDefinition(info = @Info(version = "1.0"), - servers = {@Server(url = "https://feedb.shop", description = "HTTPS Server"), + servers = {@Server(url = "https://feedb.store", description = "HTTPS Server"), @Server(url = "http://localhost:8080", description = "Local Development server(백엔드 개발용)")}) @SecurityScheme( diff --git a/src/main/java/com/example/team_12_be/security/SpringSecurityConfig.java b/src/main/java/com/example/team_12_be/security/SpringSecurityConfig.java index 5931d9f..b35a8fd 100644 --- a/src/main/java/com/example/team_12_be/security/SpringSecurityConfig.java +++ b/src/main/java/com/example/team_12_be/security/SpringSecurityConfig.java @@ -70,7 +70,7 @@ CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); // TODO : 도메인 설정 완료 시 변경 할 것 configuration.setAllowedHeaders(List.of("*")); - configuration.setAllowedOrigins(List.of("http://localhost:3000", "https://feedb.vercel.app" , "https://feedb.shop")); + configuration.setAllowedOrigins(List.of("http://localhost:3000", "https://feedb.vercel.app" , "https://feedb.store")); configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")); configuration.setExposedHeaders(List.of("*")); configuration.setAllowCredentials(true); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5873e7b..2432985 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -21,14 +21,14 @@ spring: client: registration: naver: - client-id: moMQFUSHmEQLJ24OlDhj - client-secret: HupMrYC8yt #TODO 외부 노출 방지 필요 + client-id: PRkVouR_ApYaBb4gie9c + client-secret: BgKCW4JtK3 #TODO 외부 노출 방지 필요 redirect-uri: http://localhost:8080/login/oauth2/code/naver #고정값(운영일 때 profile에 맞춰 변경) authorization-grant-type: authorization_code scope: name , email client-name: Naver kakao: - client-id: 1e8cf90e4a41d3250b08438a95b69f98 + client-id: bd9657b9f9347732e4f6bf1eb2e62c4d redirect-uri: http://localhost:8080/login/oauth2/code/kakao #고정값(운영일 때 profile에 맞춰 변경) authorization-grant-type: authorization_code scope: profile_nickname , account_email #profile_nickname diff --git a/src/main/resources/nginx-set.yml b/src/main/resources/nginx-set.yml index 647a761..b0237da 100644 --- a/src/main/resources/nginx-set.yml +++ b/src/main/resources/nginx-set.yml @@ -7,8 +7,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://feedb-db.cjos0aaae8c0.ap-northeast-2.rds.amazonaws.com:3306/feedb_db?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true - username: feedB_user - password: feedb_codeit + username: admin + password: GUP4jLy1bBKzdwOSENVU jpa: hibernate: ddl-auto: update @@ -21,9 +21,9 @@ spring: client: registration: naver: - redirect-uri: https://feedb.shop/login/oauth2/code/naver + redirect-uri: https://feedb.store/login/oauth2/code/naver kakao: - redirect-uri: https://feedb.shop/login/oauth2/code/kakao + redirect-uri: https://feedb.store/login/oauth2/code/kakao server: port: 8081 @@ -35,8 +35,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://feedb-db.cjos0aaae8c0.ap-northeast-2.rds.amazonaws.com:3306/feedb_db?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true - username: feedB_user - password: feedb_codeit + username: admin + password: GUP4jLy1bBKzdwOSENVU jpa: hibernate: ddl-auto: update @@ -49,8 +49,8 @@ spring: client: registration: naver: - redirect-uri: https://feedb.shop/login/oauth2/code/naver + redirect-uri: https://feedb.store/login/oauth2/code/naver kakao: - redirect-uri: https://feedb.shop/login/oauth2/code/kakao + redirect-uri: https://feedb.store/login/oauth2/code/kakao server: port: 8082