diff --git a/CodingMasterLSW/.gitignore b/CodingMasterLSW/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/CodingMasterLSW/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/CodingMasterLSW/README.md b/CodingMasterLSW/README.md new file mode 100644 index 0000000..05b81e4 --- /dev/null +++ b/CodingMasterLSW/README.md @@ -0,0 +1,14 @@ +# 7612BE + +깃 clone 방법
+git clone "복사한 주소"
+git checkout -b (branch이름)
+ +작업 후 올리는 과정
+git add .
+git commit -m "원하는 comment"
+git push // 에러 뜨면 그거 복붙해서 올리기
+ + + +실행 시 포트번호 localhost:8081 diff --git a/CodingMasterLSW/build.gradle b/CodingMasterLSW/build.gradle new file mode 100644 index 0000000..dea71ca --- /dev/null +++ b/CodingMasterLSW/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.13' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +group = 'com.codingrecipe' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '11' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} +// +repositories { + mavenCentral() +} + +dependencies { + + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-mail' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-validation' + +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/CodingMasterLSW/gradle/wrapper/gradle-wrapper.jar b/CodingMasterLSW/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..c1962a7 Binary files /dev/null and b/CodingMasterLSW/gradle/wrapper/gradle-wrapper.jar differ diff --git a/CodingMasterLSW/gradle/wrapper/gradle-wrapper.properties b/CodingMasterLSW/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37aef8d --- /dev/null +++ b/CodingMasterLSW/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/CodingMasterLSW/gradlew b/CodingMasterLSW/gradlew new file mode 100644 index 0000000..aeb74cb --- /dev/null +++ b/CodingMasterLSW/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/CodingMasterLSW/gradlew.bat b/CodingMasterLSW/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/CodingMasterLSW/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/CodingMasterLSW/settings.gradle b/CodingMasterLSW/settings.gradle new file mode 100644 index 0000000..c3b5274 --- /dev/null +++ b/CodingMasterLSW/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'member' diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/MemberApplication.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/MemberApplication.java new file mode 100644 index 0000000..57c7996 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/MemberApplication.java @@ -0,0 +1,12 @@ +package com.codingrecipe.member; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MemberApplication { + public static void main(String[] args) { + SpringApplication.run(MemberApplication.class, args); + } + +} diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/config/PasswordEncoderConfig.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/config/PasswordEncoderConfig.java new file mode 100644 index 0000000..bd93653 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/config/PasswordEncoderConfig.java @@ -0,0 +1,15 @@ +package com.codingrecipe.member.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +@Configuration +public class PasswordEncoderConfig { + + @Bean + public PasswordEncoder passwordEncoder(){ + return new BCryptPasswordEncoder(); + } +} diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/config/SecurityConfig.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/config/SecurityConfig.java new file mode 100644 index 0000000..72bfc2f --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/config/SecurityConfig.java @@ -0,0 +1,52 @@ +package com.codingrecipe.member.config; + +import com.codingrecipe.member.service.CustomUserDetailsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + private CustomUserDetailsService userDetailsService; + + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userDetailsService).passwordEncoder(new BCryptPasswordEncoder()); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http + //test + .csrf().disable() + // 이거때문에 에러가 났음. 근데 뭔지 모르겠음. + // CSRF 보호를 비활성화 라고 함. + // CSRF 공부하기 + + + .authorizeRequests() + .antMatchers("/admin/**").hasRole("ADMIN") // ADMIN 역할을 가진 사용자만 접근 가능 + .anyRequest().permitAll() // 나머지 모든 요청에 대해 접근 허용 + .and() + .formLogin() + .loginPage("/member/login") // 로그인 페이지 경로 설정 + .permitAll() // 로그인 페이지는 모두에게 접근 가능 + .defaultSuccessUrl("/index", true) // 로그인 성공시 이동할 URL 설정 + .and() + .logout() + .permitAll(); // 로그아웃은 모두에게 접근 가능 + } + +} + + + + + diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/controller/HomeController.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/controller/HomeController.java new file mode 100644 index 0000000..800f2a3 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/controller/HomeController.java @@ -0,0 +1,14 @@ +package com.codingrecipe.member.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class HomeController { + + // 기본페이지 요청 메서드 + @GetMapping + public String index() { + return "index"; // -> templates 폴더의 index.html을 찾아감 + } +} diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/controller/MemberController.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/controller/MemberController.java new file mode 100644 index 0000000..75bc991 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/controller/MemberController.java @@ -0,0 +1,123 @@ +package com.codingrecipe.member.controller; + + +import com.codingrecipe.member.dto.MemberDTO; +import com.codingrecipe.member.service.EmailService; +import com.codingrecipe.member.service.MemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpSession; +import java.util.List; + +@Controller +@RequiredArgsConstructor +public class MemberController { + // 생성자 주입 + private final MemberService memberService; + private final EmailService emailService; + + // 회원가입 페이지 출력 요청 + @GetMapping("/member/save") + public String saveForm() { + return "save"; + } + + @PostMapping("/member/save") + + public String save(@ModelAttribute MemberDTO memberDTO, HttpSession session, Model model) { + + String userEmail = memberDTO.getMemberEmail(); + // 회원가입 폼에서 사용자가 입력한 정보가 MemberDTO 객체에 저장 + System.out.println("MemberController.save"); + System.out.println("memberEmail = " + memberDTO.getMemberEmail()); + + String sessionVerificationCode = (String) session.getAttribute("verificationCode"); + String userEnteredVerificationCode = memberDTO.getVerificationCode(); + + if (sessionVerificationCode != null && sessionVerificationCode.equals(userEnteredVerificationCode)) { + memberService.save(memberDTO); + return "redirect:/"; // 회원가입 완료 후 메인 페이지로 리다이렉트 + } else { + model.addAttribute("errorMessage", "인증 코드가 일치하지 않습니다."); + return "save"; // 인증 코드가 일치하지 않으면 다시 회원 가입 페이지로 리다이렉트 + } + + + + +} + + @GetMapping("/member/login") + public String loginForm() { + return "login"; + } + + @PostMapping("/member/login") + public String login(@ModelAttribute MemberDTO memberDTO, HttpSession session) { //MemberDTO 객체 생성 후 login 메서드로 전달 + MemberDTO loginResult = memberService.login(memberDTO); + if (loginResult != null) { + //login 성공 + session.setAttribute("loginEmail", loginResult.getMemberEmail()); + return "main"; + } else { + // login 실패 + return "login"; + } + } + + @GetMapping("/member/") + public String findAll(Model model) { + List memberDTOList = memberService.findAll(); + //어떠한 html로 가져갈 데이터가 있다면 model을 사용 + model.addAttribute("memberList", memberDTOList); + return "list"; + + } + @GetMapping("/member/{id}") + public String findById(@PathVariable Long id, Model model) { + MemberDTO memberDTO = memberService.findById(id); + model.addAttribute("member", memberDTO); + return "detail"; + + } + @GetMapping("/member/update") + public String updateForm(HttpSession session, Model model) { + String myEmail = (String) session.getAttribute("loginEmail"); // 강제 형변환 + MemberDTO memberDTO = memberService.updateForm(myEmail); + model.addAttribute("updateMember", memberDTO); + return "update"; + } + + @PostMapping("/member/update") //redirect 해주는 역할 + public String update(@ModelAttribute MemberDTO memberDTO) { + memberService.update(memberDTO); + return "redirect:/member/" + memberDTO.getId(); + + } + @GetMapping ("/member/delete/{id}") + public String deleteById(@PathVariable Long id) { + memberService.deleteById(id); // 목록상에서 삭제 + return "redirect:/member/"; + } + + @GetMapping("/member/logout") + public String logout(HttpSession session) { + session.invalidate(); // 세션 무효화 + return "index"; + } + @GetMapping("/email-verification") + public String sendVerificationCode(@RequestParam("email") String email, HttpSession session) { + String verificationCode = emailService.generateVerificationCode(); + emailService.sendSimpleMessage(email, "Your verification code", "Your verification code is: " + verificationCode); + // Store the verification code in the user's session + session.setAttribute("verificationCode", verificationCode); + return "save"; + } + + + +} + diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/dto/MemberDTO.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/dto/MemberDTO.java new file mode 100644 index 0000000..e378bf8 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/dto/MemberDTO.java @@ -0,0 +1,36 @@ +package com.codingrecipe.member.dto; + +import com.codingrecipe.member.entity.MemberEntity; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + + +@Getter +@Setter +@NoArgsConstructor +@ToString +public class MemberDTO { + private Long id; + private String memberEmail; + private String memberPassword; + private String memberName; + private String verificationCode; + + public static MemberDTO toMemberDTO(MemberEntity memberEntity) { + MemberDTO memberDTO = new MemberDTO(); + memberDTO.setId(memberEntity.getId()); + memberDTO.setMemberEmail(memberEntity.getMemberEmail()); + memberDTO.setMemberPassword(memberEntity.getMemberPassword()); + memberDTO.setMemberName(memberEntity.getMemberName()); + return memberDTO; + } + + + + + + + +} diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/entity/MemberEntity.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/entity/MemberEntity.java new file mode 100644 index 0000000..54d29ea --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/entity/MemberEntity.java @@ -0,0 +1,48 @@ +package com.codingrecipe.member.entity; + +import com.codingrecipe.member.dto.MemberDTO; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import java.lang.reflect.Member; + +@Entity +@Setter +@Getter +@Table(name = "member_table") +public class MemberEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) // auto_increment + private Long id; + + @Column(unique = true) // unique 제약조건 추가 + private String memberEmail; + + @Column + private String memberPassword; + + @Column + private String memberName; + + + // dto -> entity 변환 + public static MemberEntity toMemberEntity(MemberDTO memberDTO) { + MemberEntity memberEntity = new MemberEntity(); + memberEntity.setMemberEmail(memberDTO.getMemberEmail()); + memberEntity.setMemberPassword(memberDTO.getMemberPassword()); + memberEntity.setMemberName(memberDTO.getMemberName()); + return memberEntity; + + } + + public static MemberEntity toUpdateMemberEntity(MemberDTO memberDTO) { + MemberEntity memberEntity = new MemberEntity(); + memberEntity.setId(memberDTO.getId()); + memberEntity.setMemberEmail(memberDTO.getMemberEmail()); + memberEntity.setMemberPassword(memberDTO.getMemberPassword()); + memberEntity.setMemberName(memberDTO.getMemberName()); + return memberEntity; + } +} + diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/repository/MemberRepository.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/repository/MemberRepository.java new file mode 100644 index 0000000..7d39c16 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/repository/MemberRepository.java @@ -0,0 +1,12 @@ +package com.codingrecipe.member.repository; + +import com.codingrecipe.member.entity.MemberEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; // null 방지 해줌 + + +public interface MemberRepository extends JpaRepository { + // 이메일로 회원 정보 조회 (select * from member_table where member_email=?) + Optional findByMemberEmail(String memberEmail); +} diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/CustomUserDetailsService.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/CustomUserDetailsService.java new file mode 100644 index 0000000..2e45b8b --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/CustomUserDetailsService.java @@ -0,0 +1,38 @@ +package com.codingrecipe.member.service; + +import com.codingrecipe.member.entity.MemberEntity; +import com.codingrecipe.member.repository.MemberRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +@Service +public class CustomUserDetailsService implements UserDetailsService { + @Autowired + private MemberRepository memberRepository; + @Autowired + private PasswordEncoder passwordEncoder; + + @Override + + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + + //여기서는 username이 이메일임 + MemberEntity memberEntity = memberRepository.findByMemberEmail(username) + .orElseThrow(() -> new UsernameNotFoundException("User not found with email: " + username)); + + return User.builder() + .username(memberEntity.getMemberEmail()) + .password(memberEntity.getMemberPassword()) + .authorities(Collections.emptyList()) // 사용자 권한 정보를 설정합니다. + .build(); + } + + +} diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/EmailService.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/EmailService.java new file mode 100644 index 0000000..63021b1 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/EmailService.java @@ -0,0 +1,49 @@ +package com.codingrecipe.member.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.stereotype.Service; + +import java.util.Random; + +@Service +public class EmailService { + private static final Logger logger = LoggerFactory.getLogger(EmailService.class); + + private final JavaMailSender javaMailSender; + + @Autowired + public EmailService(JavaMailSender javaMailSender) { + this.javaMailSender = javaMailSender; + } + + public void sendSimpleMessage(String to, String subject, String text) { + try { + SimpleMailMessage message = new SimpleMailMessage(); + message.setFrom("spqjekdl14@gmail.com"); + message.setTo(to); + message.setSubject(subject); + message.setText(text); + javaMailSender.send(message); + logger.info("Email sent to {}: {}", to, subject); + } catch (Exception e) { + logger.error("Failed to send email to {}: {}", to, subject, e); + } + } + + public String generateVerificationCode() { + Random random = new Random(); + return String.format("%06d", random.nextInt(1000000)); + } + + public void sendVerificationEmail(String recipientEmail) { + String verificationCode = generateVerificationCode(); + String subject = "[이메일 인증코드]"; + String text = "인증코드입니다" + verificationCode; + + sendSimpleMessage(recipientEmail, subject, text); + } +} diff --git a/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/MemberService.java b/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/MemberService.java new file mode 100644 index 0000000..506b228 --- /dev/null +++ b/CodingMasterLSW/src/main/java/com/codingrecipe/member/service/MemberService.java @@ -0,0 +1,103 @@ +package com.codingrecipe.member.service; + +import com.codingrecipe.member.dto.MemberDTO; +import com.codingrecipe.member.entity.MemberEntity; +import com.codingrecipe.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class MemberService { + private final MemberRepository memberRepository; // DB에 접근할 수 있게 하는 코드 + private final PasswordEncoder passwordEncoder; // 비밀번호 암호화 + + public void save(MemberDTO memberDTO) { + // repository의 save메서드 호출 ( 조건. entity객체를 넘겨줘야 함) + // 1. dto -> entity 변환 + MemberEntity memberEntity = MemberEntity.toMemberEntity(memberDTO); + + //비밀번호 암호화 + memberEntity.setMemberPassword(passwordEncoder.encode(memberDTO.getMemberPassword())); + memberRepository.save(memberEntity); + + // 2. repository의 save 메서드 호출 + + } + + public MemberDTO login(MemberDTO memberDTO) { + /* + 1. 회원이 입력한 이메일로 DB에서 조회를 함 + 2. DB에서 조회한 비밀번호와 사용자가 입력한 비밀번호가 일치하는지 판단 + */ + Optional byMemberEmail = memberRepository.findByMemberEmail(memberDTO.getMemberEmail()); + //사용자가 입력한 이메일로 memberRepository를 통해 데이터베이스에서 회원 정보를 조회 + + if (byMemberEmail.isPresent()) { + // 조회 결과가 있다(해당 이메일을 가진 회원 정보가 있다) + MemberEntity memberEntity = byMemberEmail.get(); // 객체 가져오기 + + + //비밀번호 일치 확인 + if (passwordEncoder.matches(memberDTO.getMemberPassword(), memberEntity.getMemberPassword())) { + //비밀번호 일치 + // entity -> dto 변환 후 리턴 + MemberDTO dto = MemberDTO.toMemberDTO(memberEntity); + return dto; + } else { + // 비밀번호 불일치(로그인실패) + return null; + } + } else { + // 조회 결과가 없다 (해당 이메일을 가진 회원이 없다) + return null; + } + } + + public List findAll() { // MemberDTO 타입의 객체들을 담은 리스트를 반환 + List memberEntityList = memberRepository.findAll(); + List memberDTOList = new ArrayList<>(); + //Entity 리스트를 DTO 리스트로 바꿔줘야함 + for(MemberEntity memberEntity: memberEntityList) { + memberDTOList.add(MemberDTO.toMemberDTO(memberEntity)); +// MemberDTO memberDTO = MemberDTO.toMemberDTO((memberEntity)); +// memberDTOList.add(memberDTO); + } + return memberDTOList; + } + + public MemberDTO updateForm(String myEmail) { + Optional optionalMemberEntity = memberRepository.findByMemberEmail(myEmail); + if (optionalMemberEntity.isPresent()) { + return MemberDTO.toMemberDTO(optionalMemberEntity.get()); //Entity -> DTO 변환 + } else { + return null; + } + } + + public MemberDTO findById(Long id) { + Optional optionalMemberEntity = memberRepository.findById(id); + if (optionalMemberEntity.isPresent()) { +// MemberEntity memberEntity = optionalMemberEntity.get(); +// MemberDTO memberDTO = MemberDTO.toMemberDTO(memberEntity); +// return memberDTO; + return MemberDTO.toMemberDTO(optionalMemberEntity.get()); // 위에 3줄과 같은 코드 + } else { + return null; + } + + } + + public void update(MemberDTO memberDTO) { + memberRepository.save(MemberEntity.toUpdateMemberEntity(memberDTO)); + } + + public void deleteById(Long id) { + memberRepository.deleteById(id); + } +} diff --git a/CodingMasterLSW/src/main/resources/application.yml b/CodingMasterLSW/src/main/resources/application.yml new file mode 100644 index 0000000..97deea3 --- /dev/null +++ b/CodingMasterLSW/src/main/resources/application.yml @@ -0,0 +1,34 @@ +server: + port: 8081 + +# database 연동 설정 +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + # 각자 PC에 만들어놓은 Database이름을 써야 합니다. + url: jdbc:mysql://localhost:3306/db_sw?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 + # mysql에 생성한 사용자 계정 정보를 써야 합니다. + username: user_sw + password: 1234 + thymeleaf: + cache: false + + # spring data jpa 설정 + jpa: + database-platform: org.hibernate.dialect.MySQL5InnoDBDialect + open-in-view: false + show-sql: true + hibernate: + ddl-auto: update + + mail: + host: smtp.gmail.com + port: 587 + username: spqjekdl14@gmail.com + password: fhljufxlfjktqwmw + properties: + mail: + smtp: + auth: true + starttls: + enable: true \ No newline at end of file diff --git a/CodingMasterLSW/src/main/resources/templates/detail.html b/CodingMasterLSW/src/main/resources/templates/detail.html new file mode 100644 index 0000000..545dc5a --- /dev/null +++ b/CodingMasterLSW/src/main/resources/templates/detail.html @@ -0,0 +1,25 @@ + + + + + + detail + + + + + + + + + + + + + + + //. + +
idemailpasswordname
+ + \ No newline at end of file diff --git a/CodingMasterLSW/src/main/resources/templates/index.html b/CodingMasterLSW/src/main/resources/templates/index.html new file mode 100644 index 0000000..ff82f5c --- /dev/null +++ b/CodingMasterLSW/src/main/resources/templates/index.html @@ -0,0 +1,12 @@ + + + + + index + + +

