From 71265704c43ac10474ad430ebefc5ee2a56d2602 Mon Sep 17 00:00:00 2001 From: alsduq1117 Date: Sun, 17 Sep 2023 19:07:29 +0900 Subject: [PATCH] 432de3e Merge branch 'dev' --- src/main/resources/application-prod.yml | 3 +++ src/main/resources/data.sql | 7 +++++-- src/main/resources/schema.sql | 14 +++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index ee6c3c4f..45d98ef0 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -10,6 +10,9 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: ${rds.username} password: ${rds.password} + servlet: + multipart: + max-file-size: 20MB cache: type: redis redis: diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 589ecdaf..3404d985 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -460,7 +460,7 @@ VALUES ('허니비 와인', '기타주류', '아이비영농조합법인', '8%', '127.40731816580301'); INSERT INTO drink (name, type, product_name, alcoholic_beverage, raw_material, capacity, manufacture_address, region, price, image, latitude, longitude) -VALUES ('풍정사계 동', '증류식소주', '농업회사법인(유)화양', '42%, 25%', '국내산찹살, 향온곡', '375ml', '충북 청주시 청원구 내수읍 풍정1길 8-4', '충북', '25000', +VALUES ('풍정사계 동', '증류식소주', '농업회사법인(유)화양', '25%', '국내산찹살, 향온곡', '375ml', '충북 청주시 청원구 내수읍 풍정1길 8-4', '충북', '25000', 'https://shopping-phinf.pstatic.net/main_8506016/85060161938.jpg', '36.701814585674001', '127.54556270058499'); INSERT INTO drink (name, type, product_name, alcoholic_beverage, raw_material, capacity, manufacture_address, region, price, image, latitude, longitude) @@ -2129,7 +2129,7 @@ VALUES ('신선주 약주', '약주', '농업회사법인(주)신선', '16%', 'https://shopping-phinf.pstatic.net/main_4070884/40708847116.jpg', '36.6531657154637', '127.54201794414099'); INSERT INTO drink (name, type, product_name, alcoholic_beverage, raw_material, capacity, manufacture_address, region, price, image, latitude, longitude) -VALUES ('신선주 증류주', '증류주', '농업회사법인(주)신선', '52% / 42% / 35%', +VALUES ('신선주 증류주', '증류주', '농업회사법인(주)신선', '35%', '찹쌀(국내산), 전통누룩(국내산)(밀함유), 약재(국화, 쇠무릅, 당귀, 하수오, 구기자, 맥문동, 인삼, 육계(계피), 숙지황, 생지황)', '375ml', '충청북도 청주시 상당구 것대로 5 1층', '충북', '60,000', 'https://shopping-phinf.pstatic.net/main_8224024/82240243659.2.jpg', '36.6531657154637', '127.54201794414099'); @@ -2139,6 +2139,9 @@ VALUES ('백이주', '과실주', '농업회사법인 (주)세찬 제조사', '3 '경상북도 영천시 임고면 포은로 842-50', '경북', '30,000', 'https://shopping-phinf.pstatic.net/main_8304112/83041122592.jpg', '36.0451664108259', '128.995207775642'); +UPDATE drink +SET alcoholic_beverage = REPLACE(alcoholic_beverage, '%', ''); + INSERT INTO users (nickname, email, password, image_url, age, gender, mbti, alcohol_limit, provider_type, provider_id, created_date, diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index dce7d6d9..08518bfe 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -28,8 +28,8 @@ CREATE TABLE vote_content ( id BIGINT NOT NULL AUTO_INCREMENT, vote_id BIGINT NOT NULL, - imageA VARCHAR(255) DEFAULT NULL, - imageB VARCHAR(255) DEFAULT NULL, + imageA VARCHAR(500) DEFAULT NULL, + imageB VARCHAR(500) DEFAULT NULL, titleA VARCHAR(55) DEFAULT NULL, titleB VARCHAR(55) DEFAULT NULL, PRIMARY KEY (id) @@ -41,7 +41,7 @@ CREATE TABLE users nickname VARCHAR(20) DEFAULT NULL, email VARCHAR(55) DEFAULT NULL, password VARCHAR(15) DEFAULT NULL, - image_url VARCHAR(255) DEFAULT NULL, + image_url VARCHAR(500) DEFAULT NULL, age INTEGER DEFAULT NULL, gender VARCHAR(6) DEFAULT NULL, mbti VARCHAR(4) DEFAULT NULL, @@ -76,8 +76,8 @@ CREATE TABLE vote_drink_content drink_a_type VARCHAR(10) DEFAULT NULL, drink_b_name VARCHAR(30) DEFAULT NULL, drink_b_type VARCHAR(10) DEFAULT NULL, - drink_a_image VARCHAR(255) DEFAULT NULL, - drink_b_image VARCHAR(255) DEFAULT NULL, + drink_a_image VARCHAR(500) DEFAULT NULL, + drink_b_image VARCHAR(500) DEFAULT NULL, region VARCHAR(10) DEFAULT NULL, PRIMARY KEY (id) ); @@ -95,7 +95,7 @@ CREATE TABLE drink manufacture_address VARCHAR(255) DEFAULT NULL, region VARCHAR(10) DEFAULT NULL, price VARCHAR(50) DEFAULT NULL, - image VARCHAR(255) DEFAULT NULL, + image VARCHAR(500) DEFAULT NULL, latitude DECIMAL(18, 15) DEFAULT NULL, longitude DECIMAL(18, 15) DEFAULT NULL, PRIMARY KEY (id) @@ -131,7 +131,7 @@ CREATE TABLE comment like_count INTEGER DEFAULT NULL, hate_count INTEGER DEFAULT NULL, parent_id BIGINT DEFAULT NULL, - restaurant_image VARCHAR(255) DEFAULT NULL, + restaurant_image VARCHAR(500) DEFAULT NULL, restaurant_name VARCHAR(255) DEFAULT NULL, created_date TIMESTAMP, modified_date TIMESTAMP,