Skip to content

Commit

Permalink
Merge branch 'develop' into feat/game/GRTEAM-10/immyeong
Browse files Browse the repository at this point in the history
  • Loading branch information
immyeong authored Jun 23, 2024
2 parents 263e46d + 8e4af04 commit e17c2cb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package gooroommoon.algofi_compile.config;

import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOrigins("*")
.allowedHeaders("*")
.allowedMethods("*");
}
}
4 changes: 2 additions & 2 deletions algofi-core/src/main/resources/application-prod.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MySQL Database Connection
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://${DB_URL:localhost}:${DB_PORT:3306}/${DB_NAME:mydb}?useUnicode=true&characterEncoding=utf8mb4
spring.datasource.url=jdbc:mysql://${DB_URL:localhost}:${DB_PORT:3306}/${DB_NAME:mydb}
spring.datasource.username=${DB_USERNAME:myuser}
spring.datasource.password=${DB_PASSWORD:mypassword}

Expand Down Expand Up @@ -29,4 +29,4 @@ logging.level.org.springframework.security=DEBUG

# JWT Configuration
jwt.secret-key=f54c291ca5f14154ac133d552dfbf372605e06a71778204773e8
jwt.expire-time=3600000
jwt.expire-time=3600000
1 change: 1 addition & 0 deletions algofi-mysql/init/create_table.sql
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ CREATE TABLE filestorage (
FOREIGN KEY(member_id) REFERENCES member(member_id)
) character set utf8mb4 collate utf8mb4_general_ci;


/* file table 생성 */
CREATE TABLE file (
file_id INT(11) AUTO_INCREMENT PRIMARY KEY,
Expand Down

0 comments on commit e17c2cb

Please sign in to comment.