diff --git a/clientui/.gitignore b/clientui/.gitignore deleted file mode 100644 index 30cc74d..0000000 --- a/clientui/.gitignore +++ /dev/null @@ -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/ \ No newline at end of file diff --git a/clientui/.mvn/wrapper/maven-wrapper.jar b/clientui/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea..0000000 Binary files a/clientui/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/clientui/.mvn/wrapper/maven-wrapper.properties b/clientui/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index b573bb5..0000000 --- a/clientui/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/clientui/mvnw b/clientui/mvnw deleted file mode 100755 index 5bf251c..0000000 --- a/clientui/mvnw +++ /dev/null @@ -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 "$@" diff --git a/clientui/mvnw.cmd b/clientui/mvnw.cmd deleted file mode 100644 index 019bd74..0000000 --- a/clientui/mvnw.cmd +++ /dev/null @@ -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% diff --git a/clientui/pom.xml b/clientui/pom.xml deleted file mode 100644 index 3300cfa..0000000 --- a/clientui/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - com.clientui - clientui - 0.0.1-SNAPSHOT - jar - - client-ui - Client UI de l'application - - - org.springframework.boot - spring-boot-starter-parent - 2.6.1 - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - - org.webjars - bootstrap - 4.0.0-2 - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/clientui/src/main/java/com/clientui/ClientUiApplication.java b/clientui/src/main/java/com/clientui/ClientUiApplication.java deleted file mode 100644 index 7137e51..0000000 --- a/clientui/src/main/java/com/clientui/ClientUiApplication.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.clientui; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class ClientUiApplication { - - public static void main(String[] args) { - SpringApplication.run(ClientUiApplication.class, args); - } -} diff --git a/clientui/src/main/java/com/clientui/controller/ClientController.java b/clientui/src/main/java/com/clientui/controller/ClientController.java deleted file mode 100644 index 93c7997..0000000 --- a/clientui/src/main/java/com/clientui/controller/ClientController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.clientui.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.client.RestTemplate; - - -@Controller -public class ClientController { - - @RequestMapping("/") - public String accueil(Model model){ - - return "Accueil"; - } - -} diff --git a/clientui/src/main/resources/application.properties b/clientui/src/main/resources/application.properties deleted file mode 100644 index e69de29..0000000 diff --git a/clientui/src/main/resources/templates/Accueil.html b/clientui/src/main/resources/templates/Accueil.html deleted file mode 100644 index 3daabfa..0000000 --- a/clientui/src/main/resources/templates/Accueil.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - Mcommerce - - - - - - - -
- -

Application Mcommerce

