Merge remote-tracking branch 'origin/dev'

This commit is contained in:
Marvin Scham
2023-07-04 02:56:56 +02:00
7 changed files with 19 additions and 12 deletions

View File

@@ -1,5 +1,12 @@
# Changelog # Changelog
## 1.0.2
### Fixed
- Demo credentials
- Auto-generated UML
## 1.0.1 ## 1.0.1
### Fixed ### Fixed

View File

@@ -21,7 +21,7 @@ RUN mvn -B package -DskipTests
FROM openjdk:17-jdk-slim FROM openjdk:17-jdk-slim
# Copy the jar file from the build stage # Copy the jar file from the build stage
COPY --from=build /app/target/easydrop-1.0.1.jar /easydrop.jar COPY --from=build /app/target/easydrop-1.0.2.jar /easydrop.jar
# Execute the application when the docker container starts. # Execute the application when the docker container starts.
ENTRYPOINT ["java", "-jar", "/easydrop.jar"] ENTRYPOINT ["java", "-jar", "/easydrop.jar"]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 KiB

After

Width:  |  Height:  |  Size: 911 KiB

View File

@@ -1,9 +1,9 @@
# EasyDrop # EasyDrop
![Version](https://img.shields.io/badge/version-1.0.1-orange) ![Version](https://img.shields.io/badge/version-1.0.2-orange)
![Pipeline](https://gitlab.fbe-adswen.rwu.de/team1/sandbox2/badges/main/pipeline.svg) ![Pipeline](https://gitlab.fbe-adswen.rwu.de/team1/sandbox2/badges/main/pipeline.svg)
[![Coverage](https://sonar.fbe-adswen.rwu.de/api/project_badges/measure?project=de.rwu%3Aeasydrop&metric=coverage&token=sqb_2fe80aed361468170aaef32a0ff96d596456cdd1)](https://sonar.fbe-adswen.rwu.de/dashboard?id=de.rwu%3Aeasydrop) [![Coverage](https://sonar.fbe-adswen.rwu.de/api/project_badges/measure?project=de.rwu%3Aeasydrop&metric=coverage&token=sqb_2fe80aed361468170aaef32a0ff96d596456cdd1)](https://sonar.fbe-adswen.rwu.de/dashboard?id=de.rwu%3Aeasydrop)
![JAMANN](https://img.shields.io/badge/Auszahlung-Letzte%20Woche-brightgreen) [![JAMANN](https://img.shields.io/badge/Auszahlung-Letzte%20Woche-brightgreen)](https://www.youtube.com/watch?v=rmV2Ztoh6LY)
## Description ## Description
@@ -21,8 +21,8 @@ Get rich quick™ with fully automated dropshipping!
Set up the required configuration files, use the corresponding demo files for orientation. Set up the required configuration files, use the corresponding demo files for orientation.
- `config/config.properties` for API authorization - `config/config.properties` for API authorization
- `products-config.json` to define product catalogues to use for dropshipping - `config/products-config.json` to define product catalogues to use for dropshipping
- Run `touch persistence.db` to create a file to host the database - Run `touch persistence.db` in the project's root directory to create a file to host the database
Create the container Create the container

View File

@@ -1,6 +1,6 @@
# Amazon Credentials # Amazon Credentials
AMAZON_API_URL= AMAZON_API_URL=https://checksch.de/api/amazon
AMAZON_API_KEY= AMAZON_API_KEY=lassMichRein
EBAY_API_URL= # eBay Credentials
EBAY_API_KEY= EBAY_API_URL=https://checksch.de/api/ebay
WEBSHOPS=amazon,ebay EBAY_API_KEY=ichMussRein

View File

@@ -6,7 +6,7 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
image: easydrop:1.0.1 image: easydrop:1.0.2
volumes: volumes:
- ./config:/config - ./config:/config
- type: bind - type: bind

View File

@@ -5,7 +5,7 @@
<groupId>de.rwu</groupId> <groupId>de.rwu</groupId>
<artifactId>easydrop</artifactId> <artifactId>easydrop</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.1</version> <version>1.0.2</version>
<name>EasyDrop</name> <name>EasyDrop</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>