Skip to content

Commit

Permalink
Merge pull request #63 from Kusitms-28th-Kukathon-F/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
OJOJIN authored Oct 7, 2023
2 parents 9dc7983 + 23a0090 commit d650a1f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/main/java/kusitms/server/domain/cafe/entity/Cafe.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ public class Cafe {
private String cafeName;

@Column(name="latitude")
private Long latitude;
private Double latitude;

@Column(name="longitude")
private Long longitude;
private Double longitude;

@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/kusitms/server/domain/global/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ public class WebConfig implements WebMvcConfigurer {
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
// .allowedOriginPatterns("https://kusitms.shop/swagger-ui/**")
.allowedOrigins("http://localhost:5173", "https://kusitms.shop")
.allowedOrigins("http://localhost:5173", "https://kusitms.shop", "https://tumbly.vercel.app")
.allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
.allowCredentials(true)
.allowedHeaders("*")
.maxAge(3000);

}
}
}

0 comments on commit d650a1f

Please sign in to comment.