diff --git a/pom.xml b/pom.xml index 35d5cdc..28651d2 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,10 @@ + + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-starter-data-rest diff --git a/src/main/java/com/example/template/AbstractEvent.java b/src/main/java/com/example/template/AbstractEvent.java index 79b800c..1ad382f 100644 --- a/src/main/java/com/example/template/AbstractEvent.java +++ b/src/main/java/com/example/template/AbstractEvent.java @@ -23,7 +23,4 @@ public class AbstractEvent { this.timestamp = timestamp; } - public boolean isMe(){ - return getEventType().equals(getClass().getSimpleName()); - } } diff --git a/src/main/java/com/example/template/Application.java b/src/main/java/com/example/template/Application.java index 2bac60b..24a2d3d 100644 --- a/src/main/java/com/example/template/Application.java +++ b/src/main/java/com/example/template/Application.java @@ -26,6 +26,11 @@ public class Application { product.setName(p); product.setPrice(i*10000); product.setStock(i*10); +<<<<<<< HEAD +======= + product.setImageUrl("/goods/img/"+p+".jpg"); +// product.setImageUrl("https://github.githubassets.com/images/modules/profile/profile-joined-github.png"); +>>>>>>> 3cacf53fd2411f3f08694619bc7673b3d4e16af7 i++; productRepository.save(product); } diff --git a/src/main/resources/static/goods/img/CLOCK.jpg b/src/main/resources/static/goods/img/CLOCK.jpg new file mode 100644 index 0000000..5403fb6 Binary files /dev/null and b/src/main/resources/static/goods/img/CLOCK.jpg differ diff --git a/src/main/resources/static/goods/img/NOTEBOOK.jpg b/src/main/resources/static/goods/img/NOTEBOOK.jpg new file mode 100644 index 0000000..3c6bc67 Binary files /dev/null and b/src/main/resources/static/goods/img/NOTEBOOK.jpg differ diff --git a/src/main/resources/static/goods/img/RADIO.jpg b/src/main/resources/static/goods/img/RADIO.jpg new file mode 100644 index 0000000..ba40775 Binary files /dev/null and b/src/main/resources/static/goods/img/RADIO.jpg differ diff --git a/src/main/resources/static/goods/img/TABLE.jpg b/src/main/resources/static/goods/img/TABLE.jpg new file mode 100644 index 0000000..28c23e6 Binary files /dev/null and b/src/main/resources/static/goods/img/TABLE.jpg differ diff --git a/src/main/resources/static/goods/img/TV.jpg b/src/main/resources/static/goods/img/TV.jpg new file mode 100644 index 0000000..f9a9ae3 Binary files /dev/null and b/src/main/resources/static/goods/img/TV.jpg differ