From 3245c5a3f1bc5fc5a4ca8a580f4dda2e4c6963f5 Mon Sep 17 00:00:00 2001 From: c-my Date: Sun, 25 Aug 2019 21:57:43 +0800 Subject: [PATCH] initial commit on new branch --- .gitignore | 31 ++ .idea/compiler.xml | 21 ++ .idea/encodings.xml | 6 + .idea/misc.xml | 13 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + MEMO.md | 4 + README.md | 7 + mvnw | 286 ++++++++++++++++++ mvnw.cmd | 161 ++++++++++ neumall.iml | 123 ++++++++ pom.xml | 70 +++++ .../edu/neu/neumall/NeumallApplication.java | 13 + .../neu/neumall/configure/WebMvcConfig.java | 14 + .../neumall/configure/WebSecurityConfig.java | 39 +++ .../neumall/controller/LoginController.java | 14 + .../controller/RegisterController.java | 49 +++ .../java/edu/neu/neumall/entity/Category.java | 53 ++++ .../java/edu/neu/neumall/entity/Order.java | 71 +++++ .../java/edu/neu/neumall/entity/Product.java | 214 +++++++++++++ .../neu/neumall/entity/ProductComment.java | 113 +++++++ .../edu/neu/neumall/entity/ShippingAddr.java | 171 +++++++++++ .../edu/neu/neumall/entity/ShoppingCart.java | 75 +++++ .../java/edu/neu/neumall/entity/User.java | 269 ++++++++++++++++ .../repository/CategoryRepository.java | 12 + .../neumall/repository/OrderRepository.java | 15 + .../repository/ProductCommentRepository.java | 13 + .../neumall/repository/ProductRepository.java | 27 ++ .../repository/ShippingAddrRepository.java | 12 + .../repository/ShoppingCartRepository.java | 15 + .../neumall/repository/UserRepository.java | 16 + .../edu/neu/neumall/service/UserService.java | 101 +++++++ src/main/resources/templates/login.html | 28 ++ src/main/resources/templates/register.html | 77 +++++ .../neu/neumall/NeumallApplicationTests.java | 16 + 35 files changed, 2163 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 MEMO.md create mode 100644 README.md create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 neumall.iml create mode 100644 pom.xml create mode 100644 src/main/java/edu/neu/neumall/NeumallApplication.java create mode 100644 src/main/java/edu/neu/neumall/configure/WebMvcConfig.java create mode 100644 src/main/java/edu/neu/neumall/configure/WebSecurityConfig.java create mode 100644 src/main/java/edu/neu/neumall/controller/LoginController.java create mode 100644 src/main/java/edu/neu/neumall/controller/RegisterController.java create mode 100644 src/main/java/edu/neu/neumall/entity/Category.java create mode 100644 src/main/java/edu/neu/neumall/entity/Order.java create mode 100644 src/main/java/edu/neu/neumall/entity/Product.java create mode 100644 src/main/java/edu/neu/neumall/entity/ProductComment.java create mode 100644 src/main/java/edu/neu/neumall/entity/ShippingAddr.java create mode 100644 src/main/java/edu/neu/neumall/entity/ShoppingCart.java create mode 100644 src/main/java/edu/neu/neumall/entity/User.java create mode 100644 src/main/java/edu/neu/neumall/repository/CategoryRepository.java create mode 100644 src/main/java/edu/neu/neumall/repository/OrderRepository.java create mode 100644 src/main/java/edu/neu/neumall/repository/ProductCommentRepository.java create mode 100644 src/main/java/edu/neu/neumall/repository/ProductRepository.java create mode 100644 src/main/java/edu/neu/neumall/repository/ShippingAddrRepository.java create mode 100644 src/main/java/edu/neu/neumall/repository/ShoppingCartRepository.java create mode 100644 src/main/java/edu/neu/neumall/repository/UserRepository.java create mode 100644 src/main/java/edu/neu/neumall/service/UserService.java create mode 100644 src/main/resources/templates/login.html create mode 100644 src/main/resources/templates/register.html create mode 100644 src/test/java/edu/neu/neumall/NeumallApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a2a3040 --- /dev/null +++ b/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..8179d18 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..b26911b --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..9adde7e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..86a0525 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MEMO.md b/MEMO.md new file mode 100644 index 0000000..cff3697 --- /dev/null +++ b/MEMO.md @@ -0,0 +1,4 @@ +1. `thymeleaf`object名称问题 + + 解决方法：使用` @ModelAttribute`注解 [thymeleaf-not-displaying-spring-form-error-messages](https://stackoverflow.com/questions/22948257/thymeleaf-not-displaying-spring-form-error-messages) + diff --git a/README.md b/README.md new file mode 100644 index 0000000..f081311 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +## How To Config +1. Rename configure file `application.properties.backup` to `application.properties` +2. Write your own mysql database _**address, port and name**_, _**username**_ and _**password**_ is also required. +3. Start up with maven + +### Hint +Configure to use [163 maven mirrors](http://mirrors.163.com/.help/maven.html). diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..8b9da3b --- /dev/null +++ b/mvnw @@ -0,0 +1,286 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..fef5a8f --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,161 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. 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, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/neumall.iml b/neumall.iml new file mode 100644 index 0000000..53fd773 --- /dev/null +++ b/neumall.iml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..1acc70e --- /dev/null +++ b/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.7.RELEASE + + + edu.neu + neumall + 0.0.1-SNAPSHOT + neumall + Demo project for Spring Boot + + + 11 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.projectlombok + lombok + 1.18.8 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/edu/neu/neumall/NeumallApplication.java b/src/main/java/edu/neu/neumall/NeumallApplication.java new file mode 100644 index 0000000..edde6d3 --- /dev/null +++ b/src/main/java/edu/neu/neumall/NeumallApplication.java @@ -0,0 +1,13 @@ +package edu.neu.neumall; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class NeumallApplication { + + public static void main(String[] args) { + SpringApplication.run(NeumallApplication.class, args); + } + +} diff --git a/src/main/java/edu/neu/neumall/configure/WebMvcConfig.java b/src/main/java/edu/neu/neumall/configure/WebMvcConfig.java new file mode 100644 index 0000000..49cae83 --- /dev/null +++ b/src/main/java/edu/neu/neumall/configure/WebMvcConfig.java @@ -0,0 +1,14 @@ +package edu.neu.neumall.configure; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + @Bean + public BCryptPasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/edu/neu/neumall/configure/WebSecurityConfig.java b/src/main/java/edu/neu/neumall/configure/WebSecurityConfig.java new file mode 100644 index 0000000..03d3d0b --- /dev/null +++ b/src/main/java/edu/neu/neumall/configure/WebSecurityConfig.java @@ -0,0 +1,39 @@ +package edu.neu.neumall.configure; + +import edu.neu.neumall.service.UserService; +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 WebSecurityConfig extends WebSecurityConfigurerAdapter { + + + private final BCryptPasswordEncoder bCryptPasswordEncoder; + + private final UserService userService; + + + @Autowired + public WebSecurityConfig(UserService userService, BCryptPasswordEncoder bCryptPasswordEncoder) { + this.bCryptPasswordEncoder = bCryptPasswordEncoder; + this.userService = userService; + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.csrf().disable() + .authorizeRequests().antMatchers("/register/**").permitAll() + .and().formLogin().loginPage("/login").usernameParameter("username").passwordParameter("password"); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userService).passwordEncoder(bCryptPasswordEncoder); + } +} diff --git a/src/main/java/edu/neu/neumall/controller/LoginController.java b/src/main/java/edu/neu/neumall/controller/LoginController.java new file mode 100644 index 0000000..f60447a --- /dev/null +++ b/src/main/java/edu/neu/neumall/controller/LoginController.java @@ -0,0 +1,14 @@ +package edu.neu.neumall.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/login") +public class LoginController { + @GetMapping + public String loginPage() { + return "login.html"; + } +} diff --git a/src/main/java/edu/neu/neumall/controller/RegisterController.java b/src/main/java/edu/neu/neumall/controller/RegisterController.java new file mode 100644 index 0000000..fa7ea10 --- /dev/null +++ b/src/main/java/edu/neu/neumall/controller/RegisterController.java @@ -0,0 +1,49 @@ +package edu.neu.neumall.controller; + +import edu.neu.neumall.entity.User; +import edu.neu.neumall.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.validation.Errors; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.validation.Valid; + +@Controller +@RequestMapping("/register") +public class RegisterController { + + private UserService userService; + private BCryptPasswordEncoder bCryptPasswordEncoder; + + @Autowired + public RegisterController(UserService userService, BCryptPasswordEncoder bCryptPasswordEncoder) { + this.userService = userService; + this.bCryptPasswordEncoder = bCryptPasswordEncoder; + } + + @GetMapping + public String registerPage(Model model) { + model.addAttribute("registrationForm", new UserService.UserRegistrationForm()); + return "register"; + } + + @PostMapping + public String register(@Valid @ModelAttribute("registrationForm") UserService.UserRegistrationForm registrationForm, BindingResult bindingResult, Model model) { + if (bindingResult.hasErrors()) { + model.addAttribute("registrationForm", registrationForm); + System.out.println("errors"); + return "register"; + } + User newUser = userService.toUser(registrationForm, bCryptPasswordEncoder); + userService.saveUser(newUser); + // TODO: 2019/8/25 duplication check + return "redirect:/login"; + } +} diff --git a/src/main/java/edu/neu/neumall/entity/Category.java b/src/main/java/edu/neu/neumall/entity/Category.java new file mode 100644 index 0000000..db7b371 --- /dev/null +++ b/src/main/java/edu/neu/neumall/entity/Category.java @@ -0,0 +1,53 @@ +package edu.neu.neumall.entity; + + +import com.fasterxml.jackson.annotation.JsonManagedReference; + +import javax.persistence.*; +import java.util.List; + +@Entity +@Table(name = "Category") +public class Category { + /** + * Primary key + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer ID; + + /** + * Category's human friendly name + */ + @Column(name = "name") + private String name; + + @JsonManagedReference + @OneToMany(mappedBy = "category") + private List goods; + + public List getGoods() { + return goods; + } + + public void setGoods(List goods) { + this.goods = goods; + } + + public Integer getID() { + return ID; + } + + public String getName() { + return name; + } + + public void setID(Integer ID) { + this.ID = ID; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/edu/neu/neumall/entity/Order.java b/src/main/java/edu/neu/neumall/entity/Order.java new file mode 100644 index 0000000..a6ad986 --- /dev/null +++ b/src/main/java/edu/neu/neumall/entity/Order.java @@ -0,0 +1,71 @@ +package edu.neu.neumall.entity; + +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Entity +@Table(name = "OrderInfo") +public class Order { + /** + * Primary key + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + long ID; + + /** + * User attached to order + */ + @ManyToOne + @JoinColumn + @NotNull + private User owner; + + /** + * Product attached to order + */ + @ManyToOne + @JoinColumn + @NotNull + private Product product; + + /** + * Number of product in order + */ + @Column(name = "count") + private int count; + + /** + * Price of product in order + */ + @Column(name = "price") + private double price; + + /** + * Order's type: + * PURCHASE/REFUND + */ + @NotNull + @Enumerated(value = EnumType.STRING) + @Column(name = "type") + private OrderType type; + + @CreationTimestamp + private Date create_time; + + @UpdateTimestamp + private Date update_time; + + public enum OrderStatus { + FINISHED + } + + public enum OrderType { + PURCHASE, REF + } +} diff --git a/src/main/java/edu/neu/neumall/entity/Product.java b/src/main/java/edu/neu/neumall/entity/Product.java new file mode 100644 index 0000000..1934c26 --- /dev/null +++ b/src/main/java/edu/neu/neumall/entity/Product.java @@ -0,0 +1,214 @@ +package edu.neu.neumall.entity; + +import com.fasterxml.jackson.annotation.JsonBackReference; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; +import java.util.Set; + +@Entity +@Table(name = "Product") +public class Product { + /** + * Product's ID, primary key + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long ID; + + /** + * Product's name + */ + @NotNull + @Column(name = "name") + private String name; + + /** + * Product's main image + */ + @NotNull + @Column(name = "main_image", columnDefinition = "varchar(50) default 'img/default_product_img.jpg'") + private String main_img = "varchar(50) default 'img/default_product_img.jpg"; + // TODO: 2019/7/23 add a default image file for product + + /** + * Number of product + */ + @NotNull + @Column(name = "count") + private Integer count; + + /** + * Product's price + */ + @NotNull + @Column(name = "price", columnDefinition = "DECIMAL(20,2)") + private Double price; + + /** + * Category of product + */ + @NotNull + @ManyToOne + @JoinColumn(name = "category") +// @JsonBackReference + private Category category; + + /** + * Detail description of Product + */ + @NotNull + @Column(name = "description") + private String description; + + /** + * Seller of the product + */ + @NotNull + @ManyToOne + @JoinColumn(name = "owner") + private User owner; + + @OneToMany(mappedBy = "target") + private List commentList; + + /** + * Product's Status + */ + @NotNull + @Column(name = "status") + @Enumerated(value = EnumType.STRING) + private ProductStatus status; + + + /** + * Order relationship with user + */ +// @JsonBackReference + @OneToMany(mappedBy = "product") + private Set order; + + /** + * Represent item in shopping cart of user + */ + @OneToMany(mappedBy = "product") +// @JsonBackReference + private Set shoppingCartSet; + + @CreationTimestamp + @Column(name = "create_time") + private Date createTime; + + @UpdateTimestamp + @Column(name = "update_time") + private Date updateTime; + + public enum ProductStatus { + ONSALE, OFFSALE + } + + public Integer getCount() { + return count; + } + + public Long getID() { + return ID; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public void setCount(Integer count) { + this.count = count; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setID(Long ID) { + this.ID = ID; + } + + public void setName(String name) { + this.name = name; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Category getCategory() { + return category; + } + + public void setCategory(Category category) { + this.category = category; + } + + public User getOwner() { + return owner; + } + + public void setOwner(User owner) { + this.owner = owner; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public ProductStatus getStatus() { + return status; + } + + public void setStatus(ProductStatus status) { + this.status = status; + } + + public String getCategoryName() { + return this.category.getName(); + } + + public void setStatusByName(String status) { + try { + this.status = ProductStatus.valueOf(status); + } catch (IllegalArgumentException e) { + this.status = ProductStatus.OFFSALE; + } + } + + public String getMain_img() { + return main_img; + } + + public void setMain_img(String main_img) { + this.main_img = main_img; + } +} diff --git a/src/main/java/edu/neu/neumall/entity/ProductComment.java b/src/main/java/edu/neu/neumall/entity/ProductComment.java new file mode 100644 index 0000000..d62ccf9 --- /dev/null +++ b/src/main/java/edu/neu/neumall/entity/ProductComment.java @@ -0,0 +1,113 @@ +package edu.neu.neumall.entity; + +import com.fasterxml.jackson.annotation.JsonBackReference; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Entity +@Table(name = "ProductComment") +public class ProductComment { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column + private long ID; + + @Column(name = "content") + private String content; + + @Column(name = "type") + @Enumerated(value = EnumType.STRING) + private CommentType type; + + @NotNull + @ManyToOne + @JoinColumn(name = "commenter") +// @JsonBackReference + private User commenter; + + @NotNull + @ManyToOne + @JoinColumn(name = "product") +// @JsonBackReference + private Product target; + + @CreationTimestamp + @Column(name = "create_time") + private Date createTime; + + @UpdateTimestamp + @Column(name = "update_time") + private Date updateTime; + + public CommentType getType() { + return type; + } + + public void setType(CommentType type) { + this.type = type; + } + + public void setTypeByName(String typeName) { + try { + this.type = CommentType.valueOf(typeName); + } catch (IllegalArgumentException e) { + this.type = CommentType.AVERAGE; + } + } + + public User getCommenter() { + return commenter; + } + + public void setCommenter(User commenter) { + this.commenter = commenter; + } + + public Product getTarget() { + return target; + } + + public void setTarget(Product target) { + this.target = target; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public static enum CommentType { + GOOD, BAD, AVERAGE + } + + public long getID() { + return ID; + } + + public void setID(long ID) { + this.ID = ID; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } +} diff --git a/src/main/java/edu/neu/neumall/entity/ShippingAddr.java b/src/main/java/edu/neu/neumall/entity/ShippingAddr.java new file mode 100644 index 0000000..db2f6fe --- /dev/null +++ b/src/main/java/edu/neu/neumall/entity/ShippingAddr.java @@ -0,0 +1,171 @@ +package edu.neu.neumall.entity; + +import com.fasterxml.jackson.annotation.JsonBackReference; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Entity +@Table(name = "ShippingAddress") +public class ShippingAddr { + /** + * Primary key + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer ID; + + /** + * Addr's owner + */ +// @JsonBackReference + @ManyToOne + @JoinColumn(name = "owner") + private User owner; + + /** + * Receiver's name + */ + @NotNull + @Column(name = "receiver_name") + private String receiverName; + + /** + * Receiver's phone + */ + @NotNull + @Column(name = "receiver_phone") + private String receiverPhone; + + /** + * Receiver's zip + */ + @Column(name = "receiver_zip") + private String receiverZip; + + /** + * Receiver's province + */ + @NotNull + @Column(name = "receiver_province") + private String receiverProvince; + + /** + * Receiver's city + */ + @NotNull + @Column(name = "receiver_city") + private String receiverCity; + + /** + * Receiver's receiverDistrict + */ + @NotNull + @Column(name = "receiver_district") + private String receiverDistrict; + + /** + * Receiver's detailed address + */ + @NotNull + @Column(name = "receiver_address") + private String receiverAddress; + + @CreationTimestamp + private Date createTime; + + @UpdateTimestamp + private Date updateTime; + + public Integer getID() { + return ID; + } + + public void setID(Integer ID) { + this.ID = ID; + } + + public String getReceiverName() { + return receiverName; + } + + public void setReceiverName(String receiverName) { + this.receiverName = receiverName; + } + + public String getReceiverPhone() { + return receiverPhone; + } + + public void setReceiverPhone(String receiverPhone) { + this.receiverPhone = receiverPhone; + } + + public String getReceiverZip() { + return receiverZip; + } + + public void setReceiverZip(String receiverZip) { + this.receiverZip = receiverZip; + } + + public String getReceiverProvince() { + return receiverProvince; + } + + public void setReceiverProvince(String receiverProvince) { + this.receiverProvince = receiverProvince; + } + + public String getReceiverCity() { + return receiverCity; + } + + public void setReceiverCity(String receiverCity) { + this.receiverCity = receiverCity; + } + + public String getReceiverAddress() { + return receiverAddress; + } + + public void setReceiverAddress(String receiverAddress) { + this.receiverAddress = receiverAddress; + } + + public Date getCreateTime() { + return createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public User getOwner() { + return owner; + } + + public void setOwner(User owner) { + this.owner = owner; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getReceiverDistrict() { + return receiverDistrict; + } + + public void setReceiverDistrict(String receiverDistrict) { + this.receiverDistrict = receiverDistrict; + } +} diff --git a/src/main/java/edu/neu/neumall/entity/ShoppingCart.java b/src/main/java/edu/neu/neumall/entity/ShoppingCart.java new file mode 100644 index 0000000..fa6c8b4 --- /dev/null +++ b/src/main/java/edu/neu/neumall/entity/ShoppingCart.java @@ -0,0 +1,75 @@ +package edu.neu.neumall.entity; + +import com.fasterxml.jackson.annotation.JsonManagedReference; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Table(name = "ShoppingCart") +public class ShoppingCart { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long cartID; + + @ManyToOne + @JoinColumn +// @JsonManagedReference + private User owner; + + @ManyToOne + @JoinColumn +// @JsonManagedReference + private Product product; + + @Column(name = "count") + private int count; + + @CreationTimestamp + private Date create_time; + + @UpdateTimestamp + private Date update_time; + + public User getOwner() { + return owner; + } + + public void setOwner(User owner) { + this.owner = owner; + } + + public Product getProduct() { + return product; + } + + public void setProduct(Product product) { + this.product = product; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + public Date getCreate_time() { + return create_time; + } + + public void setCreate_time(Date create_time) { + this.create_time = create_time; + } + + public Date getUpdate_time() { + return update_time; + } + + public void setUpdate_time(Date update_time) { + this.update_time = update_time; + } +} diff --git a/src/main/java/edu/neu/neumall/entity/User.java b/src/main/java/edu/neu/neumall/entity/User.java new file mode 100644 index 0000000..19bfc6c --- /dev/null +++ b/src/main/java/edu/neu/neumall/entity/User.java @@ -0,0 +1,269 @@ +package edu.neu.neumall.entity; + +import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonManagedReference; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.*; + +@Entity +@Table(name = "User") +public class User implements UserDetails { + /** + * User id, primary key + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long ID; + + /** + * User's nickname, need not unique + */ + @NotNull + @Column(name = "nickname") + private String nickName; + + /** + * User's avatar + */ + @NotNull + @Column(name = "avatar", columnDefinition = "varchar(50) default '/img/default_avatar.png'") + private String avatar = "/img/default_avatar.png"; + + /** + * User's password, after encrypted + * Will not shown in json + */ + @NotNull + @Column(name = "password") +// @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String password; + + /** + * User's phone, require unique + * and as the identity when login + */ + @Column(name = "phone", unique = true) + @NotNull + private String phone; + + + /** + * User's email, unique required + */ + @Column(name = "email", unique = true) + private String email; + + + /** + * User's reset-password question + */ + @NotNull + @Column(name = "question") + private String question; + + /** + * User's reset-password answer + */ + @NotNull + @Column(name = "answer") + private String answer; + + @CreationTimestamp + private Date create_time; + + @UpdateTimestamp + private Date update_time; + + /** + * User's shopping cart + */ + @OneToMany(mappedBy = "owner") +// @JsonBackReference + private Set shoppingCart; + + /** + * User's shipping address list + */ +// @JsonManagedReference + @OneToMany(mappedBy = "owner", fetch = FetchType.EAGER) + private Set shippingAddrAddrList = new HashSet<>(); + + // @JsonBackReference + @OneToMany(mappedBy = "owner", fetch = FetchType.EAGER) + private Set order; + + @OneToMany(mappedBy = "commenter") + private Set comments; + + @NotNull + @Enumerated(value = EnumType.STRING) + private UserRole role; + + public void setRole(UserRole role) { + this.role = role; + } + + public UserRole getRole() { + return role; + } + + public Set getShippingAddrAddrList() { + return shippingAddrAddrList; + } + + public void setShippingAddrAddrList(Set shippingAddrAddrList) { + this.shippingAddrAddrList = shippingAddrAddrList; + } + + public void addShipping(ShippingAddr shippingAddr) { + this.shippingAddrAddrList.add(shippingAddr); + } + + public Set getOrder() { + return order; + } + + public void setOrder(Set order) { + this.order = order; + } + + public Set getShoppingCart() { + return shoppingCart; + } + + public void setShoppingCart(Set shoppingCart) { + this.shoppingCart = shoppingCart; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public enum UserRole { + CUSTOMER, SHOPKEEPER, ADMIN, NONE + } + + + public long getID() { + return ID; + } + + public void setID(long ID) { + this.ID = ID; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getQuestion() { + return question; + } + + public void setQuestion(String question) { + this.question = question; + } + + public String getAnswer() { + return answer; + } + + public void setAnswer(String answer) { + this.answer = answer; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + @Override + public Collection getAuthorities() { + return Collections.singletonList(new SimpleGrantedAuthority(role.name())); + } + + public String getPassword() { + return password; + } + + @Override + public String getUsername() { + return nickName; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } + + public void setPassword(String password) { + this.password = password; + } + + public Date getCreate_time() { + return create_time; + } + + public void setCreate_time(Date create_time) { + this.create_time = create_time; + } + + public Date getUpdate_time() { + return update_time; + } + + public void setUpdate_time(Date update_time) { + this.update_time = update_time; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + @Override + public boolean equals(Object o) { + if (o instanceof User) { + return this.getID() == ((User) o).ID; + } + return false; + } +} diff --git a/src/main/java/edu/neu/neumall/repository/CategoryRepository.java b/src/main/java/edu/neu/neumall/repository/CategoryRepository.java new file mode 100644 index 0000000..dc31dbd --- /dev/null +++ b/src/main/java/edu/neu/neumall/repository/CategoryRepository.java @@ -0,0 +1,12 @@ +package edu.neu.neumall.repository; + +import edu.neu.neumall.entity.Category; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface CategoryRepository extends JpaRepository { + Optional findByName(String category); +} diff --git a/src/main/java/edu/neu/neumall/repository/OrderRepository.java b/src/main/java/edu/neu/neumall/repository/OrderRepository.java new file mode 100644 index 0000000..6c663d3 --- /dev/null +++ b/src/main/java/edu/neu/neumall/repository/OrderRepository.java @@ -0,0 +1,15 @@ +package edu.neu.neumall.repository; + + +import edu.neu.neumall.entity.Order; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Set; + +@Repository +public interface OrderRepository extends JpaRepository { + Set findByOwner_ID(long userID); + + Set findByProduct_ID(long productID); +} diff --git a/src/main/java/edu/neu/neumall/repository/ProductCommentRepository.java b/src/main/java/edu/neu/neumall/repository/ProductCommentRepository.java new file mode 100644 index 0000000..3884237 --- /dev/null +++ b/src/main/java/edu/neu/neumall/repository/ProductCommentRepository.java @@ -0,0 +1,13 @@ +package edu.neu.neumall.repository; + +import edu.neu.neumall.entity.ProductComment; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Set; + +@Repository +public interface ProductCommentRepository extends JpaRepository { + public Set findByTargetID(long productID); + +} diff --git a/src/main/java/edu/neu/neumall/repository/ProductRepository.java b/src/main/java/edu/neu/neumall/repository/ProductRepository.java new file mode 100644 index 0000000..7ae46bd --- /dev/null +++ b/src/main/java/edu/neu/neumall/repository/ProductRepository.java @@ -0,0 +1,27 @@ +package edu.neu.neumall.repository; + +import edu.neu.neumall.entity.Product; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ProductRepository extends JpaRepository { + List findByPriceBetween(double low, double high); + + List findByPrice(double price); + + List findByPriceAndCategory_Name(double price, String category); + + List findByPriceGreaterThanEqual(double price); + + List findByPriceGreaterThanEqualAndCategory_Name(double price, String category); + + + List findByPriceLessThanEqual(double price); + + List findByCategory_Name(String name); + + List findByPriceBetweenAndCategory_Name(double low, double high, String category); +} diff --git a/src/main/java/edu/neu/neumall/repository/ShippingAddrRepository.java b/src/main/java/edu/neu/neumall/repository/ShippingAddrRepository.java new file mode 100644 index 0000000..409f926 --- /dev/null +++ b/src/main/java/edu/neu/neumall/repository/ShippingAddrRepository.java @@ -0,0 +1,12 @@ +package edu.neu.neumall.repository; + +import edu.neu.neumall.entity.ShippingAddr; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Set; + +@Repository +public interface ShippingAddrRepository extends JpaRepository { + Set findByOwner_IDOrderByID(long userID); +} diff --git a/src/main/java/edu/neu/neumall/repository/ShoppingCartRepository.java b/src/main/java/edu/neu/neumall/repository/ShoppingCartRepository.java new file mode 100644 index 0000000..a2ddc31 --- /dev/null +++ b/src/main/java/edu/neu/neumall/repository/ShoppingCartRepository.java @@ -0,0 +1,15 @@ +package edu.neu.neumall.repository; + +import edu.neu.neumall.entity.ShoppingCart; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ShoppingCartRepository extends JpaRepository { + + public List findAllByOwner_ID(long id); + + public List removeByOwner_ID(long id); +} diff --git a/src/main/java/edu/neu/neumall/repository/UserRepository.java b/src/main/java/edu/neu/neumall/repository/UserRepository.java new file mode 100644 index 0000000..6b29cc8 --- /dev/null +++ b/src/main/java/edu/neu/neumall/repository/UserRepository.java @@ -0,0 +1,16 @@ +package edu.neu.neumall.repository; + +import edu.neu.neumall.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface UserRepository extends JpaRepository { + public Optional findByNickName(String nickName); + + public Optional findByPhone(String phone); + + public Optional findByEmail(String email); +} diff --git a/src/main/java/edu/neu/neumall/service/UserService.java b/src/main/java/edu/neu/neumall/service/UserService.java new file mode 100644 index 0000000..ec93d56 --- /dev/null +++ b/src/main/java/edu/neu/neumall/service/UserService.java @@ -0,0 +1,101 @@ +package edu.neu.neumall.service; + +import edu.neu.neumall.entity.User; +import edu.neu.neumall.repository.UserRepository; +import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +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.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Optional; + +@Service +public class UserService implements UserDetailsService { + + private final UserRepository userRepository; + private final BCryptPasswordEncoder bCryptPasswordEncoder; + + @Autowired + public UserService(@Qualifier("userRepository") UserRepository userRepository, BCryptPasswordEncoder bCryptPasswordEncoder) { + this.userRepository = userRepository; + this.bCryptPasswordEncoder = bCryptPasswordEncoder; + } + + public void saveUser(User user) { + + user.setPassword(bCryptPasswordEncoder.encode(user.getPassword())); + userRepository.save(user); + } + + @Override + public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException { + var u = userRepository.findByPhone(s); + if (u.isEmpty()) { + throw new UsernameNotFoundException("User '" + s + "'not fond"); + } + return u.get(); + } + + @Data + public static class UserRegistrationForm { + @NotNull(message = "昵称不能为空") + @NotBlank(message = "昵称不能为空") + private String nickname; + + @NotNull(message = "密码不能为空") + @NotBlank(message = "密码不能为空") + @Size(min = 8, max = 16, message = "密码长度必须介于8-16之间") + private String password; + + @NotNull(message = "手机号码不能为空") + @NotBlank(message = "手机号码不能为空") + private String phone; + + @NotNull(message = "Email不能为空") + @NotBlank(message = "Email不能为空") + @Email(message = "请输入有效的Email") + private String email; + + @NotNull(message = "问题不能为空") + @NotBlank(message = "问题不能为空") + private String question; + + @NotNull(message = "答案不能为空") + @NotBlank(message = "答案不能为空") + private String answer; + + @NotNull(message = "role can not be null") + @NotBlank(message = "role must has a value") + private String role; + } + + public User toUser(UserRegistrationForm form, PasswordEncoder passwordEncoder) { + User user = new User(); + user.setPassword(form.password); + user.setNickName(form.nickname); + user.setPhone(form.phone); + user.setEmail(form.email); + user.setQuestion(form.question); + user.setAnswer(form.answer); + try { + user.setRole(User.UserRole.valueOf(form.role)); + } catch (IllegalArgumentException e) { + user.setRole(User.UserRole.NONE); + } + + return user; + } + + Optional findUserByPhone(String phone) { + return userRepository.findByPhone(phone); + } +} diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html new file mode 100644 index 0000000..b52ff14 --- /dev/null +++ b/src/main/resources/templates/login.html @@ -0,0 +1,28 @@ + + + + + Login + + + + + + + + +
+
+
+ + +
+
+ + +
+ +
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html new file mode 100644 index 0000000..3c8ffda --- /dev/null +++ b/src/main/resources/templates/register.html @@ -0,0 +1,77 @@ + + + + + Register + + + + + + + + +
+
+
+ + + nickname error +
+
+ + + password error +
+
+ + + phone error +
+
+ + + email error +
+
+ + + question error +
+
+ + + answer error +
+
+ + +
+ + + + +
+ + +
+ +
+
+ + \ No newline at end of file diff --git a/src/test/java/edu/neu/neumall/NeumallApplicationTests.java b/src/test/java/edu/neu/neumall/NeumallApplicationTests.java new file mode 100644 index 0000000..4ca8299 --- /dev/null +++ b/src/test/java/edu/neu/neumall/NeumallApplicationTests.java @@ -0,0 +1,16 @@ +package edu.neu.neumall; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class NeumallApplicationTests { + + @Test + public void contextLoads() { + } + +}