From 6337320caeb19b1c71205d0652e4616ef9ad29c9 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Wed, 18 Jan 2023 01:33:40 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20member=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?insert=20=EB=B0=8F=20updatedBy,=20updatedAt=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/seed/R__Insert_Seed_cafe.sql | 14 +++++------ db/seed/R__Insert_Seed_cafe_image.sql | 2 +- db/seed/R__Insert_Seed_cafe_menu.sql | 2 +- db/seed/R__Insert_Seed_member.sql | 3 +++ db/seed/R__Insert_Seed_menu_option.sql | 2 +- db/seed/R__Insert_Seed_option_detail.sql | 6 ++--- .../dongnecafe/common/PasswordEncoderTest.kt | 23 +++++++++++++++++++ .../dongnecafe/security/JwtTokenUtils.kt | 1 - 8 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 db/seed/R__Insert_Seed_member.sql create mode 100644 dongne-account-api/src/test/kotlin/io/beaniejoy/dongnecafe/common/PasswordEncoderTest.kt diff --git a/db/seed/R__Insert_Seed_cafe.sql b/db/seed/R__Insert_Seed_cafe.sql index 362b3c3..00d8dc3 100644 --- a/db/seed/R__Insert_Seed_cafe.sql +++ b/db/seed/R__Insert_Seed_cafe.sql @@ -1,20 +1,20 @@ INSERT IGNORE INTO `cafe` (name, address, phone_number, total_rate, description, created_at, created_by, updated_at, updated_by) -VALUES ('비니카페', '서울시 동대문구 전농로', '01011112222', 3.98, '언제나 상쾌한 비니카페', now(), 'system', null, null); +VALUES ('비니카페', '서울시 동대문구 전농로', '01011112222', 3.98, '언제나 상쾌한 비니카페', now(), 'system', now(), 'system'); INSERT IGNORE INTO `cafe` (name, address, phone_number, total_rate, description, created_at, created_by, updated_at, updated_by) -VALUES ('조이카페', '서울시 영등포구', '01033334444', 4.67, '언제나 상쾌한 조이카페', now(), 'system', null, null); +VALUES ('조이카페', '서울시 영등포구', '01033334444', 4.67, '언제나 상쾌한 조이카페', now(), 'system', now(), 'system'); INSERT IGNORE INTO `cafe` (name, address, phone_number, total_rate, description, created_at, created_by, updated_at, updated_by) -VALUES ('abc카페', '서울시 서대문구', '01025341432', 4.89, '언제나 상쾌한 abc카페', now(), 'system', null, null); +VALUES ('abc카페', '서울시 서대문구', '01025341432', 4.89, '언제나 상쾌한 abc카페', now(), 'system', now(), 'system'); INSERT IGNORE INTO `cafe` (name, address, phone_number, total_rate, description, created_at, created_by, updated_at, updated_by) -VALUES ('동네주변카페', '서울시 송파구', '01022223333', 4.23, '언제나 상쾌한 동네주변카페', now(), 'system', null, null); +VALUES ('동네주변카페', '서울시 송파구', '01022223333', 4.23, '언제나 상쾌한 동네주변카페', now(), 'system', now(), 'system'); INSERT IGNORE INTO `cafe` (name, address, phone_number, total_rate, description, created_at, created_by, updated_at, updated_by) -VALUES ('방긋카페', '서울시 광진구', '01099998888', 4.35, '언제나 상쾌한 방긋카페', now(), 'system', null, null); +VALUES ('방긋카페', '서울시 광진구', '01099998888', 4.35, '언제나 상쾌한 방긋카페', now(), 'system', now(), 'system'); INSERT IGNORE INTO `cafe` (name, address, phone_number, total_rate, description, created_at, created_by, updated_at, updated_by) -VALUES ('example cafe1', '서울시 종로구', '01077779999', 2.85, '언제나 상쾌한 example cafe1', now(), 'system', null, null); +VALUES ('example cafe1', '서울시 종로구', '01077779999', 2.85, '언제나 상쾌한 example cafe1', now(), 'system', now(), 'system'); INSERT IGNORE INTO `cafe` (name, address, phone_number, total_rate, description, created_at, created_by, updated_at, updated_by) -VALUES ('example cafe2', '서울시', '01044445555', 3.12, '언제나 상쾌한 example cafe2', now(), 'system', null, null); \ No newline at end of file +VALUES ('example cafe2', '서울시', '01044445555', 3.12, '언제나 상쾌한 example cafe2', now(), 'system', now(), 'system'); \ No newline at end of file diff --git a/db/seed/R__Insert_Seed_cafe_image.sql b/db/seed/R__Insert_Seed_cafe_image.sql index 85ccdb4..72dfa12 100644 --- a/db/seed/R__Insert_Seed_cafe_image.sql +++ b/db/seed/R__Insert_Seed_cafe_image.sql @@ -15,7 +15,7 @@ BEGIN WHILE(j <= 3) DO INSERT IGNORE INTO `cafe_image` (img_url, created_at, created_by, updated_at, updated_by, cafe_id) - VALUES (CONCAT('test_img_url_', idx_img), now(), 'system', null, null, var_cafe_id); + VALUES (CONCAT('test_img_url_', idx_img), now(), 'system', now(), 'system', var_cafe_id); SET j = j + 1; SET idx_img = idx_img + 1; diff --git a/db/seed/R__Insert_Seed_cafe_menu.sql b/db/seed/R__Insert_Seed_cafe_menu.sql index c3d7d36..0b3b057 100644 --- a/db/seed/R__Insert_Seed_cafe_menu.sql +++ b/db/seed/R__Insert_Seed_cafe_menu.sql @@ -13,7 +13,7 @@ BEGIN WHILE(j <= 10) DO INSERT IGNORE INTO `cafe_menu` (name, price, created_at, created_by, updated_at, updated_by, cafe_id) - VALUES (CONCAT('커피', j), FLOOR(RAND() * 10 + 1) * 1000, now(), 'system', null, null, var_cafe_id); + VALUES (CONCAT('커피', j), FLOOR(RAND() * 10 + 1) * 1000, now(), 'system', now(), 'system', var_cafe_id); SET j = j + 1; END WHILE; diff --git a/db/seed/R__Insert_Seed_member.sql b/db/seed/R__Insert_Seed_member.sql new file mode 100644 index 0000000..50bf7e3 --- /dev/null +++ b/db/seed/R__Insert_Seed_member.sql @@ -0,0 +1,3 @@ +-- beanie@test.com / 1111 +INSERT IGNORE INTO `member` (email, password, address, phone_number, role_type, activated, created_at, created_by, updated_at, updated_by) +VALUES ('beanie@test.com', '{bcrypt}$2a$10$sgNB3pRNXFcCajZe5NTJ3OEAabzmwD7Q.lD0hOr5gAtC0q/q1kLHa', '서울 어디', '01011223344', 'ROLE_USER', true, now(), 'system', now(), 'system'); \ No newline at end of file diff --git a/db/seed/R__Insert_Seed_menu_option.sql b/db/seed/R__Insert_Seed_menu_option.sql index f52f579..7b8227a 100644 --- a/db/seed/R__Insert_Seed_menu_option.sql +++ b/db/seed/R__Insert_Seed_menu_option.sql @@ -13,7 +13,7 @@ BEGIN LIMIT i, 1); INSERT IGNORE INTO `menu_option` (title, created_at, created_by, updated_at, updated_by, cafe_menu_id) - VALUES ('SIZE', now(), 'system', null, null, var_cafe_menu_id); + VALUES ('SIZE', now(), 'system', now(), 'system', var_cafe_menu_id); SET i = i + 1; END WHILE; diff --git a/db/seed/R__Insert_Seed_option_detail.sql b/db/seed/R__Insert_Seed_option_detail.sql index abe5436..2740ede 100644 --- a/db/seed/R__Insert_Seed_option_detail.sql +++ b/db/seed/R__Insert_Seed_option_detail.sql @@ -13,11 +13,11 @@ BEGIN LIMIT i, 1); INSERT IGNORE INTO `option_detail` (name, extra_price, created_at, created_by, updated_at, updated_by, menu_option_id) - VALUES ('MEDIUM', FLOOR(RAND() * 3 + 1) * 1000, now(), 'system', null, null, var_menu_option_id); + VALUES ('MEDIUM', FLOOR(RAND() * 3 + 1) * 1000, now(), 'system', now(), 'system', var_menu_option_id); INSERT IGNORE INTO `option_detail` (name, extra_price, created_at, created_by, updated_at, updated_by, menu_option_id) - VALUES ('LARGE', FLOOR(RAND() * 3 + 1) * 1000, now(), 'system', null, null, var_menu_option_id); + VALUES ('LARGE', FLOOR(RAND() * 3 + 1) * 1000, now(), 'system', now(), 'system', var_menu_option_id); INSERT IGNORE INTO `option_detail` (name, extra_price, created_at, created_by, updated_at, updated_by, menu_option_id) - VALUES ('VENTI', FLOOR(RAND() * 3 + 1) * 1000, now(), 'system', null, null, var_menu_option_id); + VALUES ('VENTI', FLOOR(RAND() * 3 + 1) * 1000, now(), 'system', now(), 'system', var_menu_option_id); SET i = i + 1; END WHILE; diff --git a/dongne-account-api/src/test/kotlin/io/beaniejoy/dongnecafe/common/PasswordEncoderTest.kt b/dongne-account-api/src/test/kotlin/io/beaniejoy/dongnecafe/common/PasswordEncoderTest.kt new file mode 100644 index 0000000..3359d5c --- /dev/null +++ b/dongne-account-api/src/test/kotlin/io/beaniejoy/dongnecafe/common/PasswordEncoderTest.kt @@ -0,0 +1,23 @@ +package io.beaniejoy.dongnecafe.common + +import mu.KLogging +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.security.crypto.password.PasswordEncoder + +@SpringBootTest +class PasswordEncoderTest { + @Autowired + lateinit var passwordEncoder: PasswordEncoder + + companion object: KLogging() + + @Test + fun makeEncodedPasswordTest() { + val encodedPw = passwordEncoder.encode("1111") + assertEquals("{bcrypt}\$2a$10\$Wb71jZO9Z.1HXozEnmtqdOHSxCJjn9jMcVWNzqCgd7SW.nZj/1kC2", encodedPw) + } + +} \ No newline at end of file diff --git a/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/security/JwtTokenUtils.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/security/JwtTokenUtils.kt index 08bb800..6d6aba4 100644 --- a/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/security/JwtTokenUtils.kt +++ b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/security/JwtTokenUtils.kt @@ -29,7 +29,6 @@ class JwtTokenUtils( } fun createToken(authentication: Authentication): String { - logger.info { "test = ${authentication.name}" } val authenticatedMember = (authentication.principal as SecurityUser).member val authorities = authentication.authorities.joinToString(",") { it.authority }