Skip to content

Commit 8c072f2

Browse files
slow3586slow3586
committed
переименован модуль бэкэнда на backend
1 parent dbde4c7 commit 8c072f2

104 files changed

Lines changed: 406 additions & 410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/maven.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ jobs:
2828
- name: Maven Package Telegrambot
2929
run: mvn -f telegrambot/pom.xml clean package
3030

31-
- name: Maven Package api
31+
- name: Maven Package Backend
3232
run: mvn -f api/pom.xml clean package
3333

34-
- name: FTP Deploy api
34+
- name: FTP Deploy Backend
3535
uses: SamKirkland/[email protected]
3636
with:
3737
server: 62.109.17.193
3838
username: teamtwo
3939
password: teamtwo
40-
local-dir: api/
41-
server-dir: api/
40+
local-dir: backend/
41+
server-dir: backend/
4242
exclude: |
4343
**/maven-archiver/**
4444
**/classes/**
@@ -75,7 +75,7 @@ jobs:
7575
host: 62.109.17.193
7676
username: teamtwo
7777
password: teamtwo
78-
script: docker build api -t teamtwo/api:latest
78+
script: docker build backend -t teamtwo/backend:latest
7979

8080
- name: SSH Build Docker Telegrambot
8181
uses: appleboy/ssh-action@master
@@ -85,13 +85,13 @@ jobs:
8585
password: teamtwo
8686
script: docker build telegrambot -t teamtwo/telegrambot:latest
8787

88-
- name: SSH Run Docker API
88+
- name: SSH Run Docker Backend
8989
uses: appleboy/ssh-action@master
9090
with:
9191
host: 62.109.17.193
9292
username: teamtwo
9393
password: teamtwo
94-
script: docker run -d -p 8080:8080 --rm --name teamtwo_api teamtwo/api
94+
script: docker run -d -p 8080:8080 --rm --name teamtwo_backend teamtwo/backend &
9595

9696
- name: SSH Run Docker Telegrambot
9797
uses: appleboy/ssh-action@master

‎api/src/main/java/ru/teamtwo/api/service/api/customer/OrderService.java‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

api/.gitignore renamed to backend/.gitignore

File renamed without changes.

api/api.rest renamed to backend/api.rest

File renamed without changes.

api/dockerfile renamed to backend/dockerfile

File renamed without changes.

api/pom.xml renamed to backend/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>ru.teamtwo</groupId>
12-
<artifactId>api</artifactId>
12+
<artifactId>backend</artifactId>
1313
<version>0.0.1-SNAPSHOT</version>
14-
<name>api</name>
15-
<description>api</description>
14+
<name>backend</name>
15+
<description>backend</description>
1616
<properties>
1717
<java.version>17</java.version>
1818
</properties>

api/src/main/java/ru/teamtwo/api/ApiApplication.java renamed to backend/src/main/java/ru/teamtwo/backend/ApiApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.teamtwo.api;
1+
package ru.teamtwo.backend;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;

api/src/main/java/ru/teamtwo/api/controller/customer/CartItemControllerImpl.java renamed to backend/src/main/java/ru/teamtwo/backend/controller/customer/CartItemControllerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.teamtwo.api.controller.customer;
1+
package ru.teamtwo.backend.controller.customer;
22

33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
@@ -9,7 +9,7 @@
99
import org.springframework.web.bind.annotation.RequestBody;
1010
import org.springframework.web.bind.annotation.RequestMapping;
1111
import org.springframework.web.bind.annotation.RestController;
12-
import ru.teamtwo.api.service.api.customer.CartItemService;
12+
import ru.teamtwo.backend.service.api.customer.CartItemService;
1313
import ru.teamtwo.core.dtos.controller.customer.CartItemController;
1414
import ru.teamtwo.core.dtos.customer.CartItemDto;
1515

api/src/main/java/ru/teamtwo/api/controller/customer/CustomerControllerImpl.java renamed to backend/src/main/java/ru/teamtwo/backend/controller/customer/CustomerControllerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.teamtwo.api.controller.customer;
1+
package ru.teamtwo.backend.controller.customer;
22

33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
@@ -9,7 +9,7 @@
99
import org.springframework.web.bind.annotation.RequestBody;
1010
import org.springframework.web.bind.annotation.RequestMapping;
1111
import org.springframework.web.bind.annotation.RestController;
12-
import ru.teamtwo.api.service.api.customer.CustomerService;
12+
import ru.teamtwo.backend.service.api.customer.CustomerService;
1313
import ru.teamtwo.core.dtos.controller.customer.CustomerController;
1414
import ru.teamtwo.core.dtos.customer.CustomerDto;
1515

api/src/main/java/ru/teamtwo/api/controller/customer/OrderControllerImpl.java renamed to backend/src/main/java/ru/teamtwo/backend/controller/customer/OrderControllerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.teamtwo.api.controller.customer;
1+
package ru.teamtwo.backend.controller.customer;
22

33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
@@ -9,7 +9,7 @@
99
import org.springframework.web.bind.annotation.RequestBody;
1010
import org.springframework.web.bind.annotation.RequestMapping;
1111
import org.springframework.web.bind.annotation.RestController;
12-
import ru.teamtwo.api.service.api.customer.OrderService;
12+
import ru.teamtwo.backend.service.api.customer.OrderService;
1313
import ru.teamtwo.core.dtos.controller.customer.OrderController;
1414
import ru.teamtwo.core.dtos.customer.OrderDto;
1515

0 commit comments

Comments
 (0)