Merge pull request #119 from tukcomCD2024/Backend#94/nodejs2

feat : local에서 테스트하기 위한 설정
tukcomCD2024 · Mar 18, 2024 · 34a9cb7 · 34a9cb7
2 parents 7c55cff + 2dda59c
commit 34a9cb7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/backend/shareNote/docker-compose.yml b/backend/shareNote/docker-compose.yml
@@ -24,6 +24,7 @@ services:
     environment:
       S3_ACCESS_KEY: ${S3_ACCESS_KEY}
       S3_SECRET_KEY: ${S3_SECRET_KEY}
+      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
       RABBIT_HOST: rabbitmq
     depends_on:
       - mongodbService

diff --git a/backend/shareNote/src/main/java/com/Backend/shareNote/domain/config/WebConfig.java b/backend/shareNote/src/main/java/com/Backend/shareNote/domain/config/WebConfig.java
@@ -10,7 +10,7 @@ public class WebConfig implements WebMvcConfigurer{
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
 //                .allowedOrigins("http://localhost") // local용
-                .allowedOrigins("http://sharenote.shop","https://sharenote.shop") // 배포시 변경
+                .allowedOrigins("http://sharenote.shop","https://sharenote.shop","http://localhost:3000") // 배포시 변경
                 .allowedMethods("GET", "POST", "PUT", "DELETE")
                 .allowedHeaders("Authorization", "Content-Type")
                 .exposedHeaders("Custom-Header")

diff --git a/frontend/src/Component/Page/Page.js b/frontend/src/Component/Page/Page.js
@@ -77,7 +77,7 @@ function Page() {
     const roomId = noteId;
     const ydoc = getYDocInstance(roomId);
     const provider = new WebsocketProvider(
-      "wss://demos.yjs.dev/ws", // 웹소켓 서버 주소
+      "ws://localhost:4000", // 웹소켓 서버 주소, // 웹소켓 서버 주소
       roomId, // 방 이름
       ydoc
     );

diff --git a/frontend/src/setupProxy.js b/frontend/src/setupProxy.js
@@ -4,7 +4,8 @@ module.exports = function(app) {
   app.use(
     '/api',
     createProxyMiddleware({
-      target: 'https://sharenote.shop:8080',	// 서버 URL or localhost:설정한포트번호
+      target: 'http://localhost:8080',	// 서버 URL or localhost:설정한포트번호
+      //target: 'https://sharenote.shop:8080',	// 서버 URL or localhost:설정한포트번호
       changeOrigin: true,
     })
   );