- -
- - - - - - \ No newline at end of file diff --git a/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java b/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java deleted file mode 100644 index 97ce6f1..0000000 --- a/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java +++ /dev/null @@ -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() { - } - -} diff --git a/images/Bougie.PNG b/images/Bougie.PNG new file mode 100644 index 0000000..1ef92d8 Binary files /dev/null and b/images/Bougie.PNG differ diff --git a/images/Chaise.PNG b/images/Chaise.PNG new file mode 100644 index 0000000..f542230 Binary files /dev/null and b/images/Chaise.PNG differ diff --git a/images/Cheval.PNG b/images/Cheval.PNG new file mode 100644 index 0000000..2d46ec8 Binary files /dev/null and b/images/Cheval.PNG differ diff --git a/images/Horloge.PNG b/images/Horloge.PNG new file mode 100644 index 0000000..4898f92 Binary files /dev/null and b/images/Horloge.PNG differ diff --git a/images/Vase.PNG b/images/Vase.PNG new file mode 100644 index 0000000..62b5d82 Binary files /dev/null and b/images/Vase.PNG differ diff --git a/images/coq.PNG b/images/coq.PNG new file mode 100644 index 0000000..e246643 Binary files /dev/null and b/images/coq.PNG differ diff --git a/images/lampe.PNG b/images/lampe.PNG new file mode 100644 index 0000000..05d069a Binary files /dev/null and b/images/lampe.PNG differ diff --git a/images/table d'opération.PNG b/images/table d'opération.PNG new file mode 100644 index 0000000..802a039 Binary files /dev/null and b/images/table d'opération.PNG differ diff --git a/microservice-commandes/mvnw b/microservice-commandes/mvnw old mode 100755 new mode 100644 diff --git a/microservice-commandes/pom.xml b/microservice-commandes/pom.xml index a984ead..e4daa4b 100644 --- a/microservice-commandes/pom.xml +++ b/microservice-commandes/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 diff --git a/microservice-commandes/src/main/resources/application.properties b/microservice-commandes/src/main/resources/application.properties index 3d785cf..f686363 100644 --- a/microservice-commandes/src/main/resources/application.properties +++ b/microservice-commandes/src/main/resources/application.properties @@ -1,9 +1,5 @@ - -server.port 9002 +server.port=9002 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true - -#défini l'encodage pour data.sql -spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java b/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java deleted file mode 100644 index ce03e24..0000000 --- a/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java +++ /dev/null @@ -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() { - } - -} diff --git a/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java b/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java deleted file mode 100644 index dc70e04..0000000 --- a/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java +++ /dev/null @@ -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() { - } - -} diff --git a/microservice-paiement/mvnw b/microservice-paiement/mvnw old mode 100755 new mode 100644 diff --git a/microservice-paiement/pom.xml b/microservice-paiement/pom.xml index 0b6ae4a..709a4a5 100644 --- a/microservice-paiement/pom.xml +++ b/microservice-paiement/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 diff --git a/microservice-paiement/src/main/resources/application.properties b/microservice-paiement/src/main/resources/application.properties index bc316dd..897bdf9 100644 --- a/microservice-paiement/src/main/resources/application.properties +++ b/microservice-paiement/src/main/resources/application.properties @@ -1,9 +1,6 @@ -server.port 9003 +server.port=9003 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true - -#défini l'encodage pour data.sql -spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java b/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java deleted file mode 100644 index 5da814f..0000000 --- a/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java +++ /dev/null @@ -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() { - } - -} diff --git a/microservice-produits/VousEtesDansTestBranch.md b/microservice-produits/VousEtesDansTestBranch.md deleted file mode 100644 index e69de29..0000000 diff --git a/microservice-produits/mvnw b/microservice-produits/mvnw old mode 100755 new mode 100644 diff --git a/microservice-produits/pom.xml b/microservice-produits/pom.xml index 61bc644..4b1ba2b 100644 --- a/microservice-produits/pom.xml +++ b/microservice-produits/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 diff --git a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java index c79062f..3572f58 100644 --- a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java +++ b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java @@ -11,4 +11,3 @@ public class ProductNotFoundException extends RuntimeException { super(message); } } - diff --git a/microservice-produits/src/main/resources/application.properties b/microservice-produits/src/main/resources/application.properties index 4d87d83..6d2d73f 100644 --- a/microservice-produits/src/main/resources/application.properties +++ b/microservice-produits/src/main/resources/application.properties @@ -1,9 +1,7 @@ -server.port 9001 +server.port=9001 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true -#défini l'encodage pour data.sql -spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-produits/src/main/resources/data.sql b/microservice-produits/src/main/resources/data.sql index 8ca5b0c..307ee59 100644 --- a/microservice-produits/src/main/resources/data.sql +++ b/microservice-produits/src/main/resources/data.sql @@ -12,4 +12,4 @@ INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (5, 'Horloge INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (6, 'Table d''opération pour Hamsters', 'Pour réaliser vos opérations chirugicales sur votre Hamster!', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/table%20d''op%C3%A9ration.PNG?raw=true', 210.0); -INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (7 , 'Vase ayant appartenu a Zeus', 'Risque de choc électrique', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/Vase.PNG?raw=true', 730.0); +INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (7 , 'Vase ayant appartenu a Zeus', 'Risque de choc électrique', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/Vase.PNG?raw=true', 730.0); \ No newline at end of file diff --git a/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java b/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java deleted file mode 100644 index 32bd4cc..0000000 --- a/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java +++ /dev/null @@ -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() { - } - -}