Merge branch 'dev' into NCBACK-35

# Conflicts:
#	README.md
#	src/main/java/ru/soune/nocopy/controller/ApiController.java
#	src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java
#	src/main/java/ru/soune/nocopy/service/file/FileCleanupService.java
#	src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
#	src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java
#	src/main/java/ru/soune/nocopy/service/file/impl/ProtectionFileProviderImpl.java
This commit is contained in:
vladp
2026-03-31 14:24:03 +07:00
229 changed files with 10416 additions and 757 deletions
+44 -2
View File
@@ -75,7 +75,9 @@ security:
server:
port: ${SERVER_PORT:8080}
baseurl: "http://92.242.61.23"
baseurl: ${BASE_URL:https://dev-workspace.not-copy.com}
front:
port: ":2998"
tomcat:
uri-encoding: UTF-8
servlet:
@@ -109,14 +111,31 @@ yandex:
searchapi:
api-key: ${SEARCHAPI_API_KEY:rdwNzCr2eybYVbU1KrGTJAgm}
api-key: ${SEARCHAPI_API_KEY:5jyYZC8jSaxhZTwjMUhwtAXi}
reverse-image-url: "https://searchapi.io/api/v1/search"
search:
engines:
yandex:
enabled: true
google:
enabled: false
proxy:
enabled: false
host: "193.46.217.94"
port: 3128
yookassa:
secret-key: test_0Yns_0NHV5GJf6ypJ5HC4NSfnLO8SJkw-1PwrVWsDl4
shop-id: 1276731
app:
email:
verification:
standart-subject: NO COPY - Подтверждение email адреса
standart-address-from: vlad.popovtsev@gmail.com
drop-password-subject: NO COPY - сброс пароля
user: Пользователь
tarif:
@@ -150,3 +169,26 @@ tarif:
enterprice-disk-size: 500
enterprice-user-count: 80
---
spring:
config:
activate:
on-profile: dev
server:
baseurl: https://dev-workspace.not-copy.com
---
spring:
config:
activate:
on-profile: prod
server:
baseurl: https://workspace.not-copy.com
---
spring:
config:
activate:
on-profile: local
server:
baseurl: http://localhost:8080