Merge pull request #153 from TeamMiso/develop

master 로 머지
TeamMiso · Mar 7, 2024 · 5c080b2 · 5c080b2
2 parents 5759dad + 621cfb4
commit 5c080b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/kotlin/andreas311/miso/domain/user/entity/User.kt b/src/main/kotlin/andreas311/miso/domain/user/entity/User.kt
@@ -14,7 +14,7 @@ class User(
     @GeneratedValue(generator = "uuid2")
     @GenericGenerator(name = "uuid2", strategy = "uuid2")
     @Column(columnDefinition = "BINARY(16)")
-    var id: UUID,
+    val id: UUID,
 
     @Column(name = "email")
     val email: String,

diff --git a/src/main/kotlin/andreas311/miso/global/config/web/WebMvcConfig.kt b/src/main/kotlin/andreas311/miso/global/config/web/WebMvcConfig.kt
@@ -10,7 +10,7 @@ class WebMvcConfig : WebMvcConfigurer {
     override fun addCorsMappings(registry: CorsRegistry) {
 
         registry.addMapping("/**")
-            .allowedOrigins("https://miso-admin.vercel.app", "http://localhost:5173")
+            .allowedOrigins("https://miso-admin.vercel.app", "http://localhost:5173", "http://localhost:3000")
             .allowedMethods("*")
             .allowedHeaders("*")
             .allowCredentials(true)