From 9e79a34326c5cf81e7ceb43a6dc2c2e85f0b6898 Mon Sep 17 00:00:00 2001
From: Johannes Wilhelm <johannes.wilhelm2@stud.th-deg.de>
Date: Wed, 24 Jun 2020 17:26:25 +0200
Subject: [PATCH] cx
Signed-off-by: Johannes Wilhelm <johannes.wilhelm2@stud.th-deg.de>
---
.../de/thd/pms/controller/HomeController.java | 20 +++++++++++++++----
.../src/main/resources/application.properties | 2 +-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java b/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java
index 2cf9d15..1f94527 100644
--- a/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java
+++ b/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java
@@ -1,20 +1,32 @@
package de.thd.pms.controller;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
//import org.apache.logging.log4j.LogManager;
//import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.ModelAndView;
@Controller
-public class HomeController {
+public class HomeController {private static Logger log = LogManager.getLogger(HomeController.class);
@RequestMapping("/welcome")
- public String welcome() {
- return "Hallo Leute";
+ public ModelAndView welcome() {
+
-
+ // log.debug("Test");
+ log.info("Controller für die Methode welcome");
+// log.warn("Warnung");
+// log.error(message);
+// log.fatal(message);
+ ModelAndView mv = new ModelAndView();
+ mv.addObject("title", "Herzlich Willkommen!");
+ mv.addObject("message", "Sie können hier Boote bzw. Personen anlegen und Fahrten absolvieren.");
+ mv.setViewName("home");
+ return mv;
}
}
diff --git a/schleicherhof_pms/src/main/resources/application.properties b/schleicherhof_pms/src/main/resources/application.properties
index 41a9584..4c48b88 100644
--- a/schleicherhof_pms/src/main/resources/application.properties
+++ b/schleicherhof_pms/src/main/resources/application.properties
@@ -3,5 +3,5 @@ spring.datasource.url=jdbc:mysql://localhost:3306/schleicherhof_pms
spring.datasource.username=
spring.datasource.password=
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-server.port=8181
+server.port=7777
--
GitLab