From 742d2b5d66d937c93d00d8f353fadcdb67b9c1f5 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Thu, 2 May 2019 19:31:16 +0200 Subject: [PATCH] Startes Swagger Documentation --- build.gradle | 8 ++++++-- frontend/src/pages/Login.vue | 4 ++-- .../hhn/labsw/bugageocaching/Application.java | 16 ++++++++++++++++ .../bugageocaching/controller/Controller.java | 2 +- .../bugageocaching/util/VerificationUtil.java | 2 +- src/main/resources/application.properties | 3 ++- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index e1cfe7a..52be867 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { apply plugin: 'io.spring.dependency-management' apply plugin: 'idea' apply plugin: 'com.moowork.node' -apply plugin: 'war' +//apply plugin: 'war' group = 'de.hhn.labsw' version = '0.0.1-SNAPSHOT' @@ -47,13 +47,17 @@ dependencies { compile group: 'org.springframework.security', name: 'spring-security-core', version: '5.1.4.RELEASE' //compile group: 'at.favre.lib', name: 'bcrypt', version: '{latest-version}' - providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' + //providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' //JWT compile 'io.jsonwebtoken:jjwt-api:0.10.5' runtime 'io.jsonwebtoken:jjwt-impl:0.10.5', 'io.jsonwebtoken:jjwt-jackson:0.10.5' + compile "io.springfox:springfox-swagger2:2.9.2" + + compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.0.2' + } node { diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index bd7c0d1..56efa31 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -61,8 +61,8 @@ return { loading: false, user: { - email: "volkmann@geocaching.de", - password: "0123456789", + email: "", + password: "", //token: "", // evalAuthentication: false }, diff --git a/src/main/java/hhn/labsw/bugageocaching/Application.java b/src/main/java/hhn/labsw/bugageocaching/Application.java index 75f1fb0..3fb3f66 100644 --- a/src/main/java/hhn/labsw/bugageocaching/Application.java +++ b/src/main/java/hhn/labsw/bugageocaching/Application.java @@ -6,8 +6,15 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.annotation.Bean; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication(exclude = { SecurityAutoConfiguration.class }) +@EnableSwagger2 public class Application extends SpringBootServletInitializer{ @Override @@ -18,4 +25,13 @@ public class Application extends SpringBootServletInitializer{ public static void main(String[] args) { SpringApplication.run(Application.class, args); } + + @Bean + public Docket swagger(){ + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors.any()) + .paths(PathSelectors.any()) + .build(); + } } diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 2c6dc5b..330a68e 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -54,7 +54,7 @@ public class Controller { } @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose - @RequestMapping("/api/allCaches") + @RequestMapping(value = "/api/allCaches", method = RequestMethod.GET) @ResponseBody public ResponseEntity getAllCaches() { return ResponseEntity.status(200).body(new Gson().toJson(cacheRepository.findAll())); diff --git a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java index b29ae41..4fac803 100644 --- a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java +++ b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java @@ -20,7 +20,7 @@ public class VerificationUtil { public static void fetchPublicKey() { RestTemplate restTemplate = new RestTemplate(); try { - PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:8090/buga19usermanagement/token/publickey", PublicKey.class); + PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:9080/buga19usermanagement/token/publickey", PublicKey.class); byte[] decodedKey = Base64.getDecoder().decode(response.getMessage()); KeyFactory factory = KeyFactory.getInstance("RSA"); X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(decodedKey); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 87fb0b7..6dee0a4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,4 +5,5 @@ spring.jmx.default-domain=buga19geocaching spring.datasource.driver-class-name=org.mariadb.jdbc.Driver spring.jooq.sql-dialect=org.hibernate.dialect.MariaDBDialect spring.jpa.hibernate.ddl-auto=update -spring.jpa.show-sql=true \ No newline at end of file +spring.jpa.show-sql=true +debug=true \ No newline at end of file