Merge branch 'master' into loginProto
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m54s
Build and test backend / Test-backend (pull_request) Successful in 1m53s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
Build and test FrontEnd / Test-frontend (pull_request) Successful in 22s

This commit is contained in:
Wawilski 2024-03-02 15:57:00 +01:00
commit c274fc8414
5 changed files with 7 additions and 18 deletions

View File

@ -17,6 +17,7 @@ repositories {
dependencies {
implementation("org.springframework.boot:spring-boot-starter-jdbc")
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-mail")
implementation("org.springframework.boot:spring-boot-starter-web")
// implementation("org.springframework.session:spring-session-jdbc")

View File

@ -4,15 +4,15 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RestController;
import ovh.herisson.Clyde.Ping;
import ovh.herisson.Clyde.Responses.PingResponse;
@RestController
@CrossOrigin(origins = "http://localhost:5173")
public class PingController {
@GetMapping("/ping")
public Ping ping(){
return new Ping(1, "pong");
public PingResponse ping(){
return new PingResponse(1, "pong");
}
}

View File

@ -34,16 +34,4 @@ public class JdbcConfig {
return source;
}
@Bean
public WebMvcConfigurer corsConfigurer() {
return new WebMvcConfigurer() {
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/greeting-javaconfig").allowedOrigins("*");
}
};
}
}

View File

@ -1,3 +0,0 @@
package ovh.herisson.Clyde;
public record Ping(int id, String txt){};

View File

@ -0,0 +1,3 @@
package ovh.herisson.Clyde.Responses;
public record PingResponse(int id, String txt){};