diff --git a/Front/index.html b/Front/index.html index 4b0fb0c..eeb4961 100644 --- a/Front/index.html +++ b/Front/index.html @@ -13,9 +13,9 @@
- Введите первое число + Введите первое - Введите второе число + Введите второе Выберите операцию
diff --git a/Front/script.js b/Front/script.js index f808fd1..bf58f88 100644 --- a/Front/script.js +++ b/Front/script.js @@ -9,7 +9,7 @@ function f(operation, event){ let num_1 = numberOneInput.value; let num_2 = numberTwoInput.value; let type = typeInput.value; - fetch('http://localhost:8080/sum?first=${num_1}&second=${num_2}&type=${type}') + fetch('http://localhost:8080/' + operation + '?first=${num_1}&second=${num_2}&type=${type}') .then(response => response.text()) .then(res => { resultInput.value = res; diff --git a/src/main/java/method/controller/MethodController.java b/src/main/java/com/example/demo/method/controller/MethodController.java similarity index 94% rename from src/main/java/method/controller/MethodController.java rename to src/main/java/com/example/demo/method/controller/MethodController.java index ef81ee0..3085d66 100644 --- a/src/main/java/method/controller/MethodController.java +++ b/src/main/java/com/example/demo/method/controller/MethodController.java @@ -1,6 +1,6 @@ -package method.controller; +package com.example.demo.method.controller; -import method.service.MethodService; +import com.example.demo.method.service.MethodService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/method/domain/IMethod.java b/src/main/java/com/example/demo/method/domain/IMethod.java similarity index 81% rename from src/main/java/method/domain/IMethod.java rename to src/main/java/com/example/demo/method/domain/IMethod.java index 01bd0bd..2406018 100644 --- a/src/main/java/method/domain/IMethod.java +++ b/src/main/java/com/example/demo/method/domain/IMethod.java @@ -1,4 +1,4 @@ -package method.domain; +package com.example.demo.method.domain; public interface IMethod { T Sum(T first, T second); diff --git a/src/main/java/method/domain/MethodInt.java b/src/main/java/com/example/demo/method/domain/MethodInt.java similarity index 95% rename from src/main/java/method/domain/MethodInt.java rename to src/main/java/com/example/demo/method/domain/MethodInt.java index c63e6c4..3e75601 100644 --- a/src/main/java/method/domain/MethodInt.java +++ b/src/main/java/com/example/demo/method/domain/MethodInt.java @@ -1,4 +1,4 @@ -package method.domain; +package com.example.demo.method.domain; import org.springframework.stereotype.Component; diff --git a/src/main/java/method/domain/MethodString.java b/src/main/java/com/example/demo/method/domain/MethodString.java similarity index 96% rename from src/main/java/method/domain/MethodString.java rename to src/main/java/com/example/demo/method/domain/MethodString.java index 13a4b06..6e79705 100644 --- a/src/main/java/method/domain/MethodString.java +++ b/src/main/java/com/example/demo/method/domain/MethodString.java @@ -1,4 +1,4 @@ -package method.domain; +package com.example.demo.method.domain; import org.springframework.stereotype.Component; diff --git a/src/main/java/method/service/MethodService.java b/src/main/java/com/example/demo/method/service/MethodService.java similarity index 93% rename from src/main/java/method/service/MethodService.java rename to src/main/java/com/example/demo/method/service/MethodService.java index 10faf7d..4f0026c 100644 --- a/src/main/java/method/service/MethodService.java +++ b/src/main/java/com/example/demo/method/service/MethodService.java @@ -1,7 +1,7 @@ -package method.service; +package com.example.demo.method.service; -import method.domain.IMethod; -import method.domain.MethodString; +import com.example.demo.method.domain.IMethod; +import com.example.demo.method.domain.MethodString; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/src/test/java/com/example/demo/LabworkApplicationTests.java b/src/test/java/com/example/demo/ApplicationTests.java similarity index 95% rename from src/test/java/com/example/demo/LabworkApplicationTests.java rename to src/test/java/com/example/demo/ApplicationTests.java index 3619947..753f1ea 100644 --- a/src/test/java/com/example/demo/LabworkApplicationTests.java +++ b/src/test/java/com/example/demo/ApplicationTests.java @@ -1,6 +1,6 @@ package com.example.demo; -import method.service.MethodService; +import com.example.demo.method.service.MethodService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class LabworkApplicationTests { +class ApplicationTests { @Autowired MethodService speakerService;