회원가입 기능 구현

+ 회원가입 + 회원목록 + + \ No newline at end of file diff --git a/CodingMasterLSW/src/main/resources/templates/list.html b/CodingMasterLSW/src/main/resources/templates/list.html new file mode 100644 index 0000000..625f882 --- /dev/null +++ b/CodingMasterLSW/src/main/resources/templates/list.html @@ -0,0 +1,34 @@ + + + + + Title + + +

list.html

+ + + + + + + + + + + + + + + + + +
idmemberEmailmemberPasswordmemberName상세조회삭제
+ + 조회 + + 삭제 +
+ + \ No newline at end of file diff --git a/CodingMasterLSW/src/main/resources/templates/login.html b/CodingMasterLSW/src/main/resources/templates/login.html new file mode 100644 index 0000000..e74708e --- /dev/null +++ b/CodingMasterLSW/src/main/resources/templates/login.html @@ -0,0 +1,14 @@ + + + + + login + + +
+ 이메일:
+ 비밀번호 :
+ +
+ + \ No newline at end of file diff --git a/CodingMasterLSW/src/main/resources/templates/main.html b/CodingMasterLSW/src/main/resources/templates/main.html new file mode 100644 index 0000000..788e3aa --- /dev/null +++ b/CodingMasterLSW/src/main/resources/templates/main.html @@ -0,0 +1,12 @@ + + + + + main + + + session 값 확인:

