From 9e19945bd0b047ca0312178bd9281abc373d92d6 Mon Sep 17 00:00:00 2001 From: liyq <18435118505@163.com> Date: Wed, 23 Oct 2024 23:26:31 +0800 Subject: [PATCH] =?UTF-8?q?git=E6=8F=90=E4=BA=A4-idea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 38 +++ payserver/.gitattributes | 2 + payserver/.gitignore | 33 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ payserver/mvnw | 259 ++++++++++++++++++ payserver/mvnw.cmd | 149 ++++++++++ payserver/pom.xml | 74 +++++ .../liyq/payserver/PayserverApplication.java | 13 + .../payserver/controller/OrderController.java | 20 ++ .../controller/PaymentController.java | 44 +++ .../com/liyq/payserver/dao/PaymentDao.java | 15 + .../liyq/payserver/entities/CommResult.java | 20 ++ .../com/liyq/payserver/entities/Payment.java | 16 ++ .../liyq/payserver/mapper/OrderMapper.java | 19 ++ .../com/liyq/payserver/model/OrderInfo.java | 23 ++ .../com/liyq/payserver/model/ProductInfo.java | 16 ++ .../liyq/payserver/service/OrderService.java | 33 +++ .../payserver/service/PaymentService.java | 11 + .../service/impl/PaymentServiceImpl.java | 28 ++ payserver/src/main/resources/application.yml | 18 ++ .../src/main/resources/mapper/OrderInfo.xml | 23 ++ .../main/resources/mapper/PaymentMapper.xml | 17 ++ .../payserver/PayserverApplicationTests.java | 13 + pom.xml | 100 +++++++ 24 files changed, 1003 insertions(+) create mode 100644 .gitignore create mode 100644 payserver/.gitattributes create mode 100644 payserver/.gitignore create mode 100644 payserver/.mvn/wrapper/maven-wrapper.properties create mode 100644 payserver/mvnw create mode 100644 payserver/mvnw.cmd create mode 100644 payserver/pom.xml create mode 100644 payserver/src/main/java/com/liyq/payserver/PayserverApplication.java create mode 100644 payserver/src/main/java/com/liyq/payserver/controller/OrderController.java create mode 100644 payserver/src/main/java/com/liyq/payserver/controller/PaymentController.java create mode 100644 payserver/src/main/java/com/liyq/payserver/dao/PaymentDao.java create mode 100644 payserver/src/main/java/com/liyq/payserver/entities/CommResult.java create mode 100644 payserver/src/main/java/com/liyq/payserver/entities/Payment.java create mode 100644 payserver/src/main/java/com/liyq/payserver/mapper/OrderMapper.java create mode 100644 payserver/src/main/java/com/liyq/payserver/model/OrderInfo.java create mode 100644 payserver/src/main/java/com/liyq/payserver/model/ProductInfo.java create mode 100644 payserver/src/main/java/com/liyq/payserver/service/OrderService.java create mode 100644 payserver/src/main/java/com/liyq/payserver/service/PaymentService.java create mode 100644 payserver/src/main/java/com/liyq/payserver/service/impl/PaymentServiceImpl.java create mode 100644 payserver/src/main/resources/application.yml create mode 100644 payserver/src/main/resources/mapper/OrderInfo.xml create mode 100644 payserver/src/main/resources/mapper/PaymentMapper.xml create mode 100644 payserver/src/test/java/com/liyq/payserver/PayserverApplicationTests.java create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/payserver/.gitattributes b/payserver/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/payserver/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/payserver/.gitignore b/payserver/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/payserver/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### 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/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/payserver/.mvn/wrapper/maven-wrapper.properties b/payserver/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/payserver/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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 +# +# http://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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/payserver/mvnw b/payserver/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/payserver/mvnw @@ -0,0 +1,259 @@ +#!/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 +# +# http://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.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/payserver/mvnw.cmd b/payserver/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/payserver/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@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 http://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.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/payserver/pom.xml b/payserver/pom.xml new file mode 100644 index 0000000..50b74c3 --- /dev/null +++ b/payserver/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + com.liyq + cloud-new + 1.0-SNAPSHOT + + com.liyq + payserver + 0.0.1-SNAPSHOT + payserver + payserver + + + 8 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/payserver/src/main/java/com/liyq/payserver/PayserverApplication.java b/payserver/src/main/java/com/liyq/payserver/PayserverApplication.java new file mode 100644 index 0000000..9a2db0b --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/PayserverApplication.java @@ -0,0 +1,13 @@ +package com.liyq.payserver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PayserverApplication { + + public static void main(String[] args) { + SpringApplication.run(PayserverApplication.class, args); + } + +} diff --git a/payserver/src/main/java/com/liyq/payserver/controller/OrderController.java b/payserver/src/main/java/com/liyq/payserver/controller/OrderController.java new file mode 100644 index 0000000..ea2b2f7 --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/controller/OrderController.java @@ -0,0 +1,20 @@ +package com.liyq.payserver.controller; + +import com.liyq.payserver.model.OrderInfo; +import com.liyq.payserver.service.OrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/order") +public class OrderController { + @Autowired + OrderService orderService; + @RequestMapping("/{id}") + public OrderInfo selectAll(@PathVariable("id") int id) { + return orderService.selectAll(id); + } +} + diff --git a/payserver/src/main/java/com/liyq/payserver/controller/PaymentController.java b/payserver/src/main/java/com/liyq/payserver/controller/PaymentController.java new file mode 100644 index 0000000..a3a33c6 --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/controller/PaymentController.java @@ -0,0 +1,44 @@ +package com.liyq.payserver.controller; + +import com.liyq.payserver.entities.CommResult; +import com.liyq.payserver.entities.Payment; +import com.liyq.payserver.service.PaymentService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@Slf4j +public class PaymentController { + + @Autowired + private PaymentService paymentService; + + @PostMapping(value = "/payment/create") + public CommResult create(@RequestBody Payment payment) { // 不要忘记加上RequestBody注解 + // 否则 4.3.2.6测试增加记录时，值会传递不过来 + + int result = paymentService.create(payment); + log.info("*************插入结果：" + result); + + if (result > 0) { + return new CommResult(200, "插入数据库成功", result); + } else { + return new CommResult(444, "插入数据库失败", null); + } + } + + @GetMapping(value = "/payment/get/{id}") + public CommResult getPaymentById(@PathVariable("id") Long id) { + + Payment payment = paymentService.getPaymentById(id); + log.info("*************查询结果：" + payment); + + if (payment != null) { + return new CommResult(200, "查询成功", payment); + } else { + return new CommResult(444, "没有对应记录，查询失败，ID:" + id, null); + } + } + +} diff --git a/payserver/src/main/java/com/liyq/payserver/dao/PaymentDao.java b/payserver/src/main/java/com/liyq/payserver/dao/PaymentDao.java new file mode 100644 index 0000000..affe84d --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/dao/PaymentDao.java @@ -0,0 +1,15 @@ +package com.liyq.payserver.dao; + +import com.liyq.payserver.entities.Payment; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface PaymentDao { + + public int create(Payment payment); + + public Payment getPaymentById(@Param("id") Long id); + +} + diff --git a/payserver/src/main/java/com/liyq/payserver/entities/CommResult.java b/payserver/src/main/java/com/liyq/payserver/entities/CommResult.java new file mode 100644 index 0000000..46dfb6d --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/entities/CommResult.java @@ -0,0 +1,20 @@ +package com.liyq.payserver.entities; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CommResult { + + private Integer code; + private String message; + private T data; + + public CommResult(Integer code, String message) { + this(code, message, null); + } +} + diff --git a/payserver/src/main/java/com/liyq/payserver/entities/Payment.java b/payserver/src/main/java/com/liyq/payserver/entities/Payment.java new file mode 100644 index 0000000..95fdd36 --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/entities/Payment.java @@ -0,0 +1,16 @@ +package com.liyq.payserver.entities; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import javax.validation.constraints.Null; +import java.io.Serializable; + +@Data +@AllArgsConstructor +@Null +public class Payment implements Serializable +{ + private Long id; + private String serial; +} diff --git a/payserver/src/main/java/com/liyq/payserver/mapper/OrderMapper.java b/payserver/src/main/java/com/liyq/payserver/mapper/OrderMapper.java new file mode 100644 index 0000000..4cddb5b --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/mapper/OrderMapper.java @@ -0,0 +1,19 @@ +package com.liyq.payserver.mapper; + +import com.liyq.payserver.model.OrderInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.Map; + +@Mapper +public interface OrderMapper { + + @Select("select * from order_detail where id=#{id}") + OrderInfo selectAll(int id); + + int insert(OrderInfo orderInfo); + + OrderInfo getPaymentById(int id); + +} diff --git a/payserver/src/main/java/com/liyq/payserver/model/OrderInfo.java b/payserver/src/main/java/com/liyq/payserver/model/OrderInfo.java new file mode 100644 index 0000000..e22f0ad --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/model/OrderInfo.java @@ -0,0 +1,23 @@ +package com.liyq.payserver.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class OrderInfo { + private int id; + private int userId; + private int productId; + private int num; + private long price; + private boolean deleteFlag; + private Date createTime; + private Date update_time; + private ProductInfo productInfo; +} + diff --git a/payserver/src/main/java/com/liyq/payserver/model/ProductInfo.java b/payserver/src/main/java/com/liyq/payserver/model/ProductInfo.java new file mode 100644 index 0000000..c1e0b90 --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/model/ProductInfo.java @@ -0,0 +1,16 @@ +package com.liyq.payserver.model; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ProductInfo { + private int id; + private String productName; + private long productPrice; + private boolean state; + private Date createTime; + private Date updateTime; +} + diff --git a/payserver/src/main/java/com/liyq/payserver/service/OrderService.java b/payserver/src/main/java/com/liyq/payserver/service/OrderService.java new file mode 100644 index 0000000..60b92c4 --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/service/OrderService.java @@ -0,0 +1,33 @@ +package com.liyq.payserver.service; + +import com.liyq.payserver.mapper.OrderMapper; +import com.liyq.payserver.model.OrderInfo; +import com.liyq.payserver.model.ProductInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +@Service +public class OrderService { + + @Autowired + private OrderMapper orderMapper; + + public OrderInfo selectAll(Integer userid) { + OrderInfo orderInfo = orderMapper.selectAll(userid); + return orderInfo; + } + +// @Autowired +// private RestTemplate restTemplate; +// public OrderInfo selectAll(Integer userid) { +// OrderInfo orderInfo = orderMapper.selectAll(userid); +// String url = "http://127.0.0.1:9988/product/" + orderInfo.getProductId(); +// restTemplate.getForObject(url, ProductInfo.class); +// ProductInfo productInfo = restTemplate.getForObject(url, +// ProductInfo.class); +// orderInfo.setProductInfo(productInfo); +// return orderInfo; +// } +} + diff --git a/payserver/src/main/java/com/liyq/payserver/service/PaymentService.java b/payserver/src/main/java/com/liyq/payserver/service/PaymentService.java new file mode 100644 index 0000000..94c11e0 --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/service/PaymentService.java @@ -0,0 +1,11 @@ +package com.liyq.payserver.service; + +import com.liyq.payserver.entities.Payment; +import org.apache.ibatis.annotations.Param; + +public interface PaymentService { + + public int create(Payment payment); + + public Payment getPaymentById(@Param("id") Long id); +} diff --git a/payserver/src/main/java/com/liyq/payserver/service/impl/PaymentServiceImpl.java b/payserver/src/main/java/com/liyq/payserver/service/impl/PaymentServiceImpl.java new file mode 100644 index 0000000..2449d8a --- /dev/null +++ b/payserver/src/main/java/com/liyq/payserver/service/impl/PaymentServiceImpl.java @@ -0,0 +1,28 @@ +package com.liyq.payserver.service.impl; + +import com.liyq.payserver.dao.PaymentDao; +import com.liyq.payserver.entities.Payment; +import com.liyq.payserver.service.PaymentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class PaymentServiceImpl implements PaymentService { + + @Autowired + private PaymentDao paymentDao; + + + public int create(Payment payment) { + + return paymentDao.create(payment); + + } + + public Payment getPaymentById(Long id) { + + return paymentDao.getPaymentById(id); + + } + +} diff --git a/payserver/src/main/resources/application.yml b/payserver/src/main/resources/application.yml new file mode 100644 index 0000000..03e2eb2 --- /dev/null +++ b/payserver/src/main/resources/application.yml @@ -0,0 +1,18 @@ +server: + port: 8001 +spring: + application: + name: cloud-payment-service + datasource: + type: com.alibaba.druid.pool.DruidDataSource # 当前数据源操作类型 + driver-class-name: org.gjt.mm.mysql.Driver # mysql驱动包 com.mysql.jdbc.Driver + url: jdbc:mysql://localhost:3306/cloud-dev?useUnicode=true&characterEncoding=utf-8&useSSL=false + username: root + password: root + druid: + validation-query: select 1 + test-while-idle: true + +mybatis: + mapperLocations: classpath:mapper/*.xml + type-aliases-package: com.liyq.payserver.entities # 所有Entity别名类所在包 diff --git a/payserver/src/main/resources/mapper/OrderInfo.xml b/payserver/src/main/resources/mapper/OrderInfo.xml new file mode 100644 index 0000000..87299f2 --- /dev/null +++ b/payserver/src/main/resources/mapper/OrderInfo.xml @@ -0,0 +1,23 @@ + + + + + + + insert into order_detail(price) values(#{price}) + + + + + + + + + + + + + + diff --git a/payserver/src/main/resources/mapper/PaymentMapper.xml b/payserver/src/main/resources/mapper/PaymentMapper.xml new file mode 100644 index 0000000..2a81174 --- /dev/null +++ b/payserver/src/main/resources/mapper/PaymentMapper.xml @@ -0,0 +1,17 @@ + + + + + + + insert into payment(serial) values(#{serial}) + + + + + + + + diff --git a/payserver/src/test/java/com/liyq/payserver/PayserverApplicationTests.java b/payserver/src/test/java/com/liyq/payserver/PayserverApplicationTests.java new file mode 100644 index 0000000..16b7e71 --- /dev/null +++ b/payserver/src/test/java/com/liyq/payserver/PayserverApplicationTests.java @@ -0,0 +1,13 @@ +package com.liyq.payserver; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class PayserverApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..44b72d5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,100 @@ + + 4.0.0 + + com.liyq + cloud-new + 1.0-SNAPSHOT + pom + + cloud-new + http://maven.apache.org + + payserver + + + + UTF-8 + 1.8 + 1.8 + 4.12 + 1.2.17 + 1.16.18 + 5.1.47 + 1.1.16 + 1.3.0 + + + + + + + + org.springframework.boot + spring-boot-dependencies + 2.2.2.RELEASE + pom + import + + + + org.springframework.cloud + spring-cloud-dependencies + Hoxton.SR1 + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2.1.0.RELEASE + pom + import + + + mysql + mysql-connector-java + ${mysql.version} + + + com.alibaba + druid + ${druid.version} + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis.spring.boot.version} + + + junit + junit + ${junit.version} + + + log4j + log4j + ${log4j.version} + + + org.projectlombok + lombok + ${lombok.version} + true + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + +