diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..6141fc2d395923b0f364e9c472a54ebf376cb36d --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + newgroupshell + com.groupshell + 1.0-SNAPSHOT + + common + 0.0.1-SNAPSHOT + common + common + + 21 + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.projectlombok + lombok + provided + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/common/src/main/java/com/groupshell/common/result/PageResult.java b/common/src/main/java/com/groupshell/common/result/PageResult.java new file mode 100644 index 0000000000000000000000000000000000000000..31ddf14bcb42f77024af9129c8b801351d92bd03 --- /dev/null +++ b/common/src/main/java/com/groupshell/common/result/PageResult.java @@ -0,0 +1,20 @@ +package com.groupshell.common.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 封装分页查询结果 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PageResult implements Serializable +{ + private Long total; //总记录数 + private List records; //当前页数据集合 +} diff --git a/common/src/main/java/com/groupshell/common/result/Result.java b/common/src/main/java/com/groupshell/common/result/Result.java new file mode 100644 index 0000000000000000000000000000000000000000..667807795dd2605970861b50af9ad72c8ad0abf9 --- /dev/null +++ b/common/src/main/java/com/groupshell/common/result/Result.java @@ -0,0 +1,41 @@ +package com.groupshell.common.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 后端统一返回结果 + * + * @param + */ +@Data +@NoArgsConstructor +public class Result implements Serializable +{ + private Integer code; + private String message; + private T data; + public static Result success() + { + Result result=new Result<>(); + result.code=1; + return result; + } + public static Result success(T data) + { + Result result=new Result<>(); + result.setCode(1); + result.setData(data); + return result; + } + public static Result error(String message) + { + Result result=new Result<>(); + result.setCode(0); + result.setMessage(message); + return result; + } +} + diff --git a/mvnw b/mvnw deleted file mode 100644 index 66df2854281f4cb6869e4830dd1a7abd1e946c18..0000000000000000000000000000000000000000 --- a/mvnw +++ /dev/null @@ -1,308 +0,0 @@ -#!/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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# 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 /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - 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 - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -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 "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -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="$(\unset -f command 2>/dev/null; \command -v 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 - -# 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/.." || exit 1; pwd) - fi - # end of workaround - done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi -} - -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# 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. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" -else - log "Couldn't find $wrapperJarPath, downloading it ..." - - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi -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 "$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 - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index 95ba6f54ac526de46248af840bab26f33f946b93..0000000000000000000000000000000000000000 --- a/mvnw.cmd +++ /dev/null @@ -1,205 +0,0 @@ -@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 Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@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 keystroke 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 by 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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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 WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_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% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% - -cmd /C exit /B %ERROR_CODE% diff --git a/pojo/pom.xml b/pojo/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..dbe3408fc3e2c8f4b6fb21059c28a09208d54611 --- /dev/null +++ b/pojo/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + com.groupshell + newgroupshell + 1.0-SNAPSHOT + + pojo + 0.0.1-SNAPSHOT + pojo + pojo + + 21 + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/pom.xml b/pom.xml index 8a81cd0de2f31059407bd809e2bf8cba0ab6aa48..48e43e2ff962e63a6de8f3463672372ea0e8c9fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,79 +1,46 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.2.4 - - - com.example - newgroupshell - 0.0.1-SNAPSHOT - newgroupshell - newgroupshell - - 17 - - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-web-services - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 3.0.3 - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.4 + + - - org.springframework.boot - spring-boot-devtools - runtime - true - - - com.mysql - mysql-connector-j - runtime - - - org.springframework.boot - spring-boot-starter-test - test - - - org.mybatis.spring.boot - mybatis-spring-boot-starter-test - 3.0.3 - test - + com.groupshell + newgroupshell + pom + 1.0-SNAPSHOT + + 21 + - - com.alibaba - fastjson - 1.2.67 - - + + common + pojo + server + - - - - org.springframework.boot - spring-boot-maven-plugin - 3.2.4 - - - + + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 3.2.4 + + + diff --git a/server/pom.xml b/server/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..e1e04e8cacf511b196848cde1e73157e7d108cd9 --- /dev/null +++ b/server/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + com.groupshell + newgroupshell + 1.0-SNAPSHOT + + server + 0.0.1-SNAPSHOT + server + server + + 21 + + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-web + + + + com.mysql + mysql-connector-j + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/com/example/newgroupshell/NewgroupshellApplication.java b/server/src/main/java/com/groupshell/server/ServerApplication.java similarity index 45% rename from src/main/java/com/example/newgroupshell/NewgroupshellApplication.java rename to server/src/main/java/com/groupshell/server/ServerApplication.java index 4ecd3fb6d4b35e019855efb2d04fd94d6f835c67..73d799405eb1e01950cc7beb5e86361673286a38 100644 --- a/src/main/java/com/example/newgroupshell/NewgroupshellApplication.java +++ b/server/src/main/java/com/groupshell/server/ServerApplication.java @@ -1,13 +1,13 @@ -package com.example.newgroupshell; +package com.groupshell.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class NewgroupshellApplication { - - public static void main(String[] args) { - SpringApplication.run(NewgroupshellApplication.class, args); +public class ServerApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ServerApplication.class,args); } - } diff --git a/src/main/resources/application.properties b/server/src/main/resources/application.properties similarity index 64% rename from src/main/resources/application.properties rename to server/src/main/resources/application.properties index 3f967689fe49b28e29174ddef5f827611a0f8cbf..6c4729ba6abd5a81848ebf0b3f64529d819aa011 100644 --- a/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -1,8 +1,4 @@ -spring.application.name=newgroupshell -#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.url=jdbc:mysql://localhost:3306/groupshell?serverTimezone=GMT%2b8 -#spring.datasource.username=root -#spring.datasource.password=676893 + #mysql spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/src/main/java/com/example/newgroupshell/controller/GroupCtrl.java b/src/main/java/com/example/newgroupshell/controller/GroupCtrl.java deleted file mode 100644 index 725f968336600dfa92c7249da5280fca5c9a9e9b..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/controller/GroupCtrl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.newgroupshell.controller; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.example.newgroupshell.pojo.Group; -import com.example.newgroupshell.service.GroupService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -@Controller -public class GroupCtrl { - @Autowired - private GroupService groupService; - - - - @PostMapping(value = "/findgroupbyleaderid") - @ResponseBody //获取所有用户 - public JSONObject findgroupbyleaderid(@RequestBody JSONObject userid ){ - JSONObject json = new JSONObject(); - int id = userid.getInteger("uid"); - //获取所有用户信息 - List groups = groupService.findgroupbyleaderid(id); - //把结果json化 - JSONArray groupList = JSONArray.parseArray(JSON.toJSONString(groups)); - json.put("grouplist",groupList); - return json; - } - - - - -} diff --git a/src/main/java/com/example/newgroupshell/controller/UserCtrl.java b/src/main/java/com/example/newgroupshell/controller/UserCtrl.java deleted file mode 100644 index 95fd33cee0debd3caf9fad495ac50bf994e61a7b..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/controller/UserCtrl.java +++ /dev/null @@ -1,384 +0,0 @@ -package com.example.newgroupshell.controller; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.example.newgroupshell.pojo.User; -import com.example.newgroupshell.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.util.HtmlUtils; - -//import javax.annotation.Resource; -import java.util.List; - -@Controller -public class UserCtrl { - @Autowired - private UserService userService; - - @PostMapping(value = "/allUser") - @ResponseBody //获取所有用户 - public JSONObject selectAllUsers(){ - JSONObject json = new JSONObject(); - //获取所有用户信息 - List users = userService.selectAllUsers(); - //把结果json化 - JSONObject userList = (JSONObject) JSON.toJSON(users); - json.put("userlist",userList); - return json; - } - - -// @CrossOrigin -// @PostMapping(value = "/api/login") -// @ResponseBody //用户登录 -// public JSONObject login(@RequestBody JSONObject loginUser) { -// JSONObject res = new JSONObject(); -// System.out.println(loginUser); -// //获取输入的用户名 -// String username = loginUser.getString("accountNumber"); -// username = HtmlUtils.htmlEscape(username); -// //获取输入的密码 -// String password = loginUser.getString("password"); -// password = HtmlUtils.htmlEscape(password); -// SystemManage sm=new SystemManage(); -// //sm.adduser("dhao","123456"); -// System.out.println(username); -// System.out.println(password); -// sm=FileManage.initialize(GlobalConstants.managePath); -// //sm.store(); -// sm.printlist(); -// User curUser =sm.login(username,password); -// if (curUser==null){ -// System.out.println("用户名和密码错误"); -// //用户名或密码输入错误 -// res.put("msg","fail"); -// }else{ -// System.out.println("登录成功"); -// //登录成功 -// res.put("msg","success"); -// -// String name = curUser.getName(); -// -// res.put("name",name); -// } -// return res; -// } -// - - @CrossOrigin - @PostMapping(value = "/api/login") - @ResponseBody //用户登录 - public JSONObject login(@RequestBody User loginUser){ - JSONObject res = new JSONObject(); - //获取输入的用户名 - String username = loginUser.getUsername(); - username = HtmlUtils.htmlEscape(username); - //获取输入的密码 - String password = loginUser.getPassword(); - password = HtmlUtils.htmlEscape(password); - //在数据库查找 - User curUser = userService.findUser(username,password); - if (curUser==null){ - System.out.println("用户名和密码错误"); - //用户名或密码输入错误 - res.put("msg","fail"); - }else{ - System.out.println("登录成功"); - //登录成功 - res.put("msg","success"); - // 把登录用户的id和name传过去 - int id = curUser.getId(); - String name = curUser.getUsername(); - System.out.println(curUser.toString()); - System.out.println(name); - res.put("id",id); - res.put("name",name); - } - return res; - } - -// -// @CrossOrigin -// @PostMapping(value = "/api/register") -// @ResponseBody //用户注册 -// public JSONObject register(@RequestBody JSONObject registerUser){ -// JSONObject data = new JSONObject(); -// // 获取注册用户的用户名 -// String username = registerUser.getString("accountNumber"); -// username = HtmlUtils.htmlEscape(username); -// String password = registerUser.getString("password"); -// password = HtmlUtils.htmlEscape(password); -// System.out.println(username); -// System.out.println(password); -// SystemManage sm=new SystemManage(); -// sm=FileManage.initialize(GlobalConstants.managePath); -// if(sm.exist(username)==false) { -// sm.adduser(username, password); -// sm.store(); -// data.put("msg", "success"); -// } -// else{ -// data.put("msg", "existedname"); -// } -// sm.printlist(); -// return data; -// -// } - - @CrossOrigin - @PostMapping(value = "/api/register") - @ResponseBody //用户注册 - public JSONObject register(@RequestBody User registerUser){ - - System.out.println(registerUser.toString()); - JSONObject data = new JSONObject(); - // 获取注册用户的用户名 - String username = registerUser.getUsername(); - - - username = HtmlUtils.htmlEscape(username); - if (!"".equals(username)){ - User temp = userService.findUserByName(username);//查找用户名是否被占用 - if (temp == null){ - //可以进行注册 - int res = userService.addUser(registerUser); - if (res > 0) // 注册成功 - data.put("msg", "success"); - else // 注册失败 - data.put("msg","fail"); - }else { - //用户名不可用 - data.put("msg","existedname"); - } - } - return data; - } - - @CrossOrigin - @PostMapping(value = "/api/getName") - @ResponseBody // 获取当前用户的用户名 - public JSONObject getName(@RequestBody User user){ - JSONObject json = new JSONObject(); - int id = user.getId(); - String username = userService.getNameById(id); - if (username != null && !"".equals(username)) - json.put("username",username); - else - json.put("username","error"); - return json; - } - - @CrossOrigin - @PostMapping(value = "/api/userInfo") - @ResponseBody //获取当前用户信息 - public JSONObject getUserInfo(@RequestBody User curUser){ - JSONObject json = new JSONObject(); - int id = curUser.getId(); - //根据id获取当前用户信息 - User user = userService.findUserById(id); - //将结果json化 - JSONObject userInfo = (JSONObject) JSON.toJSON(user); - json.put("user",userInfo); - return json; - } - -// @CrossOrigin -// @PostMapping(value = "api/resetPass") -// @ResponseBody // 重置账号密码 -// public JSONObject resetPassword(@RequestBody User user){ -// JSONObject json = new JSONObject(); -// //获取账号的用户名 -// String username = user.getUsername(); -// //获取账号的手机号 -// String telephone = user.getTelephone(); -// //获取账号的新密码 -// String newPass = user.getPassword(); -// //调用业务逻辑层接口，检查系统中是否存在与用户名对应的账号 -// User res = userService.findUserByName(username); -// //1.存在该账号 -// if (res!=null){ -// if (res.getTelephone().equals(telephone)){ -// //1.1 手机号与该账号的手机号对应，可以重置密码 -// int count = userService.resetPass(res.getId(),newPass); -// if (count > 0){ -// //1.1.1 密码重置成功，返回操作结果 -// json.put("msg","success"); -// }else{ -// //1.1.2 出现错误，重置失败，返回操作结果 -// json.put("msg","fail"); -// } -// }else{ -// //1.2 手机号不匹配，返回错误信息 -// json.put("msg","phone-err"); -// } -// }else{ -// //2.用户名输入错误，不存在该账号,返回错误信息 -// json.put("msg","name-err"); -// } -// return json; -// } - -// @CrossOrigin -// @PostMapping(value = "api/setPass") -// @ResponseBody // 修改账号密码 -// public JSONObject setPass(@RequestBody JSONObject user){ -// JSONObject json = new JSONObject(); -// //获取当前用户的账号编号 -// int id = user.getInteger("uid"); -// //获取当前账号原本的密码 -// String oldPass = user.getString("oldPass"); -// //获取当前账号新的密码 -// String newPass = user.getString("newPass"); -// //调用业务逻辑层接口，检查当前用户输入的旧密码是否正确 -// User res = userService.findUserById(id); -// if (res!=null){ -// if (res.getPassword().equals(oldPass)){ -// //旧密码正确，可以修改账号密码 -// int count = userService.resetPass(res.getId(),newPass); -// if (count > 0){ -// //密码修改成功，返回操作结果 -// json.put("msg","success"); -// }else{ -// //出现错误，修改失败，返回错误信息 -// json.put("msg","fail"); -// } -// }else{ -// //旧密码错误，返回错误信息 -// json.put("msg","oldPass-err"); -// } -// }else{ -// //当前用户不存在，返回错误信息 -// json.put("msg","user-err"); -// } -// return json; -// } - - @CrossOrigin - @PostMapping(value = "api/setName") - @ResponseBody // 修改用户名（保持username的唯一性） - public JSONObject setUsername(@RequestBody User user){ - JSONObject json = new JSONObject(); - int id = user.getId();//获取用户的id - String username = user.getUsername(); - if (!"".equals(username) && username != null){ - String before = userService.getNameById(id);//获取原本的username值 - if (before.equals(username)){ - json.put("msg","same");// 用户名没有变化 - }else{ - User temp = userService.findUserByName(username);//检测用户名是否被占用 - if (temp==null){ - //查找为空，用户名可以修改 - int res = userService.setUsername(id,username);//修改当前账号的用户名 - if (res > 0){ - json.put("msg","success");//修改成功 - json.put("username",username); - }else{ - json.put("msg","error");//出现错误，修改失败 - } - }else{ - //用户名已存在，修改失败 - json.put("msg","fail"); - } - } - }else{ - //出现错误，修改失败 - json.put("msg","error"); - } - return json; - } - -// @CrossOrigin -// @PostMapping(value = "api/setTel") -// @ResponseBody // 修改手机号（保持telephone的唯一性） -// public JSONObject setTelephone(@RequestBody User user){ -// JSONObject json = new JSONObject(); -// int id = user.getId(); //获取用户的id -// String phone = user.getTelephone(); -// if (!"".equals(phone) && phone != null){ -// String before = userService.getBeforePhone(id);//获取原本的phone值 -// if (before.equals(phone)){ -// json.put("msg","same");//phone没有改变，修改失败 -// return json; -// }else{ -// // 检测该手机号是否已绑定其他账号 -// User temp = userService.getUserByPhone(phone); -// if (temp == null){ -// //查找结果为空，该手机号可以修改 -// int res = userService.setPhone(id,phone); -// if (res > 0){ -// //修改成功，返回信息 -// json.put("msg","success"); -// json.put("phone",phone); -// }else{ -// //出现错误，修改失败 -// json.put("msg","error"); -// } -// }else { -// // 该手机号已被绑定，修改失败 -// json.put("msg","fail"); -// } -// } -// }else{ -// //出现错误，修改失败 -// json.put("msg","error"); -// } -// return json; -// } - -// @CrossOrigin -// @PostMapping(value = "api/setSex") -// @ResponseBody // 修改性别 -// public JSONObject setSex(@RequestBody User user){ -// JSONObject json = new JSONObject(); -// int id = user.getId(); //获取用户的id -// int sex = user.getSex(); -// if (sex>-1 && sex<2){//检测sex的值是否有效 -// int before = userService.getBeforeSex(id);//获取原本的sex值 -// if (before == sex ){ -// json.put("msg","same");//sex没有改变，修改失败 -// }else{ -// //sex变化了，可以修改 -// int res = userService.setSex(id,sex); -// if (res > 0){ -// json.put("msg","success");//修改成功 -// json.put("sex",String.valueOf(sex)); -// }else -// json.put("msg","error");//出现错误，修改失败 -// } -// }else{ -// json.put("msg","fail");//sex值为无效，修改失败 -// } -// return json; -// } - -// @CrossOrigin -// @PostMapping(value = "api/setBirthdate") -// @ResponseBody // 修改出生日期 -// public JSONObject setBirthdate(@RequestBody User user){ -// JSONObject json = new JSONObject(); -// int id = user.getId(); //获取用户的id -// String date = user.getBirthdate(); -// if (!"".equals(date) && date != null){//检测birthdate的值是否有效 -// String before = userService.getBeforeDate(id);//获取原本的sex值 -// if (date.equals(before)){ -// json.put("msg","same");//sex没有改变，修改失败 -// }else{ -// //可以修改 -// int res = userService.setDate(id,date); -// if (res > 0){ -// json.put("msg","success");//修改成功 -// json.put("birthdate",date); -// }else { -// json.put("msg","error");//出现错误，修改失败 -// } -// } -// }else{ -// //出现错误，修改失败 -// json.put("msg","fail"); -// } -// return json; -// } - -} diff --git a/src/main/java/com/example/newgroupshell/mapper/GroupMapper.java b/src/main/java/com/example/newgroupshell/mapper/GroupMapper.java deleted file mode 100644 index 9c2bdf70f13a9150aa36610b7c018490ad3575a2..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/mapper/GroupMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.newgroupshell.mapper; -import com.example.newgroupshell.pojo.Group; -import com.example.newgroupshell.pojo.User; -import org.apache.ibatis.annotations.*; - -import java.util.List; - - -@Mapper -public interface GroupMapper { - @Select("select * from `groups`") - List selectAllGroup(); - // 获取特定用户 - @Select("select * from 'groups' where leaderid=#{0}") - List findgroupbuleaderid(int leaderid); - - -} \ No newline at end of file diff --git a/src/main/java/com/example/newgroupshell/mapper/UserMapper.java b/src/main/java/com/example/newgroupshell/mapper/UserMapper.java deleted file mode 100644 index 550f26868aa81dc6483af67a0fd2abef1fa97fc3..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/mapper/UserMapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.example.newgroupshell.mapper; - -import org.apache.ibatis.annotations.*; - -import java.util.List; -import com.example.newgroupshell.pojo.User; -import org.apache.ibatis.annotations.*; -import java.util.List; -@Mapper -public interface UserMapper { - //获取所有用户 - @Select("select * from users") - List selectAllUsers(); - // 获取特定用户 - @Select("select * from users where username=#{username} and password=#{password}") - User findUser(@Param("username") String username, @Param("password") String password); - // 根据username获取用户 - @Select("select * from users where username = #{0}") - User findUserByName( String username); - //添加用户 - @Insert("insert into users(name,password) values(#{username},#{password})") - int addUser(User registerUser); - //根据id获取用户 - @Select("select * from users where id = #{0}") - User findUserById(int id); - //修改当前用户的用户名 - @Update("update users set username = #{username} where id = #{id}") - int setUsername(@Param("id") int id, @Param("username") String username); - // 根据telephone获取用户 -// @Select("select * from users where telephone=#{0}") -// User getUserByPhone(String phone); - //修改当前用户的手机号 - @Update("update users set telephone=#{telephone} where id=#{id}") - int setPhone(@Param("id") int id, @Param("telephone") String phone); - //获取当前用户的手机号 -// @Select("select telephone from users where id=#{0}") -// String getBeforePhone(int id); - //获取当前用户的性别 -// @Select("select sex from users where id=#{0}") -// int getBeforeSex(int id); - //修改当前用户的性别 -// @Update("update users set sex=#{sex} where id=#{id}") -// int setSex(@Param("id") int id, @Param("sex") int sex); - //获取当前用户的出生日期 -// @Select("select birthdate from users where id=#{0}") -// String getBeforeDate(int id); - //修改当前用户的出生日期 - @Update("update users set birthdate=#{birthdate} where id=#{id}") - int setDate(@Param("id") int id, @Param("birthdate") String date); - @Select("select username from users where id=#{0}") - String getNameById(int id); - //重置密码 - @Update("update users set password=#{password} where id=#{id}") - int resetPass(@Param("id") int id, @Param("password") String password); -} diff --git a/src/main/java/com/example/newgroupshell/pojo/Group.java b/src/main/java/com/example/newgroupshell/pojo/Group.java deleted file mode 100644 index 47927bfe9782cf299119e79147cc2b97a9e67938..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/pojo/Group.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.example.newgroupshell.pojo; - -public class Group { - - private Integer id; - private String groupname; - private String key; - - private Integer leaderid; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getGroupname() { - return groupname; - } - - public void setGroupname(String groupname) { - this.groupname = groupname; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - @Override - public String toString() { - return "Group{" + - "id=" + id + - ", groupname='" + groupname + '\'' + - ", key='" + key + '\'' + -// ", telephone='" + telephone + '\'' + - '}'; - } - -} diff --git a/src/main/java/com/example/newgroupshell/pojo/User.java b/src/main/java/com/example/newgroupshell/pojo/User.java deleted file mode 100644 index 58e84267f0712ed5dbf849f88788af1c9b2170b1..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/pojo/User.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.example.newgroupshell.pojo; - - -public class User { - private Integer id; - private String username; - private String password; - //private String telephone; - - - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - -// public String getTelephone() { -// return telephone; -// } -// -// public void setTelephone(String telephone) { -// this.telephone = telephone; -// } - - - - - - @Override - public String toString() { - return "User{" + - "id=" + id + - ", username='" + username + '\'' + - ", password='" + password + '\'' + -// ", telephone='" + telephone + '\'' + - '}'; - } -} diff --git a/src/main/java/com/example/newgroupshell/service/GroupService.java b/src/main/java/com/example/newgroupshell/service/GroupService.java deleted file mode 100644 index 9d5fe71345741557f5a1665f9b744fc8f20a9b04..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/service/GroupService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.newgroupshell.service; - -import com.example.newgroupshell.pojo.Group; -import com.example.newgroupshell.pojo.User; - -import java.util.List; - -public interface GroupService { - - - - List findgroupbyleaderid(Integer id); - - - - - - -} \ No newline at end of file diff --git a/src/main/java/com/example/newgroupshell/service/UserService.java b/src/main/java/com/example/newgroupshell/service/UserService.java deleted file mode 100644 index 1df6185b32a8908e34f152bddf0f5a8f2d727de1..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/service/UserService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.example.newgroupshell.service; - -import com.example.newgroupshell.pojo.User; - -import java.util.List; - -public interface UserService { - - List selectAllUsers(); - - User findUser(String username, String password); - - User findUserByName(String username); - - int addUser(User registerUser); - - User findUserById(int id); - - int setUsername(int id, String username); - - // User getUserByPhone(String phone); -// -// int setPhone(int id, String phone); -// -// String getBeforePhone(int id); -// -// int getBeforeSex(int id); -// -// int setSex(int id, int sex); -// -// String getBeforeDate(int id); -// -// int setDate(int id, String date); -// - String getNameById(int id); -// -// int resetPass(int id, String password); -} diff --git a/src/main/java/com/example/newgroupshell/service/impl/GroupServiceImpl.java b/src/main/java/com/example/newgroupshell/service/impl/GroupServiceImpl.java deleted file mode 100644 index bb7c5f14afd09632fab6ff82edf5e5c0b8fea2fc..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/service/impl/GroupServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.newgroupshell.service.impl; - -import com.example.newgroupshell.mapper.GroupMapper; -import com.example.newgroupshell.mapper.UserMapper; -import com.example.newgroupshell.pojo.Group; -import com.example.newgroupshell.service.GroupService; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Service; - -import java.util.List; -@Service -public class GroupServiceImpl implements GroupService { - - - @Mapper - private GroupMapper groupMapper; - - - @Override - public List findgroupbyleaderid(Integer id){ - - return groupMapper.findgroupbuleaderid(id); - }; - -} \ No newline at end of file diff --git a/src/main/java/com/example/newgroupshell/service/impl/UserServiceImpl.java b/src/main/java/com/example/newgroupshell/service/impl/UserServiceImpl.java deleted file mode 100644 index 17999ff77966261115f55591d2d5eac8f60f257a..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/newgroupshell/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.example.newgroupshell.service.impl; - -import com.example.newgroupshell.mapper.UserMapper; -import com.example.newgroupshell.pojo.User; -import com.example.newgroupshell.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -//import javax.annotation.Resource; -import java.util.List; -@Service -public class UserServiceImpl implements UserService { - @Autowired - private UserMapper userMapper; - - @Override - public List selectAllUsers() { - return userMapper.selectAllUsers(); - } - - @Override - public User findUser(String username, String password) { - return userMapper.findUser(username,password); - } - - @Override - public User findUserByName(String username) { - return userMapper.findUserByName(username); - } - - @Override - public int addUser(User registerUser) { - return userMapper.addUser(registerUser); - } - - @Override - public User findUserById(int id) { - return userMapper.findUserById(id); - } - - @Override - public int setUsername(int id, String username) { - return userMapper.setUsername(id,username); - } - -// @Override -// public User getUserByPhone(String phone) { -// return userMapper.getUserByPhone(phone); -// } - -// @Override -// public int setPhone(int id, String phone) { -// return userMapper.setPhone(id,phone); -// } - -// @Override -// public String getBeforePhone(int id) { -// return userMapper.getBeforePhone(id); -// } -// -// @Override -// public int getBeforeSex(int id) { -// return userMapper.getBeforeSex(id); -// } -// -// @Override -// public int setSex(int id, int sex) { -// return userMapper.setSex(id,sex); -// } -// -// @Override -// public String getBeforeDate(int id) { -// return userMapper.getBeforeDate(id); -// } - - // @Override -// public int setDate(int id, String date) { -// return userMapper.setDate(id,date); -// } -// - @Override - public String getNameById(int id) { - return userMapper.getNameById(id); - } -// -// @Override -// public int resetPass(int id, String password) { -// return userMapper.resetPass(id,password); -// } -} diff --git a/src/test/java/com/example/newgroupshell/NewgroupshellApplicationTests.java b/src/test/java/com/example/newgroupshell/NewgroupshellApplicationTests.java deleted file mode 100644 index 3af320571d46e0c5c7c8adeb1c972c332eead7d3..0000000000000000000000000000000000000000 --- a/src/test/java/com/example/newgroupshell/NewgroupshellApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.newgroupshell; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class NewgroupshellApplicationTests { - - @Test - void contextLoads() { - } - -}