+ 내 정보 수정하기 + 로그아웃 + + \ No newline at end of file diff --git a/CodingMasterLSW/src/main/resources/templates/save.html b/CodingMasterLSW/src/main/resources/templates/save.html new file mode 100644 index 0000000..882ac0b --- /dev/null +++ b/CodingMasterLSW/src/main/resources/templates/save.html @@ -0,0 +1,38 @@ + + + + + save + + +
+ 이메일:
+ +

+ 인증 코드:
+ + 비밀번호:
+ 이름:
+ + // 제발,,, 되라,,, + +
+ +

+ + + + diff --git a/CodingMasterLSW/src/main/resources/templates/update.html b/CodingMasterLSW/src/main/resources/templates/update.html new file mode 100644 index 0000000..5bb037f --- /dev/null +++ b/CodingMasterLSW/src/main/resources/templates/update.html @@ -0,0 +1,17 @@ + + + + + + update + + +
+
+ 이메일:
+ 비밀번호:
+ 이름:
+ +
+ + \ No newline at end of file diff --git a/CodingMasterLSW/src/test/java/com/codingrecipe/member/MemberApplicationTests.java b/CodingMasterLSW/src/test/java/com/codingrecipe/member/MemberApplicationTests.java new file mode 100644 index 0000000..2fa89ff --- /dev/null +++ b/CodingMasterLSW/src/test/java/com/codingrecipe/member/MemberApplicationTests.java @@ -0,0 +1,13 @@ +package com.codingrecipe.member; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MemberApplicationTests { + + @Test + void contextLoads() { + } + +}