Compare commits
No commits in common. "ClientEtMSCommuniquant" and "master" have entirely different histories.
ClientEtMS
...
master
25
clientui/.gitignore
vendored
25
clientui/.gitignore
vendored
@ -1,25 +0,0 @@
|
|||||||
target/
|
|
||||||
!.mvn/wrapper/maven-wrapper.jar
|
|
||||||
|
|
||||||
### STS ###
|
|
||||||
.apt_generated
|
|
||||||
.classpath
|
|
||||||
.factorypath
|
|
||||||
.project
|
|
||||||
.settings
|
|
||||||
.springBeans
|
|
||||||
|
|
||||||
### IntelliJ IDEA ###
|
|
||||||
.idea
|
|
||||||
.idea/*
|
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
|
|
||||||
### NetBeans ###
|
|
||||||
nbproject/private/
|
|
||||||
build/
|
|
||||||
nbbuild/
|
|
||||||
dist/
|
|
||||||
nbdist/
|
|
||||||
.nb-gradle/
|
|
||||||
BIN
clientui/.mvn/wrapper/maven-wrapper.jar
vendored
BIN
clientui/.mvn/wrapper/maven-wrapper.jar
vendored
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
|
|
||||||
225
clientui/mvnw
vendored
225
clientui/mvnw
vendored
@ -1,225 +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
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# 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 Migwn, 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
|
|
||||||
|
|
||||||
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
|
|
||||||
echo $MAVEN_PROJECTBASEDIR
|
|
||||||
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 "$@"
|
|
||||||
143
clientui/mvnw.cmd
vendored
143
clientui/mvnw.cmd
vendored
@ -1,143 +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 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 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 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
|
|
||||||
|
|
||||||
%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%
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<groupId>com.clientui</groupId>
|
|
||||||
<artifactId>clientui</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>client-ui</name>
|
|
||||||
<description>Client UI de l'application</description>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>2.6.1</version>
|
|
||||||
<relativePath/> <!-- lookup parent from repository -->
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
<spring-cloud.version>Finchley.M8</spring-cloud.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.webjars</groupId>
|
|
||||||
<artifactId>bootstrap</artifactId>
|
|
||||||
<version>4.0.0-2</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-dependencies</artifactId>
|
|
||||||
<version>${spring-cloud.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>spring-milestones</id>
|
|
||||||
<name>Spring Milestones</name>
|
|
||||||
<url>https://repo.spring.io/milestone</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
package com.clientui;
|
|
||||||
|
|
||||||
import com.clientui.exceptions.CustomErrorDecoder;
|
|
||||||
import com.clientui.proxies.MicroserviceProduitsProxy;
|
|
||||||
import feign.Feign;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
|
||||||
import org.springframework.cloud.openfeign.support.SpringMvcContract;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
@EnableFeignClients("com.clientui")
|
|
||||||
public class ClientUiApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(ClientUiApplication.class, args);
|
|
||||||
|
|
||||||
/* Feign.builder()
|
|
||||||
.contract(new SpringMvcContract())
|
|
||||||
.errorDecoder(new CustomErrorDecoder())
|
|
||||||
.target(MicroserviceProduitsProxy.class, "localhost:9001");
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
package com.clientui.beans;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
public class CommandeBean {
|
|
||||||
|
|
||||||
private int id;
|
|
||||||
|
|
||||||
private Integer productId;
|
|
||||||
|
|
||||||
private Date dateCommande;
|
|
||||||
|
|
||||||
private Integer quantite;
|
|
||||||
|
|
||||||
private Boolean commandePayee;
|
|
||||||
|
|
||||||
public CommandeBean() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(int id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getProductId() {
|
|
||||||
return productId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setProductId(Integer productId) {
|
|
||||||
this.productId = productId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getDateCommande() {
|
|
||||||
return dateCommande;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDateCommande(Date dateCommande) {
|
|
||||||
this.dateCommande = dateCommande;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getQuantite() {
|
|
||||||
return quantite;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setQuantite(Integer quantite) {
|
|
||||||
this.quantite = quantite;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Boolean getCommandePayee() {
|
|
||||||
return commandePayee;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCommandePayee(Boolean commandePayee) {
|
|
||||||
this.commandePayee = commandePayee;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "CommandeBean{" +
|
|
||||||
"id=" + id +
|
|
||||||
", productId=" + productId +
|
|
||||||
", dateCommande=" + dateCommande +
|
|
||||||
", quantite=" + quantite +
|
|
||||||
", commandePayee=" + commandePayee +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
package com.clientui.beans;
|
|
||||||
|
|
||||||
|
|
||||||
public class PaiementBean {
|
|
||||||
|
|
||||||
private int id;
|
|
||||||
|
|
||||||
private Integer idCommande;
|
|
||||||
|
|
||||||
private Double montant;
|
|
||||||
|
|
||||||
private Long numeroCarte;
|
|
||||||
|
|
||||||
public PaiementBean() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(int id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getIdCommande() {
|
|
||||||
return idCommande;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIdCommande(Integer idCommande) {
|
|
||||||
this.idCommande = idCommande;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getMontant() {
|
|
||||||
return montant;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMontant(Double montant) {
|
|
||||||
this.montant = montant;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getNumeroCarte() {
|
|
||||||
return numeroCarte;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setNumeroCarte(Long numeroCarte) {
|
|
||||||
this.numeroCarte = numeroCarte;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "PaiementBean{" +
|
|
||||||
"id=" + id +
|
|
||||||
", idCommande=" + idCommande +
|
|
||||||
", montant=" + montant +
|
|
||||||
", numeroCarte=" + numeroCarte +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
package com.clientui.beans;
|
|
||||||
|
|
||||||
|
|
||||||
public class ProductBean {
|
|
||||||
|
|
||||||
private int id;
|
|
||||||
|
|
||||||
private String titre;
|
|
||||||
|
|
||||||
private String description;
|
|
||||||
|
|
||||||
private String image;
|
|
||||||
|
|
||||||
private Double prix;
|
|
||||||
|
|
||||||
public ProductBean() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(int id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTitre() {
|
|
||||||
return titre;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitre(String titre) {
|
|
||||||
this.titre = titre;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDescription() {
|
|
||||||
return description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDescription(String description) {
|
|
||||||
this.description = description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getImage() {
|
|
||||||
return image;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setImage(String image) {
|
|
||||||
this.image = image;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getPrix() {
|
|
||||||
return prix;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPrix(Double prix) {
|
|
||||||
this.prix = prix;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "ProductBean{" +
|
|
||||||
"id=" + id +
|
|
||||||
", titre='" + titre + '\'' +
|
|
||||||
", description='" + description + '\'' +
|
|
||||||
", image='" + image + '\'' +
|
|
||||||
", prix=" + prix +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,124 +0,0 @@
|
|||||||
package com.clientui.controller;
|
|
||||||
|
|
||||||
import com.clientui.beans.CommandeBean;
|
|
||||||
import com.clientui.beans.PaiementBean;
|
|
||||||
import com.clientui.beans.ProductBean;
|
|
||||||
import com.clientui.proxies.MicroserviceCommandeProxy;
|
|
||||||
import com.clientui.proxies.MicroservicePaiementProxy;
|
|
||||||
import com.clientui.proxies.MicroserviceProduitsProxy;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.ui.Model;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMethod;
|
|
||||||
import org.springframework.web.client.RestTemplate;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
|
||||||
|
|
||||||
|
|
||||||
@Controller
|
|
||||||
public class ClientController {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private MicroserviceProduitsProxy ProduitsProxy;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private MicroserviceCommandeProxy CommandesProxy;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private MicroservicePaiementProxy paiementProxy;
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Étape (1)
|
|
||||||
* Opération qui récupère la liste des produits et on les affichent dans la page d'accueil.
|
|
||||||
* Les produits sont récupérés grâce à ProduitsProxy
|
|
||||||
* On fini par rentourner la page Accueil.html à laquelle on passe la liste d'objets "produits" récupérés.
|
|
||||||
* */
|
|
||||||
@RequestMapping("/")
|
|
||||||
public String accueil(Model model){
|
|
||||||
|
|
||||||
List<ProductBean> produits = ProduitsProxy.listeDesProduits();
|
|
||||||
|
|
||||||
model.addAttribute("produits", produits);
|
|
||||||
|
|
||||||
return "Accueil";
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Étape (2)
|
|
||||||
* Opération qui récupère les détails d'un produit
|
|
||||||
* On passe l'objet "produit" récupéré et qui contient les détails en question à FicheProduit.html
|
|
||||||
* */
|
|
||||||
@RequestMapping("/details-produit/{id}")
|
|
||||||
public String ficheProduit(@PathVariable int id, Model model){
|
|
||||||
|
|
||||||
ProductBean produit = ProduitsProxy.recupererUnProduit(id);
|
|
||||||
|
|
||||||
model.addAttribute("produit", produit);
|
|
||||||
|
|
||||||
return "FicheProduit";
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Étape (3) et (4)
|
|
||||||
* Opération qui fait appel au microservice de commande pour placer une commande et récupérer les détails de la commande créée
|
|
||||||
* */
|
|
||||||
@RequestMapping(value = "/commander-produit/{idProduit}/{montant}")
|
|
||||||
public String passerCommande(@PathVariable int idProduit, @PathVariable Double montant, Model model){
|
|
||||||
|
|
||||||
|
|
||||||
CommandeBean commande = new CommandeBean();
|
|
||||||
|
|
||||||
//On renseigne les propriétés de l'objet de type CommandeBean que nous avons crée
|
|
||||||
commande.setProductId(idProduit);
|
|
||||||
commande.setQuantite(1);
|
|
||||||
commande.setDateCommande(new Date());
|
|
||||||
|
|
||||||
//appel du microservice commandes grâce à Feign et on récupère en retour les détails de la commande créée, notamment son ID (étape 4).
|
|
||||||
CommandeBean commandeAjoutee = CommandesProxy.ajouterCommande(commande);
|
|
||||||
|
|
||||||
//on passe à la vue l'objet commande et le montant de celle-ci afin d'avoir les informations nécessaire pour le paiement
|
|
||||||
model.addAttribute("commande", commandeAjoutee);
|
|
||||||
model.addAttribute("montant", montant);
|
|
||||||
|
|
||||||
return "Paiement";
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Étape (5)
|
|
||||||
* Opération qui fait appel au microservice de paiement pour traiter un paiement
|
|
||||||
* */
|
|
||||||
@RequestMapping(value = "/payer-commande/{idCommande}/{montantCommande}")
|
|
||||||
public String payerCommande(@PathVariable int idCommande, @PathVariable Double montantCommande, Model model){
|
|
||||||
|
|
||||||
PaiementBean paiementAExcecuter = new PaiementBean();
|
|
||||||
|
|
||||||
//on reseigne les détails du produit
|
|
||||||
paiementAExcecuter.setIdCommande(idCommande);
|
|
||||||
paiementAExcecuter.setMontant(montantCommande);
|
|
||||||
paiementAExcecuter.setNumeroCarte(numcarte()); // on génère un numéro au hasard pour simuler une CB
|
|
||||||
|
|
||||||
// On appel le microservice et (étape 7) on récupère le résultat qui est sous forme ResponseEntity<PaiementBean> ce qui va nous permettre de vérifier le code retour.
|
|
||||||
ResponseEntity<PaiementBean> paiement = paiementProxy.payerUneCommande(paiementAExcecuter);
|
|
||||||
|
|
||||||
Boolean paiementAccepte = false;
|
|
||||||
//si le code est autre que 201 CREATED, c'est que le paiement n'a pas pu aboutir.
|
|
||||||
if(paiement.getStatusCode() == HttpStatus.CREATED)
|
|
||||||
paiementAccepte = true;
|
|
||||||
|
|
||||||
model.addAttribute("paiementOk", paiementAccepte); // on envoi un Boolean paiementOk à la vue
|
|
||||||
|
|
||||||
return "confirmation";
|
|
||||||
}
|
|
||||||
|
|
||||||
//Génére une serie de 16 chiffres au hasard pour simuler vaguement une CB
|
|
||||||
private Long numcarte() {
|
|
||||||
|
|
||||||
return ThreadLocalRandom.current().nextLong(1000000000000000L,9000000000000000L );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
package com.clientui.proxies;
|
|
||||||
|
|
||||||
import com.clientui.beans.CommandeBean;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
|
|
||||||
@FeignClient(name = "microservice-commandes", url = "localhost:9002")
|
|
||||||
public interface MicroserviceCommandeProxy {
|
|
||||||
|
|
||||||
@PostMapping(value = "/commandes")
|
|
||||||
CommandeBean ajouterCommande(@RequestBody CommandeBean commande);
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
package com.clientui.proxies;
|
|
||||||
|
|
||||||
import com.clientui.beans.PaiementBean;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
|
|
||||||
@FeignClient(name = "microservice-paiement", url = "localhost:9003")
|
|
||||||
public interface MicroservicePaiementProxy {
|
|
||||||
|
|
||||||
@PostMapping(value = "/paiement")
|
|
||||||
ResponseEntity<PaiementBean> payerUneCommande(@RequestBody PaiementBean paiement);
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
package com.clientui.proxies;
|
|
||||||
|
|
||||||
import com.clientui.beans.ProductBean;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@FeignClient(name = "microservice-produits", url = "localhost:9001")
|
|
||||||
public interface MicroserviceProduitsProxy {
|
|
||||||
|
|
||||||
@GetMapping(value = "/Produits")
|
|
||||||
List<ProductBean> listeDesProduits();
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Notez ici la notation @PathVariable("id") qui est différente de celle qu'on utlise dans le contrôleur
|
|
||||||
**/
|
|
||||||
@GetMapping( value = "/Produits/{id}")
|
|
||||||
ProductBean recupererUnProduit(@PathVariable("id") int id);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
<!DOCTYPE HTML>
|
|
||||||
<html xmlns:th="http://www.thymeleaf.org">
|
|
||||||
<head>
|
|
||||||
<title>Mcommerce</title>
|
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="webjars/bootstrap/4.0.0-2/css/bootstrap.min.css" />
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
|
|
||||||
<h1 class="text-center" >Application Mcommerce</h1>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Boucle sur tous les objets de type "produit" de la liste et affichage des informations produit.
|
|
||||||
-->
|
|
||||||
<div th:each="produit : ${produits}" class="col-md-4 my-1">
|
|
||||||
<a th:href="@{|/details-produit/${produit.id}|}" >
|
|
||||||
<img th:src="${produit.image}" class="card-img-top" />
|
|
||||||
<p th:text= "${produit.titre}"></p>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript" src="webjars/bootstrap/4.0.0-2/js/bootstrap.min.js"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
<!DOCTYPE HTML>
|
|
||||||
<html xmlns:th="http://www.thymeleaf.org">
|
|
||||||
<head>
|
|
||||||
<title>Mcommerce</title>
|
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css"
|
|
||||||
href="http://localhost:8080/webjars/bootstrap/4.0.0-2/css/bootstrap.min.css"/>
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
|
|
||||||
<h1 class="text-center">Application Mcommerce</h1>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4 mx-auto mt-5 text-center">
|
|
||||||
|
|
||||||
<p th:if="${paiementOk}" >
|
|
||||||
Paiement Accepté
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p th:unless="${paiementOk}">
|
|
||||||
Le paiement n'a pas abouti
|
|
||||||
</p>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript" src="http://localhost:8080/webjars/bootstrap/4.0.0-2/js/bootstrap.min.js"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
<!DOCTYPE HTML>
|
|
||||||
<html xmlns:th="http://www.thymeleaf.org">
|
|
||||||
<head>
|
|
||||||
<title>Mcommerce</title>
|
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css"
|
|
||||||
href="http://localhost:8080/webjars/bootstrap/4.0.0-2/css/bootstrap.min.css"/>
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
|
|
||||||
<h1 class="text-center">Application Mcommerce</h1>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4 mx-auto mt-5 text-center">
|
|
||||||
|
|
||||||
<img th:src="${produit.image}" class="card-img-top"/>
|
|
||||||
|
|
||||||
<p th:text="${produit.titre}" class="font-weight-bold"></p>
|
|
||||||
|
|
||||||
<p th:text="${produit.description}"></p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<a th:href="@{|/commander-produit/${produit.id}/${produit.prix}||}" class="font-weight-bold">COMMANDER</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript" src="http://localhost:8080/webjars/bootstrap/4.0.0-2/js/bootstrap.min.js"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
<!DOCTYPE HTML>
|
|
||||||
<html xmlns:th="http://www.thymeleaf.org">
|
|
||||||
<head>
|
|
||||||
<title>Mcommerce</title>
|
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css"
|
|
||||||
href="http://localhost:8080/webjars/bootstrap/4.0.0-2/css/bootstrap.min.css"/>
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
|
|
||||||
<h1 class="text-center">Application Mcommerce</h1>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4 mx-auto mt-5 text-center">
|
|
||||||
|
|
||||||
<p>
|
|
||||||
Ici l'utilisateur sélectionne en temps normal un moyen de paiement et entre les informations de sa carte bancaire.<br/>
|
|
||||||
Nous allons éviter d'ajouter les formulaires nécessaireS afin de garder l'application la plus basique et simple possible pour la suite.<br/>
|
|
||||||
Si vous vous sentez à l'aise, vous pouvez créer un formulaire pour accepter le numéro de la CB, que vous traiterez dans le contrôleur grâce à
|
|
||||||
un <i>PostMapping</i>.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<!-- On passe l'id de la commande ET le montant de celle-ci afin que le contrôleur ait les informations nécessaires pour faire appel au microservice de paiement -->
|
|
||||||
<p>
|
|
||||||
<a th:href="@{|/payer-commande/${commande.id}/${montant}|}" class="font-weight-bold">Payer Ma Commande</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript" src="http://localhost:8080/webjars/bootstrap/4.0.0-2/js/bootstrap.min.js"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package com.clientui;
|
|
||||||
|
|
||||||
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 ClientUiApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
BIN
images/Bougie.PNG
Normal file
BIN
images/Bougie.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 107 KiB |
BIN
images/Chaise.PNG
Normal file
BIN
images/Chaise.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 105 KiB |
BIN
images/Cheval.PNG
Normal file
BIN
images/Cheval.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 548 KiB |
BIN
images/Horloge.PNG
Normal file
BIN
images/Horloge.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 77 KiB |
BIN
images/Vase.PNG
Normal file
BIN
images/Vase.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 839 KiB |
BIN
images/coq.PNG
Normal file
BIN
images/coq.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 79 KiB |
BIN
images/lampe.PNG
Normal file
BIN
images/lampe.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
BIN
images/table d'opération.PNG
Normal file
BIN
images/table d'opération.PNG
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
0
microservice-commandes/mvnw
vendored
Executable file → Normal file
0
microservice-commandes/mvnw
vendored
Executable file → Normal file
@ -37,15 +37,4 @@ public class CommandeController {
|
|||||||
|
|
||||||
return commande;
|
return commande;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Permet de mettre à jour une commande existante.
|
|
||||||
* save() mettra à jours uniquement les champs renseignés dans l'objet commande reçu. Ainsi dans ce cas, comme le champs date dans "commande" n'est
|
|
||||||
* pas renseigné, la date précédemment enregistrée restera en place
|
|
||||||
**/
|
|
||||||
@PutMapping(value = "/commandes")
|
|
||||||
public void updateCommande(@RequestBody Commande commande) {
|
|
||||||
|
|
||||||
commandesDao.save(commande);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,5 @@
|
|||||||
spring.application.name=microservice-commandes
|
server.port=9002
|
||||||
|
|
||||||
server.port 9002
|
|
||||||
|
|
||||||
#Configurations H2
|
#Configurations H2
|
||||||
spring.jpa.show-sql=true
|
spring.jpa.show-sql=true
|
||||||
spring.h2.console.enabled=true
|
spring.h2.console.enabled=true
|
||||||
|
|
||||||
#défini l'encodage pour data.sql
|
|
||||||
spring.datasource.sql-script-encoding=UTF-8
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package com.mcommandes;
|
|
||||||
|
|
||||||
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 McommandesApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package com.mpayement;
|
|
||||||
|
|
||||||
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 MpayementApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
0
microservice-paiement/mvnw
vendored
Executable file → Normal file
0
microservice-paiement/mvnw
vendored
Executable file → Normal file
@ -22,7 +22,6 @@
|
|||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<spring-cloud.version>Finchley.M8</spring-cloud.version>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -43,11 +42,6 @@
|
|||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
@ -55,18 +49,6 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-dependencies</artifactId>
|
|
||||||
<version>${spring-cloud.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
@ -76,15 +58,5 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>spring-milestones</id>
|
|
||||||
<name>Spring Milestones</name>
|
|
||||||
<url>https://repo.spring.io/milestone</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -2,10 +2,8 @@ package com.mpaiement;
|
|||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@EnableFeignClients("com.mpaiement")
|
|
||||||
public class MpaiementApplication {
|
public class MpaiementApplication {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|||||||
@ -1,70 +0,0 @@
|
|||||||
package com.mpaiement.beans;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
public class CommandeBean {
|
|
||||||
|
|
||||||
private int id;
|
|
||||||
|
|
||||||
private Integer productId;
|
|
||||||
|
|
||||||
private Date dateCommande;
|
|
||||||
|
|
||||||
private Integer quantite;
|
|
||||||
|
|
||||||
private Boolean commandePayee;
|
|
||||||
|
|
||||||
public CommandeBean() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(int id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getProductId() {
|
|
||||||
return productId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setProductId(Integer productId) {
|
|
||||||
this.productId = productId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getDateCommande() {
|
|
||||||
return dateCommande;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDateCommande(Date dateCommande) {
|
|
||||||
this.dateCommande = dateCommande;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getQuantite() {
|
|
||||||
return quantite;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setQuantite(Integer quantite) {
|
|
||||||
this.quantite = quantite;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Boolean getCommandePayee() {
|
|
||||||
return commandePayee;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCommandePayee(Boolean commandePayee) {
|
|
||||||
this.commandePayee = commandePayee;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "CommandeBean{" +
|
|
||||||
"id=" + id +
|
|
||||||
", productId=" + productId +
|
|
||||||
", dateCommande=" + dateCommande +
|
|
||||||
", quantite=" + quantite +
|
|
||||||
", commandePayee=" + commandePayee +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -15,14 +15,14 @@ public class Paiement {
|
|||||||
@Column(unique = true)
|
@Column(unique = true)
|
||||||
private Integer idCommande;
|
private Integer idCommande;
|
||||||
|
|
||||||
private Double montant;
|
private Integer montant;
|
||||||
|
|
||||||
private Long numeroCarte;
|
private Long numeroCarte;
|
||||||
|
|
||||||
public Paiement() {
|
public Paiement() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Paiement(int id, Integer idCommande, Double montant, Long numeroCarte) {
|
public Paiement(int id, Integer idCommande, Integer montant, Long numeroCarte) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.idCommande = idCommande;
|
this.idCommande = idCommande;
|
||||||
this.montant = montant;
|
this.montant = montant;
|
||||||
@ -45,11 +45,11 @@ public class Paiement {
|
|||||||
this.idCommande = idCommande;
|
this.idCommande = idCommande;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getMontant() {
|
public Integer getMontant() {
|
||||||
return montant;
|
return montant;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMontant(Double montant) {
|
public void setMontant(Integer montant) {
|
||||||
this.montant = montant;
|
this.montant = montant;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
package com.mpaiement.proxies;
|
|
||||||
|
|
||||||
import com.mpaiement.beans.CommandeBean;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@FeignClient(name = "microservice-commandes", url = "localhost:9002")
|
|
||||||
public interface MicroserviceCommandeProxy {
|
|
||||||
|
|
||||||
@GetMapping(value = "/commandes/{id}")
|
|
||||||
Optional<CommandeBean> recupererUneCommande(@PathVariable("id") int id);
|
|
||||||
|
|
||||||
@PutMapping(value = "/commandes")
|
|
||||||
void updateCommande(@RequestBody CommandeBean commande);
|
|
||||||
}
|
|
||||||
@ -1,9 +1,7 @@
|
|||||||
package com.mpaiement.web.controller;
|
package com.mpaiement.web.controller;
|
||||||
|
|
||||||
import com.mpaiement.beans.CommandeBean;
|
|
||||||
import com.mpaiement.dao.PaiementDao;
|
import com.mpaiement.dao.PaiementDao;
|
||||||
import com.mpaiement.model.Paiement;
|
import com.mpaiement.model.Paiement;
|
||||||
import com.mpaiement.proxies.MicroserviceCommandeProxy;
|
|
||||||
import com.mpaiement.web.exceptions.PaiementExistantException;
|
import com.mpaiement.web.exceptions.PaiementExistantException;
|
||||||
import com.mpaiement.web.exceptions.PaiementImpossibleException;
|
import com.mpaiement.web.exceptions.PaiementImpossibleException;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -11,20 +9,12 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
public class PaiementController {
|
public class PaiementController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
PaiementDao paiementDao;
|
PaiementDao paiementDao;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
MicroserviceCommandeProxy microserviceCommandeProxy;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Opération pour enregistrer un paiement et notifier le microservice commandes pour mettre à jour le statut de la commande en question
|
|
||||||
**/
|
|
||||||
@PostMapping(value = "/paiement")
|
@PostMapping(value = "/paiement")
|
||||||
public ResponseEntity<Paiement> payerUneCommande(@RequestBody Paiement paiement){
|
public ResponseEntity<Paiement> payerUneCommande(@RequestBody Paiement paiement){
|
||||||
|
|
||||||
@ -36,22 +26,13 @@ public class PaiementController {
|
|||||||
//Enregistrer le paiement
|
//Enregistrer le paiement
|
||||||
Paiement nouveauPaiement = paiementDao.save(paiement);
|
Paiement nouveauPaiement = paiementDao.save(paiement);
|
||||||
|
|
||||||
// si le DAO nous retourne null c'est que il ya eu un problème lors de l'enregistrement
|
|
||||||
if(nouveauPaiement == null) throw new PaiementImpossibleException("Erreur, impossible d'établir le paiement, réessayez plus tard");
|
if(nouveauPaiement == null) throw new PaiementImpossibleException("Erreur, impossible d'établir le paiement, réessayez plus tard");
|
||||||
|
|
||||||
//On récupère la commande correspondant à ce paiement en faisant appel au Microservice commandes
|
|
||||||
Optional<CommandeBean> commandeReq = microserviceCommandeProxy.recupererUneCommande(paiement.getIdCommande());
|
|
||||||
|
|
||||||
//commandeReq.get() permet d'extraire l'objet de type CommandeBean de Optional
|
|
||||||
CommandeBean commande = commandeReq.get();
|
|
||||||
|
|
||||||
//on met à jour l'objet pour marquer la commande comme étant payée
|
//TODO Nous allons appeler le Microservice Commandes ici pour lui signifier que le paiement est accepté
|
||||||
commande.setCommandePayee(true);
|
|
||||||
|
|
||||||
//on envoi l'objet commande mis à jour au microservice commande afin de mettre à jour le status de la commande.
|
|
||||||
microserviceCommandeProxy.updateCommande(commande);
|
|
||||||
|
|
||||||
//on renvoi 201 CREATED pour notifier le client au le paiement à été enregistré
|
|
||||||
return new ResponseEntity<Paiement>(nouveauPaiement, HttpStatus.CREATED);
|
return new ResponseEntity<Paiement>(nouveauPaiement, HttpStatus.CREATED);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
spring.application.name=microservice-paiement
|
|
||||||
|
|
||||||
server.port 9003
|
server.port=9003
|
||||||
|
|
||||||
#Configurations H2
|
#Configurations H2
|
||||||
spring.jpa.show-sql=true
|
spring.jpa.show-sql=true
|
||||||
spring.h2.console.enabled=true
|
spring.h2.console.enabled=true
|
||||||
|
|
||||||
#défini l'encodage pour data.sql
|
|
||||||
spring.datasource.sql-script-encoding=UTF-8
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package com.mpaiement;
|
|
||||||
|
|
||||||
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 MpaiementApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
0
microservice-produits/mvnw
vendored
Executable file → Normal file
0
microservice-produits/mvnw
vendored
Executable file → Normal file
@ -11,4 +11,3 @@ public class ProductNotFoundException extends RuntimeException {
|
|||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,7 @@
|
|||||||
spring.application.name=microservice-produits
|
|
||||||
|
|
||||||
server.port 9001
|
server.port=9001
|
||||||
|
|
||||||
#Configurations H2
|
#Configurations H2
|
||||||
spring.jpa.show-sql=true
|
spring.jpa.show-sql=true
|
||||||
spring.h2.console.enabled=true
|
spring.h2.console.enabled=true
|
||||||
|
|
||||||
#défini l'encodage pour data.sql
|
|
||||||
spring.datasource.sql-script-encoding=UTF-8
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package com.mproduits;
|
|
||||||
|
|
||||||
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 MproduitsApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user