Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6656961de | ||
|
|
4ff5c5ec13 | ||
|
|
037445dcd5 | ||
|
|
ff9c959600 | ||
|
|
795b255613 | ||
|
|
c5f060d269 | ||
|
|
1cdc6ee1c9 | ||
|
|
0dd8400229 | ||
|
|
741ca5d5a2 | ||
|
|
f7c2a186cf | ||
|
|
c7660c30de | ||
|
|
02b8d3ee6d | ||
|
|
9024d3aaca | ||
|
|
9e5ff7ce97 | ||
|
|
9f3430adf2 | ||
|
|
41bc26ee94 | ||
|
|
7b58e4979d | ||
|
|
921d439e0a | ||
|
|
2d8f904bfd | ||
|
|
f1e0f9594e | ||
|
|
15d1824757 | ||
|
|
e66225cdd1 | ||
|
|
95edcdf527 | ||
|
|
28bc24647a | ||
|
|
566c1634a2 | ||
|
|
59125b4d19 | ||
|
|
18c07b427c | ||
|
|
a1669826b5 | ||
|
|
7b3000152f | ||
|
|
0f7079d118 | ||
|
|
3a478f9195 | ||
|
|
73fd5e9456 | ||
|
|
c56b2ba4e9 | ||
|
|
9186a6d9b0 | ||
|
|
68e102b6ce | ||
|
|
168aa3812c | ||
|
|
f291287b4c | ||
|
|
aa665acbad | ||
|
|
b5b71ddfe6 | ||
|
|
f4675eb739 | ||
|
|
e2d4312e0f | ||
|
|
83f29e3382 | ||
|
|
bffdf17717 | ||
|
|
507947d6a6 | ||
|
|
7af4b6c781 | ||
|
|
835a9bf18d | ||
|
|
3a477bc2ae | ||
|
|
2ca73e4417 | ||
|
|
37b1f370e5 | ||
|
|
65bbb00abf | ||
|
|
869a25043a | ||
|
|
ffa977f06e | ||
|
|
88bfe51297 | ||
|
|
087b9f7b33 | ||
|
|
a39363a417 | ||
|
|
edbbeab9be | ||
|
|
5b0c6ce5bd | ||
|
|
b04a357cca | ||
|
|
7fb96d4b51 | ||
|
|
54db3d78b4 | ||
|
|
b5ca777722 | ||
|
|
832b13e088 | ||
|
|
9d61f8c88f | ||
|
|
1b54badd00 | ||
|
|
c591ab40df | ||
|
|
590d42690b | ||
|
|
b65a39b672 | ||
|
|
c87b5af628 | ||
|
|
2f57a54137 | ||
|
|
edec60bf19 | ||
|
|
5c8610397a | ||
|
|
94061381c7 | ||
|
|
60857d4077 | ||
|
|
8b7f580b0e | ||
|
|
a46dd54c66 | ||
|
|
cd469edb7f | ||
|
|
4e9a3e9008 | ||
|
|
2bf0468f61 | ||
|
|
1670026430 | ||
|
|
66fe68342a | ||
|
|
7f601fcfb3 | ||
|
|
cfaf8fcf32 | ||
|
|
31c5d9aaab | ||
|
|
52bc0e254c | ||
|
|
4c3558dcfa | ||
|
|
120408e488 | ||
|
|
3ed38dacd1 | ||
|
|
88e7121213 | ||
|
|
5c27fd52ba | ||
|
|
c9921c6fac | ||
|
|
89478c1c9a | ||
|
|
34256c072e | ||
|
|
a89c29f763 | ||
|
|
f5fee52cb4 | ||
|
|
b8a0e6cce7 | ||
|
|
c7ded41c16 | ||
|
|
38e7a382c7 | ||
|
|
404e1a6bee | ||
|
|
1124cddb5a | ||
|
|
b0804938bd | ||
|
|
597b46ccff | ||
|
|
2966d9f3a9 | ||
|
|
fa7f5a731e | ||
|
|
077fe0c254 | ||
|
|
ce7906d2a8 | ||
|
|
8bcbc44528 | ||
|
|
24228609bb | ||
|
|
c86290c2cb | ||
|
|
c09a3a3a18 | ||
|
|
76aa04e174 | ||
|
|
ff441a6ea4 | ||
|
|
f3a0ab8181 | ||
|
|
a2c680d10a | ||
|
|
b8003c11e2 | ||
|
|
4f2d97d205 | ||
|
|
2b5f17f170 | ||
|
|
983b5eddda | ||
|
|
45010bb79a | ||
|
|
3cf3037120 | ||
|
|
3bb6667c2f | ||
|
|
694681fccc | ||
|
|
cb46ac6c88 | ||
|
|
bfe2367715 | ||
|
|
0185e7cd54 | ||
|
|
87b97c39ea | ||
|
|
ba6464147a | ||
|
|
51d1d78f40 | ||
|
|
28ce99ec1c | ||
|
|
274861c300 | ||
|
|
c5edc9a5fc | ||
|
|
81342ae05e | ||
|
|
c81a8c8d65 | ||
|
|
5460d91a6f | ||
|
|
abe98fb609 | ||
|
|
69be949f22 | ||
|
|
b347958772 | ||
|
|
a5c8d09fc4 | ||
|
|
ab495eada7 | ||
|
|
47f3cda7b0 | ||
|
|
247e97cd7a | ||
|
|
7ae1c817ad | ||
|
|
5d02e2e0f2 | ||
|
|
f926de161d | ||
|
|
3e39a3bf47 | ||
|
|
76b07db964 | ||
|
|
c289032671 | ||
|
|
f103aca8da | ||
|
|
7631ea8c8c | ||
|
|
f932bb47f0 | ||
|
|
ca10d4d130 | ||
|
|
339a3f61cd | ||
|
|
a42e3c72fc | ||
|
|
5551d84bf7 | ||
|
|
86e0e0619f | ||
|
|
f34e9df0c8 | ||
|
|
fbe80ff6d7 | ||
|
|
0767088fc4 | ||
|
|
db4cf41800 | ||
|
|
34231d9f6f | ||
|
|
e5da30400a | ||
|
|
65bd103c74 | ||
|
|
d4f26db9ce | ||
|
|
e9cdc66f72 | ||
|
|
9112854fea | ||
|
|
4ccf39f811 | ||
|
|
27df74891b | ||
|
|
22a44d833e | ||
|
|
e2f22bb27b | ||
|
|
d7e3afb4dc | ||
|
|
3d5856d302 | ||
|
|
8811f3ce0e | ||
|
|
ac11de2abb | ||
|
|
9f67f0c06d | ||
|
|
c54dfc994b | ||
|
|
a4e3d62f14 | ||
|
|
ec93afa705 | ||
|
|
18de1ab91b | ||
|
|
67690db7c0 | ||
|
|
b982cb96c1 | ||
|
|
74ba9709a9 | ||
|
|
8de13b410b | ||
|
|
77bf7ea886 | ||
|
|
78698d2873 | ||
|
|
8147a6ce49 | ||
|
|
db02f23c67 | ||
|
|
633f76cd73 | ||
|
|
6abfb4aa37 | ||
|
|
a132ac97f2 | ||
|
|
31b41dc3d7 | ||
|
|
73d010b426 | ||
|
|
fba974f91b | ||
|
|
27b0aaaf70 | ||
|
|
60f78599fa | ||
|
|
e416835c51 | ||
|
|
01b0c12eca | ||
|
|
45267158d8 | ||
|
|
fe710c824d | ||
|
|
919baa418e | ||
|
|
5f588fcb30 | ||
|
|
a431784baa | ||
|
|
ba802ca53f | ||
|
|
d4f9397dff | ||
|
|
796f1de022 | ||
|
|
e05bf7ef3a | ||
|
|
3c00a5bd2c | ||
|
|
1d3bdc506d | ||
|
|
1801b7e8fd | ||
|
|
e53c17976f | ||
|
|
31544084ca | ||
|
|
d74571b7cb | ||
|
|
27705c5739 | ||
|
|
7a02b94bd0 | ||
|
|
f15a24acc2 | ||
|
|
e555436d54 | ||
|
|
814d137937 | ||
|
|
1e14fa3f23 | ||
|
|
12aecff5c9 | ||
|
|
03a330b570 | ||
|
|
b372180f83 | ||
|
|
920fc67962 | ||
|
|
fb2ac0cf03 | ||
|
|
8a2be0d310 | ||
|
|
0743000c10 | ||
|
|
640deef98d | ||
|
|
28b5a64a33 | ||
|
|
6818b74307 | ||
|
|
6b73d01aeb | ||
|
|
1cb9edd5bf | ||
|
|
081ca05f88 | ||
|
|
970e0fa615 | ||
|
|
52e1a7dd02 | ||
|
|
19330d853d | ||
|
|
1472c342f5 | ||
|
|
1ced86ff8c | ||
|
|
8149c450b2 | ||
|
|
fea2d5ad89 | ||
|
|
2ef1619ef9 | ||
|
|
266bcaefcd | ||
|
|
bf48725244 | ||
|
|
86f7fc593a | ||
|
|
90be1d9d2b | ||
|
|
9692fe48b7 | ||
|
|
d50c565405 | ||
|
|
98fc145f1b | ||
|
|
e7e870ee30 | ||
|
|
8103960b45 | ||
|
|
792e0048cc | ||
|
|
33883faa98 | ||
|
|
7cc744829b | ||
|
|
5a70c091f8 | ||
|
|
69aabe3619 | ||
|
|
27a8766171 | ||
|
|
2bba70e583 | ||
|
|
8e8193cda6 | ||
|
|
b96b50c01f | ||
|
|
e926934473 | ||
|
|
a5003958a8 | ||
|
|
5b73fd2c39 | ||
|
|
daadc82bbb | ||
|
|
682c21ba73 | ||
|
|
1c7a33be32 | ||
|
|
aceb70484f | ||
|
|
3fc83e5458 | ||
|
|
a7e94639d2 | ||
|
|
f52ce6db3c | ||
|
|
80c53515fb | ||
|
|
511da8321b | ||
|
|
df1fd89c29 | ||
|
|
90e3134e98 | ||
|
|
130fd184b9 | ||
|
|
f90b8a0bce | ||
|
|
adc978bea8 | ||
|
|
7bb48f3944 | ||
|
|
27b812b0da | ||
|
|
6643070999 | ||
|
|
4395d276ed | ||
|
|
e49a944b05 | ||
|
|
8e716f7d20 | ||
|
|
2e8080183c | ||
|
|
dc9215523b | ||
|
|
72691511fa | ||
|
|
135d94e0ef | ||
|
|
d1bacb4ac7 | ||
|
|
7a809e6b8c | ||
|
|
06a6196a26 | ||
|
|
13324d4628 | ||
|
|
c38b86e1b9 | ||
|
|
3ce8edd7e1 | ||
|
|
22b487da22 | ||
|
|
4395654b0d | ||
|
|
7dd057603d | ||
|
|
a4858cf6c5 | ||
|
|
7d52276b31 | ||
|
|
8fe8c566c0 | ||
|
|
36d40a0b8d | ||
|
|
32f0a07e32 | ||
|
|
51ef63e8cd | ||
|
|
b0237fd812 | ||
|
|
de8c53784b | ||
|
|
3cd6b5396c | ||
|
|
615924ea9e | ||
|
|
9a8aa498c0 | ||
|
|
66633d4964 | ||
|
|
ce8c63475f | ||
|
|
30c05b6b24 | ||
|
|
49dc19cd04 | ||
|
|
fb5642db9e | ||
|
|
c539b1fbc2 | ||
|
|
61b8ea902b | ||
|
|
6ee7ab4d04 | ||
|
|
96acf796b2 | ||
|
|
ff7836900b | ||
|
|
ec20d68261 | ||
|
|
31fac0ab93 | ||
|
|
a32f089989 | ||
|
|
c019f23777 | ||
|
|
02bf7868ee | ||
|
|
2215adc37f | ||
|
|
6fcec8d67e | ||
|
|
4a185e6f9a | ||
|
|
cf2f73955b | ||
|
|
f67e172365 | ||
|
|
d32e8dcd75 |
@@ -14,6 +14,9 @@ COPY --from=build /app/build/libs/*.jar app.jar
|
||||
|
||||
RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
||||
|
||||
ENV BUILD_TIME_BACK="unknown"\
|
||||
BUILD_TIME_FRONT="unknown"
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
CMD ["java", "-jar", "app.jar"]
|
||||
@@ -76,3 +76,417 @@ ALTER TABLE file_entities
|
||||
ALTER COLUMN support_id
|
||||
SET DEFAULT nextval('file_support_id_seq');
|
||||
|
||||
----------
|
||||
Раздать всем лимиты,у кого их нет
|
||||
|
||||
INSERT INTO protect_check (user_id, check_limit, count_checked, last_check_at, version)
|
||||
SELECT
|
||||
id as user_id,
|
||||
10 as check_limit,
|
||||
0 as count_checked,
|
||||
NULL as last_check_at,
|
||||
0 as version
|
||||
FROM users
|
||||
WHERE id NOT IN (SELECT user_id FROM protect_check);
|
||||
|
||||
--------
|
||||
Обновлять констрейнты для file_entities
|
||||
|
||||
ALTER TABLE file_entities DROP CONSTRAINT file_entities_status_check;
|
||||
|
||||
ALTER TABLE file_entities
|
||||
ADD CONSTRAINT file_entities_status_check
|
||||
CHECK (status IN (
|
||||
'ACTIVE',
|
||||
'DELETED',
|
||||
'PROCESSING',
|
||||
'VIOLATION',
|
||||
'CHECKED',
|
||||
'ERROR',
|
||||
'TEMP'
|
||||
));
|
||||
|
||||
-------
|
||||
Записи для лимитов поиска
|
||||
|
||||
INSERT INTO protect_check (user_id, limit_check, count_checked, last_check_at, version)
|
||||
SELECT
|
||||
u.id,
|
||||
100, -- limit_check = 100
|
||||
0, -- count_checked = 0
|
||||
NULL, -- last_check_at = NULL
|
||||
0 -- version = 0
|
||||
FROM users u
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM protect_check pc
|
||||
WHERE pc.user_id = u.id
|
||||
);
|
||||
|
||||
|
||||
------
|
||||
Скрипты рефералки
|
||||
|
||||
INSERT INTO referrals (user_id, referral_link, inviter_id, level_id, total_income, is_active, created_at, hold_balance)
|
||||
SELECT
|
||||
u.id as user_id,
|
||||
CONCAT('ref-', u.id, '-', LOWER(SUBSTRING(MD5(RANDOM()::text) FROM 1 FOR 8))) as referral_link,
|
||||
NULL as inviter_id,
|
||||
'bronze' as level_id,
|
||||
0 as total_income,
|
||||
false as is_active,
|
||||
NOW() as created_at,
|
||||
0 as hold_balance
|
||||
FROM users u
|
||||
LEFT JOIN referrals r ON u.id = r.user_id
|
||||
WHERE
|
||||
u.company_id IS NULL
|
||||
AND r.user_id IS NULL
|
||||
ORDER BY u.id;
|
||||
|
||||
-------
|
||||
|
||||
INSERT INTO referral_levels (id, name, min_invitees, reward_percentage) VALUES
|
||||
('bronze', 'BRONZE', 0, 15),
|
||||
('silver', 'SILVER', 6, 18),
|
||||
('gold', 'GOLD', 16, 22),
|
||||
('platinum', 'PLATINUM', 50, 25);
|
||||
|
||||
-----------------
|
||||
Скрипт,для нумерации для уже сохданных файлов
|
||||
WITH max_id AS (
|
||||
SELECT COALESCE(MAX(support_id), 0) as max_val FROM file_entities
|
||||
),
|
||||
-- Нумеруем только NULL записи, начиная с max_val + 1
|
||||
numbered AS (
|
||||
SELECT
|
||||
f.id,
|
||||
(SELECT max_val FROM max_id) + ROW_NUMBER() OVER (ORDER BY f.created_at, f.id) as new_support_id
|
||||
FROM file_entities f
|
||||
WHERE f.support_id IS NULL
|
||||
)
|
||||
UPDATE file_entities
|
||||
SET support_id = numbered.new_support_id
|
||||
FROM numbered
|
||||
WHERE file_entities.id = numbered.id;
|
||||
|
||||
---------------------------------
|
||||
НАСТРОЙКА NGINX
|
||||
--------------------------------
|
||||
|
||||
# admin.not-copy.com
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name admin.not-copy.com;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name admin.not-copy.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/admin.not-copy.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/admin.not-copy.com/privkey.pem;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://localhost:3003;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:2995;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
|
||||
# workspace.not-copy.com
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name workspace.not-copy.com;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name workspace.not-copy.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/workspace.not-copy.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/workspace.not-copy.com/privkey.pem;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://localhost:3003;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:2998;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
|
||||
# lp.not-copy.com
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name lp.not-copy.com;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name lp.not-copy.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/lp.not-copy.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/lp.not-copy.com/privkey.pem;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://localhost:3003;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:2993;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
|
||||
# dev-admin.not-copy.com
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name dev-admin.not-copy.com;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name dev-admin.not-copy.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/dev-admin.not-copy.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/dev-admin.not-copy.com/privkey.pem;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://localhost:3001;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:2996;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
|
||||
# dev-workspace.not-copy.com
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name dev-workspace.not-copy.com;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name dev-workspace.not-copy.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/dev-workspace.not-copy.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/dev-workspace.not-copy.com/privkey.pem;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://localhost:3001;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:3002;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
|
||||
# dev-lp.not-copy.com
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name dev-lp.not-copy.com;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name dev-lp.not-copy.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/dev-lp.not-copy.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/dev-lp.not-copy.com/privkey.pem;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://localhost:3001;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:2994;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Проверяем конфиг
|
||||
ls -la /etc/nginx/sites-available/
|
||||
ls -la /etc/nginx/sites-enabled/
|
||||
|
||||
# Создание конфига
|
||||
|
||||
sudo nano /etc/nginx/sites-available/not-copy
|
||||
|
||||
# Создание симлинк
|
||||
sudo ln -s /etc/nginx/sites-available/not-copy /etc/nginx/sites-enabled/
|
||||
|
||||
# Чек
|
||||
sudo nginx -t
|
||||
|
||||
# Рестарт
|
||||
sudo systemctl reload nginx
|
||||
|
||||
|
||||
---------------------------------------------
|
||||
|
||||
# ПОЛНАЯ ИНСТРУКЦИЯ: НАСТРОЙКА ПРОКСИ ДЛЯ ОБХОДА БЛОКИРОВОК SEARCHAPI.IO
|
||||
|
||||
## Данные для подключения к прокси-серверу
|
||||
IP: 193.46.217.94
|
||||
Порт HTTP: 3128
|
||||
Порт SOCKS: 1080
|
||||
Логин SSH: root
|
||||
Пароль SSH: u7nRtsD6
|
||||
|
||||
## 1. Настройка прокси-сервера
|
||||
```bash
|
||||
# Подключаемся к серверу
|
||||
ssh root@193.46.217.94
|
||||
# Вводим пароль: u7nRtsD6
|
||||
|
||||
# Обновляем систему и устанавливаем пакеты
|
||||
yum update -y
|
||||
yum install -y epel-release net-tools nano
|
||||
yum install -y 3proxy
|
||||
|
||||
# Создаем конфигурацию
|
||||
mkdir -p /etc/3proxy
|
||||
cat > /etc/3proxy/3proxy.cfg << 'EOF'
|
||||
nserver 8.8.8.8
|
||||
nserver 8.8.4.4
|
||||
timeouts 1 5 30 60 180 1800 15 60
|
||||
daemon
|
||||
log /var/log/3proxy/3proxy.log
|
||||
logformat "- +_L%t.%. %N.%p %E %U %C:%c %R:%r %O %I %h %T"
|
||||
rotate 30
|
||||
auth none
|
||||
allow * * * * *
|
||||
proxy -p3128
|
||||
socks -p1080
|
||||
EOF
|
||||
|
||||
# Создаем папку для логов и запускаем прокси
|
||||
mkdir -p /var/log/3proxy
|
||||
/usr/bin/3proxy /etc/3proxy/3proxy.cfg
|
||||
|
||||
# Проверяем, что запустилось
|
||||
ps aux | grep 3proxy
|
||||
netstat -tulpn | grep -E '3128|1080'
|
||||
|
||||
# Настраиваем файрвол
|
||||
firewall-cmd --permanent --add-port=3128/tcp
|
||||
firewall-cmd --permanent --add-port=1080/tcp
|
||||
firewall-cmd --reload
|
||||
firewall-cmd --list-ports
|
||||
|
||||
# Проверяем локальную работу прокси
|
||||
curl -x http://127.0.0.1:3128 https://api.ipify.org
|
||||
# Должен вернуть: 193.46.217.94
|
||||
|
||||
# Настраиваем автозапуск
|
||||
echo "/usr/bin/3proxy /etc/3proxy/3proxy.cfg" >> /etc/rc.local
|
||||
chmod +x /etc/rc.local
|
||||
|
||||
|
||||
# Проверяем доступность прокси
|
||||
ping -c 4 193.46.217.94
|
||||
curl -x http://193.46.217.94:3128 https://api.ipify.org
|
||||
# Должен вернуть: 193.46.217.94
|
||||
|
||||
# Проверяем работу с SearchAPI через прокси
|
||||
curl -x http://193.46.217.94:3128 "https://www.searchapi.io/api/v1/search?engine=google_lens&api_key=5jyYZC8jSaxhZTwjMUhwtAXi&url=https://dev-workspace.not-copy.com/api/files/public/76d06557-6df1-4fcd-a273-050ec6a35faf&search_type=exact_matches" -o test.json
|
||||
ls -la test.json
|
||||
tail -20 test.json
|
||||
# Файл должен быть полным (заканчиваться на '}')
|
||||
|
||||
|
||||
|
||||
ps aux | grep 3proxy # Проверка статуса
|
||||
netstat -tulpn | grep -E '3128|1080' # Проверка портов
|
||||
tail -f /var/log/3proxy/3proxy.log # Просмотр логов
|
||||
killall 3proxy # Остановка прокси
|
||||
/usr/bin/3proxy /etc/3proxy/3proxy.cfg # Запуск прокси
|
||||
|
||||
|
||||
firewall-cmd --permanent --remove-port=3128/tcp
|
||||
firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source address="IP_ТВОЕГО_СЕРВЕРА" port port="3128" protocol="tcp" accept'
|
||||
firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source address="IP_ТВОЕГО_СЕРВЕРА" port port="1080" protocol="tcp" accept'
|
||||
firewall-cmd --reload
|
||||
|
||||
|
||||
На прокси-сервере:
|
||||
bash
|
||||
ps aux | grep 3proxy # Проверка статуса
|
||||
netstat -tulpn | grep -E '3128|1080' # Проверка портов
|
||||
tail -f /var/log/3proxy/3proxy.log # Просмотр логов
|
||||
killall 3proxy # Остановка прокси
|
||||
/usr/bin/3proxy /etc/3proxy/3proxy.cfg # Запуск прокси
|
||||
|
||||
На основном сервере:
|
||||
bash
|
||||
curl -x http://193.46.217.94:3128 https://api.ipify.org # Проверка прокси
|
||||
telnet 193.46.217.94 3128 # Проверка порта
|
||||
+6
-2
@@ -34,7 +34,7 @@ dependencies {
|
||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||
implementation 'commons-validator:commons-validator:1.7'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
|
||||
|
||||
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.2'
|
||||
implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
|
||||
implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
|
||||
|
||||
@@ -59,7 +59,11 @@ dependencies {
|
||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||
|
||||
implementation name: 'testlib-fat-0.2.1-all'
|
||||
implementation name: 'testlib-fat-0.3.1-all'
|
||||
|
||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
|
||||
|
||||
implementation project(':referral')
|
||||
|
||||
}
|
||||
|
||||
|
||||
+5
-4
@@ -88,17 +88,18 @@ services:
|
||||
# FILE_CHUNK_SIZE: 1048576
|
||||
FILE_CHUNK_SIZE: 1000000
|
||||
POSTGRES_DB: no_copy_
|
||||
# POSTGRES_USER: postgres
|
||||
# POSTGRES_PASSWORD: postgres
|
||||
|
||||
POSTGRES_USER: ${POSTGRES_USER}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||
POSTGRES_PORT: 5432
|
||||
POSTGRES_HOST: db
|
||||
STORAGE_SERVICE_URL: http://storage:8081
|
||||
SPRING_PROFILES_ACTIVE: docker
|
||||
SPRING_PROFILES_ACTIVE: prod
|
||||
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
||||
# POSTGRES_USER: postgres
|
||||
# POSTGRES_PASSWORD: postgres
|
||||
# MAIL_HOST: postfix
|
||||
# MAIL_PORT: 25
|
||||
# MAIL_USERNAME: noreply@no-copy.ru
|
||||
@@ -180,7 +181,7 @@ services:
|
||||
command:
|
||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||
- '--storage.tsdb.path=/prometheus'
|
||||
- '--storage.tsdb.retention.time=15d' # Удерживать 15 дней
|
||||
- '--storage.tsdb.retention.time=15d'
|
||||
- '--web.enable-lifecycle'
|
||||
healthcheck:
|
||||
test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
plugins {
|
||||
kotlin("jvm") version "2.1.10"
|
||||
}
|
||||
|
||||
group = "ru.soune"
|
||||
version = "1.0.0"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
|
||||
implementation("io.insert-koin:koin-core:4.1.1")
|
||||
implementation("io.insert-koin:koin-core-jvm:4.1.1")
|
||||
}
|
||||
|
||||
tasks.test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
kotlin {
|
||||
jvmToolchain(21)
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune
|
||||
|
||||
fun main() {
|
||||
println("Hello World!")
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
package ru.soune.actions
|
||||
|
||||
abstract class NoCopyAction
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune.actions.free
|
||||
|
||||
import ru.soune.actions.NoCopyAction
|
||||
|
||||
sealed class NoCopyFreeAction : NoCopyAction()
|
||||
@@ -0,0 +1,8 @@
|
||||
package ru.soune.actions.paid
|
||||
|
||||
import ru.soune.actions.NoCopyAction
|
||||
|
||||
sealed class NoCopyPaidAction : NoCopyAction() {
|
||||
|
||||
abstract val cost: Double
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
## Команды для помещения в сеть
|
||||
|
||||
Сеть для работы бэка и фронта : Наименование == app-network-{port}
|
||||
|
||||
|
||||
### Проверить состояние:
|
||||
|
||||
|
||||
docker inspect {container-name} --format='{{range $net, $_ := .NetworkSettings.Networks}}{{$net}} {{end}}'
|
||||
|
||||
|
||||
### Создать сеть ,если нет
|
||||
|
||||
docker network create {name-network} 2>/dev/null || echo "Сеть уже существует"
|
||||
|
||||
### Переместить контейнер:
|
||||
|
||||
# Отключить от старой сети
|
||||
docker network disconnect {network-name-old} {container-name}
|
||||
|
||||
# Подключить к новой сети
|
||||
docker network connect {network-name-new} {container-name}
|
||||
|
||||
# Добавить алиас (опционально)
|
||||
docker network connect --alias {alias} {network-name-new} {container-name}
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя админ-панели'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '2996',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/frontdev/no-copy-admin-panel-frontend.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Stop old') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
||||
docker rm no-copy-admin-panel-${params.PORT} 2>/dev/null || true
|
||||
mkdir -p /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
||||
rm -rf /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/*
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Copy to server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
|
||||
docker build -t no-copy-admin-panel:${params.BRANCH}-${params.PORT} .
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Start on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker run -d \\
|
||||
--name no-copy-admin-panel-${params.PORT} \\
|
||||
--restart unless-stopped \\
|
||||
--network app-network \\
|
||||
-p ${params.PORT}:2996 \\
|
||||
no-copy-admin-panel:${params.BRANCH}-${params.PORT}
|
||||
sleep 5
|
||||
docker ps --filter name=no-copy-admin-panel-${params.PORT}
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Check status') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-admin-panel-${params.PORT}'; then
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
||||
echo 'Admin panel available on http://92.242.61.23:${params.PORT}'
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Admin panel ${params.BRANCH} deployed"
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,223 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'dev',
|
||||
description: 'Ветка для деплоя'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '3001',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
string(
|
||||
name: 'PORT_DB',
|
||||
defaultValue: '',
|
||||
description: 'Порт для запуска БД'
|
||||
)
|
||||
string(
|
||||
name: 'SERVER',
|
||||
defaultValue: '92.242.61.23',
|
||||
description: 'Сервер для деплоя'
|
||||
)
|
||||
string(
|
||||
name: 'NETWORK',
|
||||
defaultValue: 'app-network-dev',
|
||||
description: 'Имя сети (будет создана если не существует)'
|
||||
)
|
||||
choice(
|
||||
name: 'SPRING_PROFILE',
|
||||
choices: ['dev', 'prod'],
|
||||
description: 'Профиль Spring для запуска'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
cleanWs()
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/backdev/no-copy.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Copy to server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
||||
rm -rf /opt/deployments/${params.BRANCH}-${params.PORT}/*
|
||||
mkdir -p /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||
"
|
||||
|
||||
sshpass -p '${SSH_PASS}' scp -r ./* ${SSH_USER}@${params.SERVER}:/opt/deployments/${params.BRANCH}-${params.PORT}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Deploy with docker-compose') {
|
||||
steps {
|
||||
script {
|
||||
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||
def springProfile = params.SPRING_PROFILE
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
),
|
||||
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
||||
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||
]) {
|
||||
sh """
|
||||
# Тестируем подключение сначала
|
||||
echo "Testing SSH connection..."
|
||||
if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
|
||||
echo "SSH connection OK"
|
||||
else
|
||||
echo "SSH connection failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Основная команда
|
||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
||||
mkdir -p /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||
cd /opt/deployments/${params.BRANCH}-${params.PORT}
|
||||
|
||||
echo '1. Проверяем/создаем сеть ${params.NETWORK}...'
|
||||
if ! docker network ls --format '{{.Name}}' | grep -q '^${params.NETWORK}\$'; then
|
||||
docker network create ${params.NETWORK}
|
||||
echo 'Сеть ${params.NETWORK} создана'
|
||||
else
|
||||
echo 'Сеть ${params.NETWORK} уже существует'
|
||||
fi
|
||||
|
||||
echo '2. Останавливаем старые контейнеры порта ${params.PORT}...'
|
||||
docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
||||
docker rm app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
|
||||
docker stop postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
||||
docker rm postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
|
||||
docker stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||
docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
|
||||
|
||||
echo '3. Запускаем БД...'
|
||||
docker run -d \\
|
||||
--name postgres-${params.PORT} \\
|
||||
--network ${params.NETWORK} \\
|
||||
--network-alias no_copy_${params.PORT} \\
|
||||
--network-alias database-${params.PORT} \\
|
||||
--network-alias db-${params.PORT} \\
|
||||
-p ${params.PORT}0:5432 \\
|
||||
-e POSTGRES_DB=no_copy${params.PORT_DB} \\
|
||||
-e POSTGRES_USER=${DB_USER} \\
|
||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||
-v pgdata_${params.PORT}:/var/lib/postgresql/data \\
|
||||
-e BUILD_TIME_BACK='${buildTime}' \\
|
||||
postgres:17.7
|
||||
|
||||
echo '4. Запускаем storage...'
|
||||
docker run -d \\
|
||||
--name file-storage-${params.PORT} \\
|
||||
--network ${params.NETWORK} \\
|
||||
-v uploads_data_${params.PORT}:/storage:rw \\
|
||||
alpine:latest tail -f /dev/null
|
||||
|
||||
echo '5. Ждем БД...'
|
||||
sleep 15
|
||||
|
||||
echo '6. Собираем приложение...'
|
||||
docker build --no-cache -t app-backend-${params.PORT}:latest .
|
||||
|
||||
echo '7. Запускаем приложение...'
|
||||
docker run -d \\
|
||||
--name app-backend-${params.PORT} \\
|
||||
--network ${params.NETWORK} \\
|
||||
--network-alias app \\
|
||||
--network-alias app-${params.PORT} \\
|
||||
-p ${params.PORT}:8080 \\
|
||||
-v uploads_data_${params.PORT}:/data/uploads:rw \\
|
||||
-e POSTGRES_DB=no_copy${params.PORT_DB} \\
|
||||
-e POSTGRES_USER=${DB_USER} \\
|
||||
-e POSTGRES_PASSWORD=${DB_PASSWORD} \\
|
||||
-e POSTGRES_PORT=5432 \\
|
||||
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
||||
-e FILE_STORAGE_PATH=/data/uploads \\
|
||||
-e SPRING_PROFILES_ACTIVE=${springProfile} \\
|
||||
app-backend-${params.PORT}:latest
|
||||
|
||||
echo '8. Проверка...'
|
||||
sleep 10
|
||||
|
||||
if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
|
||||
echo 'Приложение работает на порту ${params.PORT}'
|
||||
else
|
||||
echo 'Проверка health не удалась'
|
||||
docker logs app-backend-${params.PORT} --tail=20
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Verify network') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
|
||||
echo 'Проверяем подключение к сети ${params.NETWORK}'
|
||||
docker network inspect ${params.NETWORK} --format='{{.Name}}: {{range .Containers}}{{.Name}} {{end}}'
|
||||
|
||||
echo 'Проверяем алиас app для контейнера app-backend-${params.PORT}'
|
||||
docker inspect app-backend-${params.PORT} | grep -A 5 'Aliases'
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
script {
|
||||
def appUrl = params.SPRING_PROFILE == 'prod' ? 'https://workspace.not-copy.com' : 'https://dev-workspace.not-copy.com'
|
||||
echo "Deployment successful"
|
||||
echo "Application URL: ${appUrl}"
|
||||
}
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
|
||||
}
|
||||
always {
|
||||
echo "Deployment process finished"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,16 @@ pipeline {
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '2998',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
string(
|
||||
name: 'NETWORK',
|
||||
defaultValue: 'app-network-dev',
|
||||
description: 'Docker сеть для подключения'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
@@ -37,15 +47,15 @@ pipeline {
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-frontend 2>/dev/null || true
|
||||
docker rm no-copy-frontend 2>/dev/null || true
|
||||
docker stop no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||
docker rm no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||
|
||||
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||
docker-compose -f docker-compose.yaml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} down 2>/dev/null || true
|
||||
fi
|
||||
"
|
||||
"""
|
||||
@@ -66,11 +76,11 @@ pipeline {
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||
rm -rf /opt/deployments/frontend/${params.BRANCH}-${params.PORT}/*
|
||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
"
|
||||
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}-${params.PORT}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
@@ -80,6 +90,8 @@ pipeline {
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
def BUILD_TIME_FRONT = sh(script: "date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
@@ -89,16 +101,18 @@ pipeline {
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}
|
||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml build
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml build
|
||||
else
|
||||
echo 'Exception: docker-compose file not found'
|
||||
exit 1
|
||||
fi
|
||||
# 1. СОЗДАЕМ JSON ФАЙЛ (ЭТО РАБОТАЕТ 100%)
|
||||
mkdir -p public
|
||||
echo '{\\"buildTime\\": \\"${BUILD_TIME_FRONT}\\"}' > public/build-info.json
|
||||
|
||||
# 2. Меняем имя контейнера и порт
|
||||
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
||||
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
||||
|
||||
# 3. Собираем образ
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
||||
"
|
||||
"""
|
||||
}
|
||||
@@ -118,21 +132,23 @@ pipeline {
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}
|
||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
|
||||
# Проверяем и подключаем к сети app-network если нужно
|
||||
docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml up -d
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml up -d
|
||||
fi
|
||||
echo '=== Запускаем контейнер ==='
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} up -d
|
||||
|
||||
sleep 10
|
||||
|
||||
echo 'Status container:'
|
||||
docker ps --filter name=no-copy-frontend
|
||||
echo '=== Проверяем запуск ==='
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||
echo '✓ Контейнер запущен: no-copy-frontend-${params.PORT}'
|
||||
echo '✓ Порт: ${params.PORT}:2999'
|
||||
else
|
||||
echo '✗ Контейнер не запустился'
|
||||
echo 'Логи:'
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} logs
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
@@ -152,15 +168,21 @@ pipeline {
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||
echo 'Container started'
|
||||
# Ищем контейнер с правильным именем (с портом)
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
|
||||
echo 'Container started: no-copy-frontend-${params.PORT}'
|
||||
|
||||
sleep 5
|
||||
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} || echo '000')
|
||||
echo 'HTTP code: \$HTTP_CODE'
|
||||
|
||||
echo 'Frontend available on http://92.242.61.23:2998'
|
||||
echo 'Frontend available on http://92.242.61.23:${params.PORT}'
|
||||
|
||||
# Показываем все фронтенды
|
||||
echo ''
|
||||
echo 'All frontend containers:'
|
||||
docker ps --filter name=no-copy-frontend --format 'table {{.Names}}\\t{{.Ports}}\\t{{.Status}}'
|
||||
else
|
||||
echo 'Exception: container did not start'
|
||||
docker ps -a | grep frontend
|
||||
@@ -172,12 +194,77 @@ pipeline {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// stage('Connect to network') {
|
||||
// steps {
|
||||
// script {
|
||||
// withCredentials([
|
||||
// usernamePassword(
|
||||
// credentialsId: 'server-root-password',
|
||||
// usernameVariable: 'SSH_USER',
|
||||
// passwordVariable: 'SSH_PASS'
|
||||
// )
|
||||
// ]) {
|
||||
// sh """
|
||||
// sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
// echo 'Отключаем от всех сетей и подключаем к ${params.NETWORK}'
|
||||
//
|
||||
// # Отключаем от всех сетей (кроме bridge, host, none)
|
||||
// current_networks=\$(docker inspect no-copy-frontend-${params.PORT} --format='{{range \$net, \$v := .NetworkSettings.Networks}}{{\$net}}{{\"\\n\"}}{{end}}' | grep -v -E '^(bridge|host|none)\$' || true)
|
||||
//
|
||||
// for net in \$current_networks; do
|
||||
// echo \"Отключаем от сети: \$net\"
|
||||
// docker network disconnect \$net no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||
// done
|
||||
//
|
||||
// # Подключаем к нужной сети
|
||||
// docker network connect ${params.NETWORK} no-copy-frontend-${params.PORT}
|
||||
//
|
||||
// echo 'Готово! Контейнер теперь в сети:'
|
||||
// docker inspect no-copy-frontend-${params.PORT} --format='{{range \$net, \$v := .NetworkSettings.Networks}}{{\$net}}{{\"\\n\"}}{{end}}'
|
||||
// "
|
||||
// """
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
stage('Connect to network') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
echo 'Подключаем контейнер к сети ${params.NETWORK}'
|
||||
|
||||
if ! docker network ls --format '{{.Name}}' | grep -q '^${params.NETWORK}\$'; then
|
||||
docker network create ${params.NETWORK}
|
||||
fi
|
||||
|
||||
if docker ps -a --format '{{.Names}}' | grep -q '^no-copy-frontend-${params.PORT}\$'; then
|
||||
docker network disconnect ${params.NETWORK} no-copy-frontend-${params.PORT} 2>/dev/null || true
|
||||
docker network connect ${params.NETWORK} no-copy-frontend-${params.PORT}
|
||||
echo 'Контейнер подключен к ${params.NETWORK}'
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Front branch ${params.BRANCH} deployment completed"
|
||||
echo "Frontend available on http://92.242.61.23:2998"
|
||||
echo "Frontend available on http://92.242.61.23:${params.PORT}"
|
||||
echo "Container: no-copy-frontend-${params.PORT}"
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed"
|
||||
|
||||
@@ -34,6 +34,7 @@ pipeline {
|
||||
stage('Deploy with docker-compose') {
|
||||
steps {
|
||||
script {
|
||||
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
@@ -92,6 +93,7 @@ pipeline {
|
||||
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||
-e POSTGRES_PORT=5432 \\
|
||||
-e POSTGRES_HOST=db \\
|
||||
-e BUILD_TIME_BACK='${buildTime}' \\
|
||||
--restart unless-stopped \\
|
||||
app-backend:latest
|
||||
|
||||
|
||||
@@ -1,183 +0,0 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Stop old') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-frontend 2>/dev/null || true
|
||||
docker rm no-copy-frontend 2>/dev/null || true
|
||||
|
||||
cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml down 2>/dev/null || true
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml down 2>/dev/null || true
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Copy to server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
rm -rf /opt/deployments/frontend/${params.BRANCH}/*
|
||||
mkdir -p /opt/deployments/frontend/${params.BRANCH}
|
||||
"
|
||||
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml build
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml build
|
||||
else
|
||||
echo 'Exception:don't found docker-compose'
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Start on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}
|
||||
|
||||
if [ -f 'docker-compose.yaml' ]; then
|
||||
docker-compose -f docker-compose.yaml up -d
|
||||
elif [ -f 'docker-compose.yml' ]; then
|
||||
docker-compose -f docker-compose.yml up -d
|
||||
fi
|
||||
|
||||
sleep 10
|
||||
|
||||
echo 'Status container:'
|
||||
docker ps --filter name=no-copy-frontend
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Check status') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
|
||||
echo 'Container start'
|
||||
|
||||
sleep 5
|
||||
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
|
||||
echo 'HTTP код: ' \$HTTP_CODE
|
||||
|
||||
echo 'Frong start on http://92.242.61.23:2998'
|
||||
else
|
||||
echo 'Exception: container don't start'
|
||||
docker ps -a | grep frontend
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Front branch ${params.BRANCH} completed"
|
||||
echo "Use on http://92.242.61.23:2998"
|
||||
}
|
||||
failure {
|
||||
echo "Failed"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
parameters {
|
||||
string(
|
||||
name: 'BRANCH',
|
||||
defaultValue: 'main',
|
||||
description: 'Ветка для деплоя легальной панели'
|
||||
)
|
||||
string(
|
||||
name: 'PORT',
|
||||
defaultValue: '2997',
|
||||
description: 'Порт для запуска экземпляра'
|
||||
)
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Git pull') {
|
||||
steps {
|
||||
script {
|
||||
checkout([
|
||||
$class: 'GitSCM',
|
||||
branches: [[name: params.BRANCH]],
|
||||
userRemoteConfigs: [[
|
||||
url: 'https://code.3err0.ru/frontdev/no-copy-legal-panel-frontend.git',
|
||||
credentialsId: 'nx-jen'
|
||||
]]
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Stop old') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker stop no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
||||
docker rm no-copy-legal-panel-${params.PORT} 2>/dev/null || true
|
||||
mkdir -p /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
||||
rm -rf /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/*
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Copy to server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
|
||||
docker build -t no-copy-legal-panel:${params.BRANCH}-${params.PORT} .
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Start on server') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
docker run -d \\
|
||||
--name no-copy-legal-panel-${params.PORT} \\
|
||||
--restart unless-stopped \\
|
||||
--network app-network \\
|
||||
-p ${params.PORT}:2997 \\
|
||||
no-copy-legal-panel:${params.BRANCH}-${params.PORT}
|
||||
sleep 5
|
||||
docker ps --filter name=no-copy-legal-panel-${params.PORT}
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Check status') {
|
||||
steps {
|
||||
script {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
usernameVariable: 'SSH_USER',
|
||||
passwordVariable: 'SSH_PASS'
|
||||
)
|
||||
]) {
|
||||
sh """
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
if docker ps --format '{{.Names}}' | grep -q 'no-copy-legal-panel-${params.PORT}'; then
|
||||
HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
|
||||
echo 'Legal panel available on http://92.242.61.23:${params.PORT}'
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
echo "Legal panel ${params.BRANCH} deployed on port ${params.PORT}"
|
||||
}
|
||||
failure {
|
||||
echo "Deployment failed"
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,13 @@
|
||||
package ru.soune
|
||||
|
||||
interface Referral {
|
||||
|
||||
val userId: Long
|
||||
val referralLink: String
|
||||
val inviter: Long?
|
||||
val currentLevel: String
|
||||
val totalIncome: Int
|
||||
val availableIncome: Int
|
||||
val holdBalance: Int
|
||||
val active: Boolean
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.soune
|
||||
|
||||
data class ReferralInvitee(
|
||||
val email: String,
|
||||
val isActive: Boolean,
|
||||
val regDate: String,
|
||||
)
|
||||
@@ -0,0 +1,10 @@
|
||||
package ru.soune
|
||||
|
||||
interface ReferralLevel {
|
||||
val id: String
|
||||
val name: String
|
||||
val share: Int
|
||||
val minInvitee: Int
|
||||
val maxInvitee: Int
|
||||
val next: String?
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune
|
||||
|
||||
interface ReferralLevelProvider {
|
||||
|
||||
fun getAvailableReferralLevels(): List<ReferralLevel>
|
||||
|
||||
fun getInitialReferralLevelId(): String
|
||||
|
||||
fun getReferralLevelById(levelId: String): ReferralLevel
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package ru.soune
|
||||
|
||||
interface ReferralRepo {
|
||||
|
||||
fun getUserReferralLink(userId: Long): String
|
||||
|
||||
fun getUserIdByLink(link: String): Long?
|
||||
|
||||
fun getInviterIdForUser(userId: Long): Long?
|
||||
|
||||
fun getReferralLevelForUser(userId: Long): String
|
||||
|
||||
fun getReferralByUserId(userId: Long): Referral
|
||||
|
||||
fun getReferralInvitees(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee>
|
||||
|
||||
// создаем новую запись в БД
|
||||
fun createReferralEntity(entity: Referral)
|
||||
|
||||
// прибавить к totalIncome и availableIncome значение transferAmount
|
||||
fun increaseIncome(userId: Long, transferAmount: Int)
|
||||
|
||||
// установить active в true
|
||||
fun activateUser(userId: Long): Boolean
|
||||
|
||||
// посчитать записи, у которых inviter == userId и active == true
|
||||
fun getActiveInviteeForUser(userId: Long): Int
|
||||
|
||||
// посчитать записи, у которых inviter == userId
|
||||
fun getTotalInviteeForUser(userId: Long): Int
|
||||
|
||||
fun upgradeReferralLevelForUser(userId: Long, newLevelId: String)
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package ru.soune
|
||||
|
||||
class ReferralService(
|
||||
private val referralLevelProvider: ReferralLevelProvider,
|
||||
private val referralRepo: ReferralRepo,
|
||||
) {
|
||||
|
||||
fun onRegister(userId: Long, inviterReferralLink: String?) {
|
||||
val initialReferralLevel = referralLevelProvider.getInitialReferralLevelId()
|
||||
val referralLink = referralRepo.getUserReferralLink(userId)
|
||||
val inviter = inviterReferralLink?.let(referralRepo::getUserIdByLink)
|
||||
|
||||
val referral = object : Referral {
|
||||
override val userId = userId
|
||||
override val referralLink = referralLink
|
||||
override val inviter = inviter
|
||||
override val currentLevel = initialReferralLevel
|
||||
override val totalIncome = 0
|
||||
override val availableIncome = 0
|
||||
override val holdBalance: Int = 0
|
||||
override val active: Boolean = false
|
||||
}
|
||||
|
||||
referralRepo.createReferralEntity(referral)
|
||||
}
|
||||
|
||||
fun onUserAccountRefill(userId: Long, transferAmount: Int) {
|
||||
val wasActivated = referralRepo.activateUser(userId)
|
||||
val inviterId = referralRepo.getInviterIdForUser(userId) ?: return
|
||||
val currentInviterLevel = referralRepo.getReferralLevelForUser(inviterId)
|
||||
.let { referralLevelProvider.getReferralLevelById(it) }
|
||||
val reward = transferAmount * currentInviterLevel.share / 100
|
||||
|
||||
referralRepo.increaseIncome(inviterId, reward)
|
||||
|
||||
if (!wasActivated) return
|
||||
|
||||
val currentCount = referralRepo.getActiveInviteeForUser(inviterId)
|
||||
val nextLevel = currentInviterLevel.next
|
||||
|
||||
if (currentCount + 1 > currentInviterLevel.maxInvitee && nextLevel != null) {
|
||||
referralRepo.upgradeReferralLevelForUser(inviterId, nextLevel)
|
||||
}
|
||||
}
|
||||
|
||||
fun getReferralLevels(): List<ReferralLevel> =
|
||||
referralLevelProvider.getAvailableReferralLevels()
|
||||
|
||||
|
||||
fun getReferralLevelForUser(userId: Long): ReferralLevel =
|
||||
referralRepo.getReferralLevelForUser(userId)
|
||||
.let { referralLevelProvider.getReferralLevelById(it) }
|
||||
|
||||
fun getReferralStatForUser(userId: Long): ReferralStat {
|
||||
var referral = referralRepo.getReferralByUserId(userId)
|
||||
return ReferralStat(
|
||||
totalInvitee = referralRepo.getTotalInviteeForUser(userId),
|
||||
activeInvitee = referralRepo.getActiveInviteeForUser(userId),
|
||||
totalIncome = referral.totalIncome,
|
||||
availableIncome = referral.availableIncome,
|
||||
holdBalance = referral.holdBalance,
|
||||
referralLink = referral.referralLink
|
||||
)
|
||||
}
|
||||
|
||||
fun getInviteeForUser(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee> =
|
||||
referralRepo.getReferralInvitees(userId, pageSize, pageNumber)
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package ru.soune
|
||||
|
||||
data class ReferralStat(
|
||||
val totalInvitee: Int,
|
||||
val activeInvitee: Int,
|
||||
val totalIncome: Int,
|
||||
val availableIncome: Int,
|
||||
val holdBalance: Int,
|
||||
val referralLink: String,
|
||||
)
|
||||
@@ -3,4 +3,5 @@ plugins {
|
||||
}
|
||||
rootProject.name = 'no-copy'
|
||||
include 'referral'
|
||||
include 'finance'
|
||||
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
package ru.soune.nocopy.client;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.net.http.HttpResponse;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Base64;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
public class YooKassaClient {
|
||||
|
||||
@Value("${yookassa.shop-id}")
|
||||
private String shopId;
|
||||
|
||||
@Value("${yookassa.secret-key}")
|
||||
private String secretKey;
|
||||
|
||||
private final HttpClient httpClient = HttpClient.newHttpClient();
|
||||
|
||||
private final ObjectMapper mapper = new ObjectMapper();
|
||||
|
||||
public boolean createAutoPayment(String paymentMethodId, double amount, String description, String userId) {
|
||||
try {
|
||||
String url = "https://api.yookassa.ru/v3/payments";
|
||||
String auth = shopId + ":" + secretKey;
|
||||
String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes(StandardCharsets.UTF_8));
|
||||
|
||||
Map<String, Object> body = new HashMap<>();
|
||||
body.put("amount", Map.of("value", String.format("%.2f", amount),
|
||||
"currency", "RUB"));
|
||||
body.put("payment_method_id", paymentMethodId);
|
||||
body.put("description", description);
|
||||
body.put("capture", true);
|
||||
body.put("metadata", Map.of("user_id", userId, "auto_payment", "true"));
|
||||
|
||||
String requestBody = mapper.writeValueAsString(body);
|
||||
|
||||
HttpRequest request = HttpRequest.newBuilder()
|
||||
.uri(URI.create(url))
|
||||
.header("Content-Type", "application/json")
|
||||
.header("Authorization", "Basic " + encodedAuth)
|
||||
.header("Idempotence-Key", UUID.randomUUID().toString())
|
||||
.POST(HttpRequest.BodyPublishers.ofString(requestBody))
|
||||
.build();
|
||||
|
||||
HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
|
||||
|
||||
if (response.statusCode() == 200 || response.statusCode() == 201) {
|
||||
log.info("Auto payment created: {}", response.body());
|
||||
return true;
|
||||
} else {
|
||||
log.error("Auto payment failed: {} - {}", response.statusCode(), response.body());
|
||||
return false;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("Error creating auto payment", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,9 @@ package ru.soune.nocopy.configuration;
|
||||
import com.vrt.AudioFilePathProvider;
|
||||
import com.vrt.fileprotection.FileProtector;
|
||||
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
||||
import com.vrt.fileprotection.documents.DocumentLocalSearch;
|
||||
import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
||||
import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
@@ -33,7 +33,8 @@ public class ApplicationConfig {
|
||||
ImageUniqueCheck imageUniqueCheck,
|
||||
ImageLocalSearch imageLocalSearch,
|
||||
AudioLocalSearch audioLocalSearch,
|
||||
AudioFilePathProvider audioFilePathProvider) {
|
||||
AudioFilePathProvider audioFilePathProvider,
|
||||
DocumentLocalSearch documentLocalSearch) {
|
||||
|
||||
return new com.vrt.NoCopyFileService(
|
||||
Collections.emptyList(),
|
||||
@@ -42,7 +43,8 @@ public class ApplicationConfig {
|
||||
imageUniqueCheck,
|
||||
imageLocalSearch,
|
||||
audioLocalSearch,
|
||||
audioFilePathProvider
|
||||
audioFilePathProvider,
|
||||
documentLocalSearch
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package ru.soune.nocopy.configuration;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
import org.springframework.web.filter.CorsFilter;
|
||||
|
||||
@Configuration
|
||||
public class CorsConfig {
|
||||
|
||||
@Bean
|
||||
public CorsFilter corsFilter() {
|
||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||
CorsConfiguration config = new CorsConfiguration();
|
||||
config.addAllowedOrigin("*");
|
||||
config.addAllowedMethod("*");
|
||||
config.addAllowedHeader("*");
|
||||
source.registerCorsConfiguration("/**", config);
|
||||
|
||||
return new CorsFilter(source);
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,20 @@ public class HandlerConfig {
|
||||
LogoutRequestHandler logoutHandler,
|
||||
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||
VerifyRegisterUserHandler verifyRegisterUser,
|
||||
AuthRequestHandler authRequestHandler
|
||||
AuthRequestHandler authRequestHandler,
|
||||
CompanyHandler companyHandler,
|
||||
TariffHandler tariffHandler,
|
||||
TariffInfoHandler tariffInfoHandler,
|
||||
ReferralHandler referralHandler,
|
||||
ResetPasswordHandler resetPasswordHandler,
|
||||
DaDataHandler daDataHandler,
|
||||
PaymentHandler paymentHandler,
|
||||
CostHandler costHandler,
|
||||
MonitoringHandler monitoringHandler,
|
||||
ViolationHandler violationHandler,
|
||||
ViolationStatisticsHandler violationStatisticsHandler,
|
||||
GlobalSearchHandler globalSearchHandler,
|
||||
ViolationNotionHandler violationNotionHandler
|
||||
) {
|
||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||
map.put(20001, login);
|
||||
@@ -30,6 +43,19 @@ public class HandlerConfig {
|
||||
map.put(20007, imageFoundRequestHandler);
|
||||
map.put(20008, authRequestHandler);
|
||||
map.put(20009, verifyRegisterUser);
|
||||
map.put(20010, resetPasswordHandler);
|
||||
map.put(30000, companyHandler);
|
||||
map.put(30001, tariffHandler);
|
||||
map.put(30002, tariffInfoHandler);
|
||||
map.put(30003, referralHandler);
|
||||
map.put(30004, daDataHandler);
|
||||
map.put(30005, paymentHandler);
|
||||
map.put(30007, monitoringHandler);
|
||||
map.put(30008, costHandler);
|
||||
map.put(30009, violationHandler);
|
||||
map.put(30010, violationStatisticsHandler);
|
||||
map.put(30011, globalSearchHandler);
|
||||
map.put(30012, violationNotionHandler);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package ru.soune.nocopy.configuration;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.service.file.ImageResizeService;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
public class ImageMigration {
|
||||
|
||||
@Autowired
|
||||
private FileEntityRepository fileRepository;
|
||||
|
||||
@Autowired
|
||||
private ImageResizeService imageResizeService;
|
||||
|
||||
@EventListener(ApplicationReadyEvent.class)
|
||||
public void migrate() {
|
||||
List<FileEntity> images = fileRepository.findByThumbnailPathIsNull();
|
||||
|
||||
for (FileEntity file : images) {
|
||||
try {
|
||||
Path path = Paths.get(file.getProtectedFilePath());
|
||||
if (Files.exists(path)) {
|
||||
byte[] data = Files.readAllBytes(path);
|
||||
imageResizeService.generateSizes(file, data);
|
||||
fileRepository.save(file);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("Error migrating {}: {}", file.getId(), e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -20,7 +21,13 @@ public class JacksonConfig {
|
||||
@Bean
|
||||
@Primary
|
||||
public ObjectMapper objectMapper() {
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
ObjectMapper mapper = Jackson2ObjectMapperBuilder.json()
|
||||
.defaultViewInclusion(true)
|
||||
.autoDetectFields(true)
|
||||
.failOnUnknownProperties(false)
|
||||
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||
.featuresToEnable(SerializationFeature.INDENT_OUTPUT)
|
||||
.build();
|
||||
|
||||
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
||||
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.configuration;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import ru.soune.ReferralLevelProvider;
|
||||
import ru.soune.ReferralRepo;
|
||||
import ru.soune.ReferralService;
|
||||
|
||||
@Configuration
|
||||
public class ReferralConfig {
|
||||
|
||||
@Bean
|
||||
public ReferralService referralService(ReferralLevelProvider referralLevelProvider, ReferralRepo referralRepo) {
|
||||
return new ReferralService(referralLevelProvider, referralRepo);
|
||||
}
|
||||
}
|
||||
@@ -21,4 +21,15 @@ public class AsyncConfig {
|
||||
executor.initialize();
|
||||
return executor;
|
||||
}
|
||||
|
||||
@Bean(name = "taskExecutor")
|
||||
public Executor taskExecutor() {
|
||||
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||
executor.setCorePoolSize(3);
|
||||
executor.setMaxPoolSize(5);
|
||||
executor.setQueueCapacity(50);
|
||||
executor.setThreadNamePrefix("global-search-");
|
||||
executor.initialize();
|
||||
return executor;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,16 +4,12 @@ import lombok.AllArgsConstructor;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
|
||||
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class NoCopyInitializer {
|
||||
|
||||
private final FileProcessingOrchestrator orchestrator;
|
||||
|
||||
@EventListener(ApplicationReadyEvent.class)
|
||||
public void initializeOnStartup() {
|
||||
orchestrator.initializeProcessingQueue();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package ru.soune.nocopy.configuration.search;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Component
|
||||
@ConfigurationProperties(prefix = "search")
|
||||
public class SearchProperties {
|
||||
private Map<String, EngineConfig> engines;
|
||||
private ProxyConfig proxy;
|
||||
|
||||
@Data
|
||||
public static class EngineConfig {
|
||||
private boolean enabled;
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class ProxyConfig {
|
||||
private boolean enabled;
|
||||
private String host;
|
||||
private int port;
|
||||
}
|
||||
}
|
||||
@@ -3,10 +3,11 @@ package ru.soune.nocopy.controller;
|
||||
import com.vrt.NoCopyFileService;
|
||||
import com.vrt.fileprotection.FileProtector;
|
||||
import com.vrt.fileprotection.NoCopyCheckResult;
|
||||
import com.vrt.fileprotection.audio.AudioCheckResult;
|
||||
import com.vrt.fileprotection.documents.DocumentCheckResult;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
import org.springframework.core.io.FileSystemResource;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.web.PageableDefault;
|
||||
@@ -22,14 +23,20 @@ import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.file.*;
|
||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||
import ru.soune.nocopy.entity.company.Company;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.*;
|
||||
import ru.soune.nocopy.handler.*;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.FileSimilarityService;
|
||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||
import ru.soune.nocopy.service.file.ProtectionsLimitService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
import ru.soune.nocopy.service.file.FileEntityService;
|
||||
import ru.soune.nocopy.service.file.FileUploadService;
|
||||
@@ -40,10 +47,7 @@ import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@@ -63,10 +67,16 @@ public class ApiController {
|
||||
|
||||
private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
private final NoCopyFileService noCopyFileService;
|
||||
|
||||
private final FileUtil fileUtil;
|
||||
|
||||
private final ProtectionsLimitService protectionsLimitService;
|
||||
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
|
||||
private final UserRepository userRepository;
|
||||
|
||||
private final CheckCounterService checkCounterService;
|
||||
|
||||
@PostMapping("/v{version}/data")
|
||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||
@PathVariable("version") int version) {
|
||||
@@ -147,12 +157,16 @@ public class ApiController {
|
||||
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||
duplicateData
|
||||
));
|
||||
}catch (FileFormatException e){
|
||||
return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
|
||||
} catch (Exception e) {
|
||||
log.error("Error uploading chunk", e);
|
||||
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private final NoCopyFileService noCopyFileService;
|
||||
|
||||
@GetMapping("/v{version}/files/{fileId}/similar")
|
||||
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||
@PathVariable("version") int version,
|
||||
@@ -160,33 +174,107 @@ public class ApiController {
|
||||
@RequestParam(value = "auth_token", required = false) String authToken,
|
||||
@RequestParam(required = false) List<String> similarityLevels,
|
||||
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
||||
SimilarityFilter filter = SimilarityFilter.builder()
|
||||
.similarityLevels(similarityLevels)
|
||||
.build();
|
||||
Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable, authToken);
|
||||
|
||||
String messageDesc;
|
||||
MessageCode success;
|
||||
try {
|
||||
FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
|
||||
|
||||
if (similarFiles.isEmpty()) {
|
||||
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
||||
success = MessageCode.SUCCESS;
|
||||
} else {
|
||||
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
||||
success = MessageCode.SUCCESS;
|
||||
if (fileEntity == null) {
|
||||
return ResponseEntity.ok().body(new BaseResponse(0, MessageCode.INVALID_FIELD.getCode(),
|
||||
MessageCode.INVALID_FIELD.getDescription(), null));
|
||||
}
|
||||
|
||||
Map<String, Object> responseData = new HashMap<>();
|
||||
responseData.put("content", similarFiles.getContent());
|
||||
responseData.put("page", similarFiles.getNumber());
|
||||
responseData.put("size", similarFiles.getSize());
|
||||
responseData.put("totalElements", similarFiles.getTotalElements());
|
||||
responseData.put("totalPages", similarFiles.getTotalPages());
|
||||
responseData.put("hasNext", similarFiles.hasNext());
|
||||
responseData.put("hasPrevious", similarFiles.hasPrevious());
|
||||
BaseResponse response;
|
||||
if ("image".equals(fileEntity.getMimeType())) {
|
||||
Page<SimilarFileDTO> similarFilesPage = fileSimilarityService.findSimilarFiles(
|
||||
fileId, similarityLevels, pageable, authToken);
|
||||
response = buildSuccessResponse(similarFilesPage, MessageCode.SIMILAR_FILES_FOUND);
|
||||
} else {
|
||||
List<SimilarFileDTO> results = processNonImageFile(fileEntity, authToken);
|
||||
log.info("results: {}", results);
|
||||
response = buildSuccessResponse(results, MessageCode.SIMILAR_FILES_FOUND);
|
||||
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
|
||||
}
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
|
||||
return ResponseEntity.ok(response);
|
||||
|
||||
} catch(IllegalArgumentException e) {
|
||||
log.error("Error with file extensions : {}", e.getMessage(), e);
|
||||
return ResponseEntity.ok().body(new BaseResponse(MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
|
||||
MessageCode.FILE_FOR_SEARCH_NOT_VALID.getCode(),
|
||||
MessageCode.FILE_FOR_SEARCH_NOT_VALID.getDescription(), null));
|
||||
} catch (Exception e) {
|
||||
log.error("Error finding similar files: {}", e.getMessage(), e);
|
||||
return ResponseEntity.ok().body(new BaseResponse(MessageCode.INVALID_FIELD.getCode(),
|
||||
MessageCode.INVALID_FIELD.getCode(),
|
||||
MessageCode.INVALID_FIELD.getDescription(), null));
|
||||
}
|
||||
}
|
||||
|
||||
private List<SimilarFileDTO> processNonImageFile(FileEntity fileEntity, String authToken) throws Exception {
|
||||
List<SimilarFileDTO> results = new ArrayList<>();
|
||||
|
||||
FileEntity duplicateByHash = fileSimilarityService.findDuplicateByHash(fileEntity.getFilePath(),
|
||||
fileEntity.getMimeType(), fileEntity.getUserId());
|
||||
log.info("duplicateByHash: {}", duplicateByHash);
|
||||
if (duplicateByHash != null) {
|
||||
results.add(fileSimilarityService.buildDTO(duplicateByHash));
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
File file = new File(fileEntity.getFilePath());
|
||||
FileProtector.Type type = "document".equals(fileEntity.getMimeType()) ?
|
||||
FileProtector.Type.DOC : FileProtector.Type.AUDIO;
|
||||
|
||||
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
|
||||
log.info("checkResult: {}", checkResult);
|
||||
|
||||
switch (checkResult) {
|
||||
case DocumentCheckResult.Success success -> {
|
||||
FileProtector.FileInfo info = success.getInfo();
|
||||
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
||||
if (entity != null) {
|
||||
results.add(fileSimilarityService.buildDTO(entity));
|
||||
}
|
||||
}
|
||||
case AudioCheckResult.Success success -> {
|
||||
FileProtector.FileInfo info = success.getInfo();
|
||||
FileEntity entity = fileEntityRepository.findByFileId(info.getId());
|
||||
if (entity != null) {
|
||||
results.add(fileSimilarityService.buildDTO(entity));
|
||||
}
|
||||
}
|
||||
case DocumentCheckResult.Failed failed ->
|
||||
log.warn("Document check failed: {}", failed.getMessage());
|
||||
case AudioCheckResult.Failed failed ->
|
||||
log.warn("Audio check failed: {}", failed.getMessage());
|
||||
default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
private BaseResponse buildSuccessResponse(Page<SimilarFileDTO> page, MessageCode messageCode) {
|
||||
Map<String, Object> responseData = new HashMap<>();
|
||||
responseData.put("content", page.getContent());
|
||||
responseData.put("page", page.getNumber());
|
||||
responseData.put("size", page.getSize());
|
||||
responseData.put("totalElements", page.getTotalElements());
|
||||
responseData.put("totalPages", page.getTotalPages());
|
||||
responseData.put("hasNext", page.hasNext());
|
||||
responseData.put("hasPrevious", page.hasPrevious());
|
||||
|
||||
return new BaseResponse(20004, messageCode.getCode(),
|
||||
messageCode.getDescription(), responseData);
|
||||
}
|
||||
|
||||
private BaseResponse buildSuccessResponse(List<SimilarFileDTO> list, MessageCode messageCode) {
|
||||
Map<String, Object> responseData = new HashMap<>();
|
||||
responseData.put("content", list);
|
||||
responseData.put("totalElements", list.size());
|
||||
|
||||
return new BaseResponse(20004, messageCode.getCode(),
|
||||
messageCode.getDescription(), responseData);
|
||||
}
|
||||
|
||||
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||
@@ -285,35 +373,46 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/v{version}/files/download/{fileId}")
|
||||
public ResponseEntity<?> downloadFile(
|
||||
@PathVariable(required = false) String fileId,
|
||||
@PathVariable(required = false) Integer version,
|
||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
try {
|
||||
if (tokenHeader == null) {
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
errorData.put("fileId", fileId);
|
||||
errorData.put("version", version);
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
|
||||
MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
|
||||
MessageCode.TOKEN_IS_NULL.getCode(),
|
||||
MessageCode.TOKEN_IS_NULL.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||
|
||||
if (!entityResponse.getUserId().equals(userId)) {
|
||||
User fileUser = userRepository.findById(entityResponse.getUserId()).orElseThrow();
|
||||
User user = userRepository.findById(userId).orElseThrow();
|
||||
Company companyUser = user.getCompany();
|
||||
|
||||
if (companyUser != null && !fileUser.getCompany().getId().equals(companyUser.getId())) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||
MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
|
||||
MessageCode.USER_NOT_HAD_PERMISSION.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
if (companyUser == null && !entityResponse.getUserId().equals(userId)) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.USER_NOT_HAD_PERMISSION.getCode(),
|
||||
MessageCode.USER_NOT_HAD_PERMISSION.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
@@ -322,8 +421,8 @@ public class ApiController {
|
||||
errorData.put("file_status", entityResponse.getStatus());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||
MessageCode.FILE_DELETE.getCode(),
|
||||
MessageCode.FILE_DELETE.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
@@ -332,13 +431,15 @@ public class ApiController {
|
||||
errorData.put("onDisk", entityResponse.isExistsOnDisk());
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||
MessageCode.FILE_NOT_EXIST.getCode(),
|
||||
MessageCode.FILE_NOT_EXIST.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
Path filePath = Paths.get(entityResponse.getFilePath());
|
||||
Resource resource = new UrlResource(filePath.toUri());
|
||||
|
||||
Path filePath = Paths.get(entityResponse.getProtectedFilePath());
|
||||
FileSystemResource resource = new FileSystemResource(filePath);
|
||||
long fileSize = Files.size(filePath);
|
||||
|
||||
if (!resource.exists()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
@@ -349,14 +450,13 @@ public class ApiController {
|
||||
MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
|
||||
errorData));
|
||||
}
|
||||
|
||||
String contentType = determineContentType(filePath);
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentLength(fileSize)
|
||||
.contentType(MediaType.parseMediaType(contentType))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
|
||||
.header(HttpHeaders.CONTENT_LENGTH, String.valueOf(entityResponse.getFileSize()))
|
||||
"attachment; filename=\"" + entityResponse.getFileName() + "\"")
|
||||
.body(resource);
|
||||
} catch (FileEntityNotFoundException e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
@@ -366,7 +466,15 @@ public class ApiController {
|
||||
MessageCode.FILE_NOT_FOUND.getCode(),
|
||||
MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||
errorData));
|
||||
} catch (NotFoundAuthToken | IOException e) {
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(new BaseResponse(20004,
|
||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
|
||||
MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(),
|
||||
errorData));
|
||||
} catch (IOException e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
errorData.put("fileId", fileId);
|
||||
@@ -379,60 +487,17 @@ public class ApiController {
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/protect/{fileId}")
|
||||
public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
|
||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||
@GetMapping("/check/file_stats")
|
||||
public ResponseEntity<?> checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
if (!optionalFileEntity.isPresent()) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
FileEntity fileEntity = optionalFileEntity.get();
|
||||
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
noCopyFileService.addFile(fileInfo);
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
|
||||
fileEntityRepository.save(fileEntity);
|
||||
Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(authToken.getUser().getId());
|
||||
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
|
||||
@GetMapping("/check/{fileId}/{type}")
|
||||
public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
|
||||
@PathVariable(required = false) String type) {
|
||||
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||
if (!optionalFileEntity.isPresent()) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
FileEntity fileEntity = optionalFileEntity.get();
|
||||
|
||||
Path path = type.toLowerCase().equals("image") ? Paths.get(fileEntity.getFilePath()) :
|
||||
Paths.get(fileEntity.getProtectedFilePath());
|
||||
|
||||
File file = path.toFile();
|
||||
|
||||
NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
|
||||
FileProtector.Type.valueOf(type.toUpperCase()));
|
||||
|
||||
return ResponseEntity.ok().body(noCopyCheckResult);
|
||||
}
|
||||
|
||||
private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
|
||||
Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
|
||||
|
||||
if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
FileEntity fileEntity = uploadedFile.get();
|
||||
List<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
|
||||
|
||||
if (hasDuplicate(similarFiles)) {
|
||||
return handleDuplicate(fileEntity, similarFiles);
|
||||
}
|
||||
|
||||
return null;
|
||||
return ResponseEntity.ok().body(fileTypeStats);
|
||||
}
|
||||
|
||||
private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.file.CheckStatus;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||
import ru.soune.nocopy.entity.user.ProtectedFileCheck;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.file.CheckCounterService;
|
||||
import ru.soune.nocopy.service.file.FileStorageService;
|
||||
import ru.soune.nocopy.service.file.ImageResizeService;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/files")
|
||||
@Slf4j
|
||||
public class FileController {
|
||||
|
||||
@Autowired
|
||||
private FileStorageService fileStorageService;
|
||||
|
||||
@Autowired
|
||||
private FileEntityRepository fileRepository;
|
||||
|
||||
@Autowired
|
||||
private CheckCounterService checkCounterService;
|
||||
|
||||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@Autowired
|
||||
private ImageResizeService imageResizeService;
|
||||
|
||||
@GetMapping("/public/{fileId}")
|
||||
public ResponseEntity<Resource> getPublicFile(@PathVariable String fileId) {
|
||||
try {
|
||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||
.orElseThrow(() -> new FileNotFoundException("Not found: " + fileId));
|
||||
|
||||
Path filePath = Paths.get(fileEntity.getFilePath());
|
||||
if (!Files.exists(filePath)) {
|
||||
log.error("Not on disk: {}", fileEntity.getFilePath());
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
|
||||
|
||||
MediaType mediaType = getMediaType(fileEntity);
|
||||
|
||||
ContentDisposition contentDisposition = ContentDisposition.inline()
|
||||
.filename(fileEntity.getOriginalFileName(), StandardCharsets.UTF_8)
|
||||
.build();
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(mediaType)
|
||||
.contentLength(Files.size(filePath))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString())
|
||||
.header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600")
|
||||
.body(resource);
|
||||
|
||||
} catch (FileNotFoundException e) {
|
||||
log.warn("Not on disk: {}", fileId);
|
||||
return ResponseEntity.notFound().build();
|
||||
} catch (IOException e) {
|
||||
log.error("Read file exception: {}", fileId, e);
|
||||
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
|
||||
}
|
||||
}
|
||||
|
||||
private MediaType getMediaType(FileEntity fileEntity) {
|
||||
try {
|
||||
return MediaType.parseMediaType(fileEntity.getMimeType());
|
||||
} catch (InvalidMediaTypeException e) {
|
||||
String extension = fileEntity.getFileExtension().toLowerCase();
|
||||
switch (extension) {
|
||||
case "jpg":
|
||||
case "jpeg":
|
||||
return MediaType.IMAGE_JPEG;
|
||||
case "png":
|
||||
return MediaType.IMAGE_PNG;
|
||||
case "pdf":
|
||||
return MediaType.APPLICATION_PDF;
|
||||
default:
|
||||
return MediaType.APPLICATION_OCTET_STREAM;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/protected/{fileId}/{type}")
|
||||
public ResponseEntity<Resource> getProtectedFile(
|
||||
@PathVariable String fileId, @PathVariable String type) throws IOException {
|
||||
|
||||
FileEntity fileEntity = fileRepository.findById(fileId)
|
||||
.orElseThrow(() -> new RuntimeException("File not found"));
|
||||
|
||||
String path = imageResizeService.getPath(fileEntity, type);
|
||||
|
||||
Resource resource = fileStorageService.loadFileAsResource(path);
|
||||
|
||||
if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
|
||||
fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
|
||||
throw new RuntimeException("File is not protected");
|
||||
}
|
||||
|
||||
String fileName = fileEntity.getOriginalFileName().replace("." +
|
||||
fileEntity.getFileExtension(), "") + "_nocopy_protected" +
|
||||
"." + fileEntity.getFileExtension();
|
||||
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8)
|
||||
.replace("+", "%20");
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION,
|
||||
"inline; filename*=UTF-8''" + encodedFileName)
|
||||
.body(resource);
|
||||
}
|
||||
|
||||
@GetMapping("check-file/status/{userId}")
|
||||
public ResponseEntity<CheckStatus> getStatus(@PathVariable Long userId) {
|
||||
CheckStatus status = checkCounterService.getCurrentStatus(userId);
|
||||
|
||||
return ResponseEntity.ok(status);
|
||||
}
|
||||
|
||||
@PostMapping("check-file/update-limit/{userId}/{limit}")
|
||||
public ResponseEntity<ProtectedFileCheck> getStatus(@PathVariable Long userId, @PathVariable Integer limit) {
|
||||
User user = userRepository.findById(userId).orElseThrow();
|
||||
ProtectedFileCheck protectedFileCheck = checkCounterService.updateLimit(user, limit);
|
||||
|
||||
return ResponseEntity
|
||||
.ok()
|
||||
.body(protectedFileCheck);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,173 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.search.GlobalSearchStartRequest;
|
||||
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
|
||||
import ru.soune.nocopy.dto.search.GlobalSearchStatusResponse;
|
||||
import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.search.GlobalSearchTask;
|
||||
import ru.soune.nocopy.entity.search.SearchStatus;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
import ru.soune.nocopy.service.search.GlobalSearchService;
|
||||
import ru.soune.nocopy.service.violation.ViolationService;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/global-search")
|
||||
@RequiredArgsConstructor
|
||||
public class GlobalSearchController {
|
||||
|
||||
private final AuthService authService;
|
||||
|
||||
private final GlobalSearchService globalSearchService;
|
||||
|
||||
private final GlobalSearchTaskRepository globalSearchTaskRepository;
|
||||
|
||||
private final GlobalSearchTaskRepository searchTaskRepository;
|
||||
|
||||
private final ViolationService violationService;
|
||||
|
||||
@PostMapping("/start")
|
||||
public ResponseEntity<?> startSearch(
|
||||
@RequestBody GlobalSearchStartRequest request,
|
||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
GlobalSearchStartResponse response = new GlobalSearchStartResponse();
|
||||
|
||||
try {
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
|
||||
List<FileEntity> filesToProcess = globalSearchService.getFilesToProcess(request, userId);
|
||||
|
||||
if (filesToProcess.isEmpty()) return ResponseEntity.ok().body("Files for search not found");
|
||||
|
||||
String taskId = globalSearchService.startSearch(request, userId, filesToProcess);
|
||||
|
||||
Optional<GlobalSearchTask> taskOptional = globalSearchTaskRepository.findById(taskId);
|
||||
|
||||
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
||||
|
||||
GlobalSearchTask task = taskOptional.orElseThrow();
|
||||
|
||||
response.setTaskId(taskId);
|
||||
response.setStatus(SearchStatus.ACCEPTED.name());
|
||||
response.setTotalFiles(task.getTotalFiles());
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
@GetMapping("/actual-task")
|
||||
public ResponseEntity<?> getStatus(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
Optional<GlobalSearchTask> taskOptional;
|
||||
|
||||
try {
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
|
||||
taskOptional = searchTaskRepository.findByUserIdAndStatus(userId,
|
||||
"PROCESSING");
|
||||
|
||||
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(taskOptional.get());
|
||||
}
|
||||
|
||||
@GetMapping("/violation-summary")
|
||||
public ResponseEntity<?> getSummary(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
List<FileViolationSummaryDTO> fileViolationsSummary;
|
||||
|
||||
try {
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
|
||||
fileViolationsSummary =
|
||||
violationService.getFileViolationsSummary(userId);
|
||||
|
||||
if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(fileViolationsSummary);
|
||||
}
|
||||
|
||||
@GetMapping("/status/{taskId}")
|
||||
public ResponseEntity<?> getStatus(@PathVariable String taskId,
|
||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
GlobalSearchStatusResponse response;
|
||||
|
||||
try {
|
||||
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||
|
||||
Optional<GlobalSearchTask> taskOptional = searchTaskRepository.findByTaskIdAndUserId(taskId, userId);
|
||||
|
||||
if (taskOptional.isEmpty()) return ResponseEntity.ok().body("Task not found");
|
||||
|
||||
GlobalSearchTask task = taskOptional.orElseThrow();
|
||||
|
||||
int progress = task.getTotalFiles() > 0 ? task.getProcessedFiles() * 100 / task.getTotalFiles() : 0;
|
||||
|
||||
response = new GlobalSearchStatusResponse();
|
||||
response.setTaskId(taskId);
|
||||
response.setStatus(task.getStatus());
|
||||
response.setProgress(progress);
|
||||
} catch (NotFoundAuthToken e) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -15,6 +16,14 @@ public class HealtCheckController {
|
||||
return HttpStatus.OK;
|
||||
}
|
||||
|
||||
@Value("${BUILD_TIME_BACK:unknown}")
|
||||
private String buildTimeBack;
|
||||
|
||||
@GetMapping("/build")
|
||||
public BuildInfo getBuildInfo() {
|
||||
return new BuildInfo(buildTimeBack);
|
||||
}
|
||||
|
||||
@GetMapping("/api/debug/memory")
|
||||
public Map<String, String> getMemoryInfo() {
|
||||
Runtime runtime = Runtime.getRuntime();
|
||||
@@ -32,4 +41,12 @@ public class HealtCheckController {
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
static class BuildInfo {
|
||||
public String buildTimeBack;
|
||||
|
||||
public BuildInfo(String buildTimeBack) {
|
||||
this.buildTimeBack = buildTimeBack;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
|
||||
import ru.soune.nocopy.entity.payment.Payment;
|
||||
import ru.soune.nocopy.exception.PaymentNotFoundException;
|
||||
import ru.soune.nocopy.exception.TariffNotFoundException;
|
||||
import ru.soune.nocopy.exception.UserNotFoundException;
|
||||
import ru.soune.nocopy.service.payment.PaymentService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/payments")
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class PaymentController {
|
||||
|
||||
private final PaymentService paymentService;
|
||||
|
||||
private final AuthService authService;
|
||||
|
||||
@PostMapping("/create")
|
||||
public ResponseEntity<?> createPayment(@RequestParam String email, @RequestParam Long tariffId,
|
||||
@RequestParam String operationType, @RequestParam String operationUuid) {
|
||||
try {
|
||||
Payment payment = paymentService.createPayment(email, tariffId, operationType, operationUuid);
|
||||
|
||||
return ResponseEntity.ok(payment);
|
||||
} catch (TariffNotFoundException e) {
|
||||
return ResponseEntity
|
||||
.status(HttpStatus.NOT_FOUND)
|
||||
.body(Map.of("error", "Tariff not found", "message", e.getMessage()));
|
||||
} catch (UserNotFoundException e) {
|
||||
return ResponseEntity
|
||||
.status(HttpStatus.NOT_FOUND)
|
||||
.body(Map.of("error", "User not found", "message", e.getMessage()));
|
||||
} catch (Exception e) {
|
||||
return ResponseEntity
|
||||
.status(HttpStatus.INTERNAL_SERVER_ERROR)
|
||||
.body(Map.of("error", "Internal server error", "message", e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("webhook/yookassa")
|
||||
public void handleYooKassaNotification(@RequestBody Map<String, Object> notification) {
|
||||
try {
|
||||
paymentService.handlePaymentNotification(notification);
|
||||
log.info("Notification from yookassa: " + notification);
|
||||
} catch (PaymentNotFoundException e) {
|
||||
log.error("Error processing payment notification", e);
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/auto-renewal")
|
||||
public ResponseEntity<?> disableAutoRenewal(@RequestParam(value = "renewal") Boolean renewal,
|
||||
@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
try {
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
paymentService.changeAutoRenewal(authService.useUserAuthToken(tokenHeader), renewal);
|
||||
return ResponseEntity.ok(Map.of("message", "Auto-renewal disabled"));
|
||||
} catch (UserNotFoundException e) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||
.body(Map.of("error", e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@DeleteMapping("/methods/{paymentMethodId}")
|
||||
public ResponseEntity<?> deletePaymentMethod(@RequestHeader(value = "Authorization", required = false) String tokenHeader,
|
||||
@PathVariable String paymentMethodId) {
|
||||
try {
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
paymentService.deletePaymentMethod(authService.useUserAuthToken(tokenHeader), paymentMethodId);
|
||||
return ResponseEntity.ok(Map.of("message", "Payment method deleted"));
|
||||
} catch (UserNotFoundException e) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||
.body(Map.of("error", e.getMessage()));
|
||||
} catch (RuntimeException e) {
|
||||
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
|
||||
.body(Map.of("error", e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/methods")
|
||||
public ResponseEntity<?> getPaymentMethods(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
|
||||
try {
|
||||
if (tokenHeader == null || tokenHeader.isBlank()) {
|
||||
Map<String, Object> errorData = new HashMap<>();
|
||||
errorData.put("token", tokenHeader);
|
||||
|
||||
return ResponseEntity.ok().body(Map.of("error", errorData));
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(paymentService.getUserPaymentMethods(
|
||||
authService.useUserAuthToken(tokenHeader)));
|
||||
} catch (UserNotFoundException e) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||
.body(Map.of("error", e.getMessage()));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,209 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.payout.*;
|
||||
import ru.soune.nocopy.entity.payout.BankTransferPayoutMethod;
|
||||
import ru.soune.nocopy.entity.payout.CardPayoutMethod;
|
||||
import ru.soune.nocopy.entity.payout.PayoutRequest;
|
||||
import ru.soune.nocopy.entity.payout.PayoutType;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.service.payout.PayoutMethodService;
|
||||
import ru.soune.nocopy.service.payout.PayoutRequestService;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/payouts")
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class PayoutController {
|
||||
|
||||
private final PayoutRequestService payoutRequestService;
|
||||
|
||||
private final PayoutMethodService payoutMethodService;
|
||||
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
|
||||
/*
|
||||
Create payout
|
||||
*/
|
||||
@PostMapping("/create-request")
|
||||
public ResponseEntity<PayoutRequest> createPayoutRequest(@RequestHeader("Authorization") String tokenHeader,
|
||||
@Valid @RequestBody PayoutRequestDTO request) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
PayoutRequest payoutRequest = payoutRequestService.createPayoutRequest(user.getId(), request);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.CREATED).body(payoutRequest);
|
||||
}
|
||||
|
||||
/*
|
||||
Completed payout
|
||||
*/
|
||||
@PostMapping("/requests/{requestId}/process")
|
||||
public ResponseEntity<PayoutRequest> processPayoutRequest(@PathVariable Long requestId) {
|
||||
PayoutRequest processed = payoutRequestService.processRequest(requestId);
|
||||
|
||||
return ResponseEntity.ok(processed);
|
||||
}
|
||||
|
||||
/*
|
||||
Cancel payout
|
||||
*/
|
||||
@PostMapping("/requests/{requestId}/cancel")
|
||||
public ResponseEntity<PayoutRequest> cancelPayoutRequest(@PathVariable Long requestId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
PayoutRequest cancelled = payoutRequestService.cancelPayoutRequest(user.getId(), requestId);
|
||||
|
||||
return ResponseEntity.ok(cancelled);
|
||||
}
|
||||
|
||||
/*
|
||||
Get user payouts
|
||||
*/
|
||||
@GetMapping("/requests")
|
||||
public ResponseEntity<List<PayoutRequest>> getUserRequests(@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
return ResponseEntity.ok(payoutRequestService.getUserPayoutRequests(user.getId()));
|
||||
}
|
||||
|
||||
/*
|
||||
Get payout by id
|
||||
*/
|
||||
@GetMapping("/requests/{requestId}")
|
||||
public ResponseEntity<PayoutRequest> getPayoutRequest(@PathVariable Long requestId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
return ResponseEntity.ok(payoutRequestService.getPayoutRequest(user.getId(), requestId));
|
||||
}
|
||||
|
||||
/*
|
||||
Get payout by id
|
||||
*/
|
||||
@GetMapping("user/payout-methods")
|
||||
public ResponseEntity<List<PayoutMethodDTO>> getUserMethods(@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
return ResponseEntity.ok(payoutMethodService.getUserMethods(user.getId()));
|
||||
}
|
||||
|
||||
/*
|
||||
Get payout-methods
|
||||
*/
|
||||
@GetMapping("/payout-methods")
|
||||
public ResponseEntity<List<PayoutMethodTypeDTO>> getAvailableMethodTypes() {
|
||||
List<PayoutMethodTypeDTO> types = Arrays.stream(PayoutType.values())
|
||||
.map(type -> PayoutMethodTypeDTO.builder()
|
||||
.code(type.name())
|
||||
.name(type.getDisplayName())
|
||||
.build())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return ResponseEntity.ok(types);
|
||||
}
|
||||
/*
|
||||
add card method by userId
|
||||
*/
|
||||
@PostMapping("/payout-method/card")
|
||||
public ResponseEntity<PayoutMethodDTO> addCardMethod(@Valid @RequestBody AddCardRequest request,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
CardPayoutMethod method = payoutMethodService.addCardMethod(user.getId(), request);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.CREATED)
|
||||
.body(payoutMethodService.convertToDto(method));
|
||||
}
|
||||
|
||||
/*
|
||||
add bank payout-method
|
||||
*/
|
||||
@PostMapping("/payout-method/bank-transfer")
|
||||
public ResponseEntity<PayoutMethodDTO> addBankTransferMethod(@Valid @RequestBody AddBankTransferRequest request,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
BankTransferPayoutMethod method = payoutMethodService.addBankTransferMethod(user.getId(), request);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.CREATED)
|
||||
.body(payoutMethodService.convertToDto(method));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
set default bank payout-method
|
||||
*/
|
||||
@PutMapping("/payout-method/{methodId}/default")
|
||||
public ResponseEntity<Void> setDefaultMethod(@PathVariable Long methodId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
User user = authToken.getUser();
|
||||
|
||||
payoutMethodService.setDefaultMethod(user.getId(), methodId);
|
||||
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package ru.soune.nocopy.controller;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.configuration.search.SearchProperties;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.search.config.SearchSettingsDto;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/search/settings")
|
||||
@RequiredArgsConstructor
|
||||
public class SearchSettingsController {
|
||||
|
||||
private final SearchProperties searchProperties;
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<?> getSettings() {
|
||||
SearchSettingsDto dto = new SearchSettingsDto();
|
||||
|
||||
dto.setEngines(Map.of(
|
||||
"yandex", searchProperties.getEngines().get("yandex").isEnabled(),
|
||||
"google", searchProperties.getEngines().get("google").isEnabled()));
|
||||
|
||||
dto.setProxyEnabled(searchProperties.getProxy().isEnabled());
|
||||
|
||||
return ResponseEntity.ok().body(BaseResponse.builder()
|
||||
.messageDesc("Success")
|
||||
.messageBody(dto)
|
||||
.build());
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
public ResponseEntity<?> updateSettings(@RequestBody SearchSettingsDto settings) {
|
||||
if (settings.getEngines() != null) {
|
||||
settings.getEngines().forEach((key, value) -> {
|
||||
if (searchProperties.getEngines().containsKey(key)) {
|
||||
searchProperties.getEngines().get(key).setEnabled(value);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (settings.getProxyEnabled() != null) {
|
||||
searchProperties.getProxy().setEnabled(settings.getProxyEnabled());
|
||||
}
|
||||
|
||||
log.info("Settings updated: {}", settings);
|
||||
|
||||
return ResponseEntity.ok().body(BaseResponse.builder()
|
||||
.messageDesc("Settings updated")
|
||||
.build());
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,11 @@ import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
||||
import ru.soune.nocopy.dto.register.RegAnswer;
|
||||
import ru.soune.nocopy.dto.register.RegRequest;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||
import ru.soune.nocopy.dto.user.UserDTO;
|
||||
import ru.soune.nocopy.dto.user.UserRequest;
|
||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||
@@ -19,7 +22,9 @@ import ru.soune.nocopy.exception.NotValidFieldException;
|
||||
import ru.soune.nocopy.mapper.UserMapper;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.file.FileStatsService;
|
||||
import ru.soune.nocopy.service.register.AuthService;
|
||||
import ru.soune.nocopy.service.tariff.TariffService;
|
||||
import ru.soune.nocopy.service.user.UserService;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -44,12 +49,17 @@ public class UserController {
|
||||
|
||||
private final AuthService authService;
|
||||
|
||||
private final TariffService tariffService;
|
||||
|
||||
private final FileStatsService fileStatsService;
|
||||
|
||||
@GetMapping("/all")
|
||||
public ResponseEntity<List<UserDTO>> getAllUsers() {
|
||||
List<UserDTO> allUsers = userRepository.findAll().stream()
|
||||
.map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.isActive(),
|
||||
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
||||
u.getPhone(), u.getGenderType(),
|
||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
|
||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
||||
null, null))
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(allUsers);
|
||||
@@ -62,26 +72,69 @@ public class UserController {
|
||||
|
||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||
|
||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||
|
||||
if (authToken != null) {
|
||||
if (tokenOptional.isPresent()) {
|
||||
User user = userRepository.findByEmail(email);
|
||||
//TODO add mapper
|
||||
|
||||
if (user != null) {
|
||||
UserDTO userDTO = userMapper.toDTO(user);
|
||||
userDTO.setEmail(email);
|
||||
userDTO.setFullName(user.getFullName());
|
||||
userDTO.setCompany(user.getCompany());
|
||||
|
||||
if (user.getCompany() != null) {
|
||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||
}
|
||||
|
||||
if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
|
||||
userDTO.setTariffs(tariffService.getTariffByAccountType(user));
|
||||
|
||||
Long fileOnDisk = user.canManageCompanySettings() ?
|
||||
fileStatsService.calculateCompanyFileSize(user.getId()):
|
||||
fileStatsService.calculateUserFileSize(user.getId());
|
||||
|
||||
Integer filesCount = user.canManageCompanySettings() ?
|
||||
fileStatsService.filesCompanyCount(user.getId()):
|
||||
fileStatsService.filesUserCount(user.getId());
|
||||
|
||||
TariffInfo personalTariffInfo;
|
||||
|
||||
if (user.getCompany() == null) {
|
||||
personalTariffInfo = user.getPersonalTariffInfo();
|
||||
} else {
|
||||
personalTariffInfo = user.getCompany().getTariffInfo();
|
||||
}
|
||||
|
||||
Tariff tariff = personalTariffInfo.getTariff();
|
||||
|
||||
TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
|
||||
.id(personalTariffInfo.getId())
|
||||
.tariffName(tariff.getName())
|
||||
.status(personalTariffInfo.getStatus().name())
|
||||
.tariffId(tariff.getId())
|
||||
.currentFileCounts(filesCount)
|
||||
.maxFileCounts(tariff.getMaxFilesCount())
|
||||
.currentFileOnDisk(fileOnDisk)
|
||||
.maxFileOnDisk(tariff.getDiskSize())
|
||||
.startTariff(personalTariffInfo.getStartTariff())
|
||||
.endTariff(personalTariffInfo.getEndTariff())
|
||||
.tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
|
||||
.build();
|
||||
|
||||
userDTO.setTariffInfo(infoDTO);
|
||||
|
||||
}
|
||||
|
||||
userDTO.setPhone(user.getPhone());
|
||||
userDTO.setGenderType(user.getGenderType());
|
||||
userDTO.setBirthday(user.getBirthday());
|
||||
userDTO.setCreatedAt(user.getCreatedAt());
|
||||
userDTO.setSubscriptionType(user.getSubscriptionType());
|
||||
userDTO.setActive(user.isActive());
|
||||
userDTO.setPermission(user.getUserPermissions());
|
||||
|
||||
return ResponseEntity.ok(userDTO);
|
||||
}
|
||||
|
||||
} else {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
return ResponseEntity.notFound().build();
|
||||
@@ -144,10 +197,6 @@ public class UserController {
|
||||
user.setActive(true);
|
||||
user.setEmailVerified(true);
|
||||
|
||||
if (registerRequest.getCompanyName() != null) {
|
||||
user.setCompany(registerRequest.getCompanyName());
|
||||
}
|
||||
|
||||
if (registerRequest.getPhone() != null) {
|
||||
user.setPhone(registerRequest.getPhone());
|
||||
}
|
||||
|
||||
@@ -3,10 +3,12 @@ package ru.soune.nocopy.dto;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||
public class BaseResponse {
|
||||
@JsonProperty("msg_id")
|
||||
|
||||
@@ -4,16 +4,23 @@ public enum MessageCode {
|
||||
SUCCESS(0, "Operation successful"),
|
||||
REG_EMAIL_EXISTS(1, "Email already registered"),
|
||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||
REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
|
||||
INVALID_FIELD(2, "Invalid field"),
|
||||
INVALID_TOKEN(2, "Invalid token"),
|
||||
MAIL_VERIFIED_NULL(2, "Mail verified null"),
|
||||
INVALID_TOKEN(2, "Token not found or time expired"),
|
||||
TOKEN_IS_ALIVE(2, "Token is alive"),
|
||||
INVALID_ACTION(2, "Invalid action"),
|
||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||
DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
|
||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||
FILE_NOT_EXIST(2, "File not exist on disk"),
|
||||
FILE_DELETE(2, "File was deleted"),
|
||||
USER_NOT_HAD_PERMISSION(2, "User not have permission for file"),
|
||||
USER_NOT_VERIFIED(2, "User not verified"),
|
||||
PERMISSION_NOT_FOUND(2, "Permission not found"),
|
||||
USER_NOT_FOUND(2, "User not found"),
|
||||
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||
TOKEN_IS_NULL(2, "Token field is null"),
|
||||
IMAGE_FOUND_ERROR(2, "Image found error"),
|
||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||
@@ -27,7 +34,28 @@ public enum MessageCode {
|
||||
FILE_NOT_FOUND(4, "File not found"),
|
||||
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
|
||||
SEND_EMAIL_EXCEPTION(2, "Send email exception"),
|
||||
SIMILAR_FILES_FOUND(0, "Similar files found");
|
||||
SIMILAR_FILES_FOUND(0, "Similar files found"),
|
||||
FILE_IS_PROTECTED(0, "File is protected"),
|
||||
FILE_IS_NOT_PROTECTED(0, "File is not protected"),
|
||||
TARIFF_IS_ADD(0, "Tariff is added"),
|
||||
TARIFF_IS_DELETED(0, "Tariff is deleted"),
|
||||
TARIFF_IS_UPDATED(0, "Tariff is updated"),
|
||||
TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
|
||||
VALIDATION_ERROR(2, "Validation error"),
|
||||
RESOURCE_NOT_FOUND(4, "Resource not found"),
|
||||
INTERNAL_ERROR(4, "Internal server error"),
|
||||
COMPANY_NOT_FOUND(4, "Company not found"),
|
||||
PAYMENT_NOT_FOUND(4, "Payment not found"),
|
||||
COMPANY_ALREADY_EXISTS(2, "Company already exists"),
|
||||
USER_LIMIT_IS_OVER(2, "Over user limits"),
|
||||
MONITORING_TYPE_NOT_FOUND(4, "Monitoring type not found"),
|
||||
ERROR_TARIFF_INFO(2, "Erorr with tariff info"),
|
||||
FILE_FOR_SEARCH_NOT_VALID(2, "File for search unsupported"),
|
||||
NOT_VALID_FILE_TYPE_OR_COUNT_FILE(2, "Cost for file type not found, count is negative or files count" +
|
||||
"more than max valid"),
|
||||
USER_NOT_ACTIVE(2, "User not active"),
|
||||
NOTION_NOT_FOUND(4, "Notion not found"),
|
||||
MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion");
|
||||
|
||||
private final Integer code;
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package ru.soune.nocopy.dto.company;
|
||||
|
||||
import lombok.Data;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
public class CompanyActionRequestDto {
|
||||
private String action;
|
||||
private String companyId;
|
||||
private String companyName;
|
||||
private Map<String, Object> companyData;
|
||||
private Long userId;
|
||||
private Map<String, Object> searchParams;
|
||||
private PageableParams pageable;
|
||||
|
||||
@Data
|
||||
public static class PageableParams {
|
||||
private int page;
|
||||
private int size;
|
||||
private String sort;
|
||||
private String direction;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.dto.company;
|
||||
|
||||
import lombok.Data;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class CompanyResponseDto {
|
||||
private String id;
|
||||
private String companyName;
|
||||
private String phone;
|
||||
private String address;
|
||||
private String email;
|
||||
private LocalDateTime registerDate;
|
||||
private LocalDateTime updateDate;
|
||||
private long userCount;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package ru.soune.nocopy.dto.cost;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CostRequest {
|
||||
String action;
|
||||
|
||||
@JsonProperty("file_type")
|
||||
String fileType;
|
||||
|
||||
@JsonProperty("count_files")
|
||||
Integer countFilesForProtect;
|
||||
|
||||
@JsonProperty("auth_token")
|
||||
String authToken;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package ru.soune.nocopy.dto.cost;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class CostResponse {
|
||||
private int cost;
|
||||
|
||||
private Boolean success;
|
||||
|
||||
@JsonProperty("max_files_for_check")
|
||||
private Integer maxFilesForCheck;
|
||||
|
||||
@JsonProperty("count_file")
|
||||
private Integer countFile;
|
||||
|
||||
@JsonProperty("tokens_count")
|
||||
private int needTokensCount;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package ru.soune.nocopy.dto.dadata;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class DaDataAddress {
|
||||
private String value;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune.nocopy.dto.dadata;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class DaDataData {
|
||||
private String inn;
|
||||
private DaDataAddress address;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune.nocopy.dto.dadata;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DaDataRequest {
|
||||
|
||||
@JsonProperty("inn")
|
||||
private String inn;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.dto.dadata;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DaDataResponse {
|
||||
@JsonProperty("companyName")
|
||||
private String companyName;
|
||||
|
||||
@JsonProperty("inn")
|
||||
private String inn;
|
||||
|
||||
@JsonProperty("address")
|
||||
private String address;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune.nocopy.dto.dadata;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class DaDataSuggestion {
|
||||
private String value;
|
||||
private DaDataData data;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package ru.soune.nocopy.dto.dadata;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class DaDataWrapper {
|
||||
private List<DaDataSuggestion> suggestions;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CheckIncrementResult {
|
||||
private boolean success;
|
||||
private Integer countChecked;
|
||||
private Integer remainingLimit;
|
||||
private String message;
|
||||
|
||||
public static CheckIncrementResult success(Integer countChecked) {
|
||||
return CheckIncrementResult.builder()
|
||||
.success(true)
|
||||
.countChecked(countChecked)
|
||||
.message("Check count incremented successfully")
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class CheckStatus {
|
||||
private Long userId;
|
||||
private Integer countChecked;
|
||||
private Integer remainingLimit;
|
||||
private LocalDateTime lastCheckAt;
|
||||
}
|
||||
@@ -34,4 +34,16 @@ public class FileEntityRequest {
|
||||
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy;
|
||||
|
||||
@JsonProperty("sort_order")
|
||||
private String sortOrder;
|
||||
|
||||
@JsonProperty("type")
|
||||
private String type;
|
||||
|
||||
@JsonProperty("date_filter")
|
||||
private String dateFilter;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,8 @@ public class FileEntityResponse {
|
||||
private String originalFileName;
|
||||
private String storedFileName;
|
||||
private String filePath;
|
||||
private String protectedFilePath;
|
||||
private String thumbnailFileUrl;
|
||||
private Long fileSize;
|
||||
private String mimeType;
|
||||
private String fileExtension;
|
||||
@@ -32,4 +34,12 @@ public class FileEntityResponse {
|
||||
private boolean existsOnDisk;
|
||||
private Integer supportId;
|
||||
private String protectStatus;
|
||||
private String ownerName;
|
||||
private String ownerEmail;
|
||||
private String ownerCompany;
|
||||
private String fileName;
|
||||
private String fileFormat;
|
||||
private Integer checksCount;
|
||||
private LocalDateTime fileUploadDate;
|
||||
private String monitoring;
|
||||
}
|
||||
|
||||
@@ -59,6 +59,21 @@ public class FileInfoUserResponse {
|
||||
@JsonProperty("audios_violations")
|
||||
private Integer audiosViolations;
|
||||
|
||||
@JsonProperty("document_size")
|
||||
private Long documentSize;
|
||||
|
||||
@JsonProperty("document_quantity")
|
||||
private Integer documentCount;
|
||||
|
||||
@JsonProperty("document_check")
|
||||
private Integer documentCheck;
|
||||
|
||||
@JsonProperty("document_violations")
|
||||
private Integer documentViolations;
|
||||
|
||||
@JsonProperty("protected_document_files_count")
|
||||
private Long protectedDocumentFilesCount;
|
||||
|
||||
@JsonProperty("protected_files_count")
|
||||
private Long protectedFilesCount;
|
||||
|
||||
|
||||
@@ -30,4 +30,10 @@ public class FileListResponse {
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private Integer pageSize;
|
||||
|
||||
@JsonProperty("sort_by")
|
||||
private String sortBy;
|
||||
|
||||
@JsonProperty("sort_order")
|
||||
private String sortOrder;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FileTypeStatsDto {
|
||||
private String fileType;
|
||||
private Integer count;
|
||||
}
|
||||
@@ -28,4 +28,7 @@ public class FileUploadRequest {
|
||||
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
@JsonProperty("convertTo")
|
||||
private String convertTo;
|
||||
}
|
||||
|
||||
@@ -7,4 +7,10 @@ import lombok.Data;
|
||||
public class ImageSearchRequest {
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page = 1;
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private Integer pageSize = 10;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
class PeriodHistoryDto {
|
||||
private LocalDate periodStart;
|
||||
private LocalDate periodEnd;
|
||||
private Integer totalChecks;
|
||||
private Map<String, Integer> checksByType;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ProtectionLimitsDto {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String userEmail;
|
||||
private LocalDate lastResetDate;
|
||||
private Integer totalChecksAllTime;
|
||||
private Integer periodChecksCount;
|
||||
private Map<String, Integer> checksByFileType;
|
||||
private LocalDate periodStartDate;
|
||||
private LocalDate periodEndDate;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime lastCheckAt;
|
||||
}
|
||||
@@ -2,6 +2,9 @@ package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Value;
|
||||
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Value
|
||||
@Builder
|
||||
@@ -12,4 +15,9 @@ public class SimilarFileDTO {
|
||||
Integer hammingDistance;
|
||||
String similarityLevel;
|
||||
Long ownerId;
|
||||
Long supportId;
|
||||
ProtectionStatus status;
|
||||
LocalDateTime uploadDate;
|
||||
String url;
|
||||
Boolean owner;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum SortOrder {
|
||||
ASC("asc"),
|
||||
DESC("desc");
|
||||
|
||||
private final String value;
|
||||
|
||||
SortOrder(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static SortOrder fromString(String value) {
|
||||
if (value == null) return ASC;
|
||||
for (SortOrder order : SortOrder.values()) {
|
||||
if (order.value.equalsIgnoreCase(value)) {
|
||||
return order;
|
||||
}
|
||||
}
|
||||
return ASC;
|
||||
}
|
||||
}
|
||||
@@ -33,4 +33,12 @@ public class YandexSearchResponse {
|
||||
@JsonProperty("host")
|
||||
private String host;
|
||||
}
|
||||
|
||||
private int page;
|
||||
|
||||
private int pageSize;
|
||||
|
||||
private int totalResults;
|
||||
|
||||
private int totalPages;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package ru.soune.nocopy.dto.monitoring;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GetViolationsRequest {
|
||||
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("page")
|
||||
private Integer page;
|
||||
|
||||
@JsonProperty("page_size")
|
||||
private Integer pageSize;
|
||||
|
||||
@JsonProperty("mark_as_read")
|
||||
private boolean markAsRead;
|
||||
|
||||
@JsonProperty("auth_token")
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package ru.soune.nocopy.dto.monitoring;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.monitoring.MonitoringType;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* Response for status monitoring
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
public class MonitoringStatusResponse {
|
||||
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("file_name")
|
||||
private String fileName;
|
||||
|
||||
@JsonProperty("monitoring_type")
|
||||
private MonitoringType monitoringType;
|
||||
|
||||
@JsonProperty("next_run")
|
||||
private LocalDateTime nextRun;
|
||||
|
||||
@JsonProperty("last_run")
|
||||
private LocalDateTime lastRun;
|
||||
|
||||
@JsonProperty("last_run_status")
|
||||
private String lastRunStatus;
|
||||
|
||||
@JsonProperty("is_active")
|
||||
private boolean isActive;
|
||||
|
||||
@JsonProperty("need_add_tokens")
|
||||
private boolean needAddTokens;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package ru.soune.nocopy.dto.monitoring;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.monitoring.MonitoringType;
|
||||
/**
|
||||
Set monitoring request
|
||||
*/
|
||||
@Data
|
||||
public class SetMonitoringRequest {
|
||||
|
||||
@JsonProperty("file_id")
|
||||
private String fileId;
|
||||
|
||||
@JsonProperty("monitoring_type")
|
||||
private String monitoringType;
|
||||
|
||||
@JsonProperty("auth_token")
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.dto.payment;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PaymentMethodDTO {
|
||||
private String paymentMethodId;
|
||||
private String lastFour;
|
||||
private String cardType;
|
||||
private String expiryMonth;
|
||||
private String expiryYear;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package ru.soune.nocopy.dto.payment;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class PaymentRequest {
|
||||
private String email;
|
||||
private String paymentUuid;
|
||||
private String action;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package ru.soune.nocopy.dto.payment;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.entity.payment.Payment;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class PaymentResponse {
|
||||
List<Payment> payments;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package ru.soune.nocopy.dto.payout;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AddBankTransferRequest {
|
||||
|
||||
@NotBlank(message = "Bank name is required")
|
||||
@Size(min = 2, max = 200, message = "Bank name must be between 2 and 200 characters")
|
||||
private String bankName;
|
||||
|
||||
@NotBlank(message = "BIC is required")
|
||||
@Pattern(regexp = "^[0-9]{9}$", message = "BIC must contain 9 digits")
|
||||
private String bic;
|
||||
|
||||
@Pattern(regexp = "^[0-9]{20}$", message = "Correspondent account must contain 20 digits")
|
||||
private String correspondentAccount;
|
||||
|
||||
@NotBlank(message = "Account number is required")
|
||||
@Pattern(regexp = "^[0-9]{20}$", message = "Account number must contain 20 digits")
|
||||
private String accountNumber;
|
||||
|
||||
@NotBlank(message = "Account holder name is required")
|
||||
@Size(min = 3, max = 200, message = "Account holder name must be between 3 and 200 characters")
|
||||
private String accountHolder;
|
||||
|
||||
@Pattern(regexp = "^[0-9]{10}$|^[0-9]{12}$", message = "INN must contain 10 or 12 digits")
|
||||
private String inn;
|
||||
|
||||
@Pattern(regexp = "^[0-9]{9}$", message = "KPP must contain 9 digits")
|
||||
private String kpp;
|
||||
|
||||
@Builder.Default
|
||||
private boolean saveAsDefault = false;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package ru.soune.nocopy.dto.payout;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AddCardRequest {
|
||||
|
||||
@NotBlank(message = "Card number required")
|
||||
@Pattern(regexp = "^[0-9]{16}$", message = "Card number 16 cipher")
|
||||
private String cardNumber;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package ru.soune.nocopy.dto.payout;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PayoutMethodDTO {
|
||||
private Long id;
|
||||
private String type;
|
||||
private String displayName;
|
||||
private String maskedDetails;
|
||||
private String cardNumber;
|
||||
private boolean isDefault;
|
||||
private boolean isVerified;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package ru.soune.nocopy.dto.payout;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PayoutMethodResponse {
|
||||
private Long id;
|
||||
private String type;
|
||||
private String displayName;
|
||||
private String maskedDetails;
|
||||
private boolean isDefault;
|
||||
private boolean isVerified;
|
||||
private LocalDateTime createdAt;
|
||||
private String bankName;
|
||||
private String cardBrand;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package ru.soune.nocopy.dto.payout;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PayoutMethodTypeDTO {
|
||||
private String code;
|
||||
private String name;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package ru.soune.nocopy.dto.payout;
|
||||
|
||||
import jakarta.validation.constraints.DecimalMin;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class PayoutRequestDTO {
|
||||
|
||||
@NotNull(message = "Sum of pay is required")
|
||||
@DecimalMin(value = "1000.00", message = "Min sum for pay 1000")
|
||||
private BigDecimal amount;
|
||||
|
||||
@NotNull(message = "Способ выплаты обязателен")
|
||||
private Long payoutMethodId;
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package ru.soune.nocopy.dto.payout;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.entity.payout.PayoutRequest;
|
||||
import ru.soune.nocopy.entity.payout.PayoutRequestStatus;
|
||||
import ru.soune.nocopy.entity.payout.PayoutType;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
|
||||
public class PayoutResponse {
|
||||
private Long id;
|
||||
private BigDecimal amount;
|
||||
private String formattedAmount;
|
||||
private PayoutRequestStatus status;
|
||||
private PayoutType payoutType;
|
||||
private String payoutMethodDisplay;
|
||||
private LocalDateTime createdAt;
|
||||
private String formattedCreatedAt;
|
||||
private LocalDateTime processedAt;
|
||||
private LocalDateTime completedAt;
|
||||
private String transactionId;
|
||||
private String rejectionReason;
|
||||
private boolean canCancel;
|
||||
|
||||
public static PayoutResponse fromEntity(PayoutRequest request) {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm");
|
||||
|
||||
return PayoutResponse.builder()
|
||||
.id(request.getId())
|
||||
.amount(request.getAmount())
|
||||
.formattedAmount(String.format("%.2f ₽", request.getAmount()))
|
||||
.status(request.getStatus())
|
||||
.payoutType(request.getPayoutType())
|
||||
.payoutMethodDisplay(request.getPayoutMethod() != null ?
|
||||
request.getPayoutMethod().getDisplayName() : null)
|
||||
.createdAt(request.getCreatedAt())
|
||||
.formattedCreatedAt(request.getCreatedAt() != null ?
|
||||
request.getCreatedAt().format(formatter) : null)
|
||||
.processedAt(request.getProcessAt())
|
||||
.completedAt(request.getCompletedAt())
|
||||
.rejectionReason(request.getRejectionReason())
|
||||
.canCancel(request.getStatus() == PayoutRequestStatus.PENDING)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package ru.soune.nocopy.dto.referral;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class ReferralRequest {
|
||||
private String token;
|
||||
private Integer amount;
|
||||
private Integer pageSize;
|
||||
private Integer pageNumber;
|
||||
private String action;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.soune.nocopy.dto.register;
|
||||
|
||||
public enum AccountType {
|
||||
B2B, B2C
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package ru.soune.nocopy.dto.register;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import jakarta.validation.constraints.*;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -13,6 +14,11 @@ public class RegRequest {
|
||||
|
||||
private String companyName;
|
||||
|
||||
private String inn;
|
||||
|
||||
@NotEmpty(message = "Need account type")
|
||||
private String accountType;
|
||||
|
||||
@Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
|
||||
private String phone;
|
||||
|
||||
@@ -24,4 +30,11 @@ public class RegRequest {
|
||||
@NotBlank(message = "Password is required")
|
||||
@Size(min = 8, message = "Password must be at least 8 characters")
|
||||
private String password;
|
||||
|
||||
private String authToken;
|
||||
|
||||
private String referralLink;
|
||||
|
||||
@JsonProperty("mail_verified")
|
||||
private String mailVerified;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package ru.soune.nocopy.dto.register;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ResetPasswordRequest {
|
||||
|
||||
@JsonProperty("email")
|
||||
private String email;
|
||||
|
||||
@JsonProperty("verifyToken")
|
||||
private String verifyToken;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("password")
|
||||
private String password;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package ru.soune.nocopy.dto.register;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ResetPasswordResponse {
|
||||
@JsonProperty("user_id")
|
||||
private Long userId;
|
||||
|
||||
@JsonProperty("authToken")
|
||||
private String authToken;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package ru.soune.nocopy.dto.search;
|
||||
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class GlobalSearchFileResult {
|
||||
private String fileId;
|
||||
private String fileName;
|
||||
private String thumbnail;
|
||||
private String fileStatus;
|
||||
private List<YandexSearchResponse.ImageResult> images;
|
||||
private int page;
|
||||
private int pageSize;
|
||||
private int totalResults;
|
||||
private int totalPages;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package ru.soune.nocopy.dto.search;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Builder
|
||||
@Data
|
||||
public class GlobalSearchStartRequest {
|
||||
private String searchType;
|
||||
|
||||
private List<String> fileIds;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package ru.soune.nocopy.dto.search;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GlobalSearchStartResponse {
|
||||
private String taskId;
|
||||
|
||||
private String status;
|
||||
|
||||
private Integer totalFiles;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package ru.soune.nocopy.dto.search;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GlobalSearchStatisticsRequest {
|
||||
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
@JsonProperty("limit")
|
||||
private Integer limit = 10;
|
||||
|
||||
@JsonProperty("days")
|
||||
private Integer days;
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package ru.soune.nocopy.dto.search;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.search.GlobalSearchTask;
|
||||
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class GlobalSearchStatisticsResponse {
|
||||
|
||||
@JsonProperty("total_searches")
|
||||
private long totalSearches;
|
||||
|
||||
@JsonProperty("searches_by_status")
|
||||
private StatusCountDto searchesByStatus;
|
||||
|
||||
@JsonProperty("recent_searches")
|
||||
private List<SearchStatDto> recentSearches;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public static class StatusCountDto {
|
||||
@JsonProperty("processing")
|
||||
private long processing;
|
||||
|
||||
@JsonProperty("completed")
|
||||
private long completed;
|
||||
|
||||
@JsonProperty("failed")
|
||||
private long failed;
|
||||
|
||||
@JsonProperty("total")
|
||||
private long total;
|
||||
}
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public static class SearchStatDto {
|
||||
@JsonProperty("task_id")
|
||||
private String taskId;
|
||||
|
||||
@JsonProperty("search_type")
|
||||
private String searchType;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("total_files")
|
||||
private Integer totalFiles;
|
||||
|
||||
@JsonProperty("violations_found")
|
||||
private long violationsFound;
|
||||
|
||||
@JsonProperty("created_at")
|
||||
private String createdAt;
|
||||
|
||||
@JsonProperty("duration_seconds")
|
||||
private Long durationSeconds;
|
||||
|
||||
@JsonProperty("file_ids")
|
||||
private List<String> fileIds;
|
||||
|
||||
public static SearchStatDto fromEntity(GlobalSearchTask task, long violationsCount, List<String> fileIds ) {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
Long duration = null;
|
||||
if (task.getUpdatedAt() != null && task.getCreatedAt() != null) {
|
||||
duration = java.time.Duration.between(task.getCreatedAt(), task.getUpdatedAt()).getSeconds();
|
||||
}
|
||||
|
||||
return SearchStatDto.builder()
|
||||
.taskId(task.getTaskId())
|
||||
.searchType(task.getSearchType())
|
||||
.status(task.getStatus())
|
||||
.totalFiles(task.getTotalFiles())
|
||||
.violationsFound(violationsCount)
|
||||
.fileIds(fileIds)
|
||||
.createdAt(task.getCreatedAt() != null ? task.getCreatedAt().format(formatter) : null)
|
||||
.durationSeconds(duration)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package ru.soune.nocopy.dto.search;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class GlobalSearchStatusResponse {
|
||||
private String taskId;
|
||||
|
||||
private String status;
|
||||
|
||||
private String searchType;
|
||||
|
||||
private Integer progress;
|
||||
|
||||
private List<GlobalSearchFileResult> results;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package ru.soune.nocopy.dto.search.config;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
public class SearchSettingsDto {
|
||||
private Map<String, Boolean> engines;
|
||||
private Boolean proxyEnabled;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffDTO {
|
||||
private Long id;
|
||||
private String type;
|
||||
private String name;
|
||||
private double price;
|
||||
private int tokens;
|
||||
private int maxFilesCount;
|
||||
private Long diskSize;
|
||||
private Long maxUsers;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
public class TariffInfoDTO {
|
||||
private String id;
|
||||
private String status;
|
||||
private LocalDateTime startTariff;
|
||||
private LocalDateTime endTariff;
|
||||
private Long tariffId;
|
||||
private String tariffName;
|
||||
private Integer tokens;
|
||||
private Long maxFileOnDisk;
|
||||
private Long currentFileOnDisk;
|
||||
private Integer currentFileCounts;
|
||||
private Integer maxFileCounts;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffInfoRequest {
|
||||
private String id;
|
||||
|
||||
@NotNull(message = "Action is required")
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("start_tariff")
|
||||
private LocalDateTime startTariff;
|
||||
|
||||
@JsonProperty("end_tariff")
|
||||
private LocalDateTime endTariff;
|
||||
|
||||
@JsonProperty("tariff_id")
|
||||
private Long tariffId;
|
||||
|
||||
@JsonProperty("tariff_type")
|
||||
private String tariffType;
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffInfoResponse {
|
||||
@JsonProperty("id")
|
||||
private String id;
|
||||
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
@JsonProperty("start_tariff")
|
||||
private LocalDateTime startTariff;
|
||||
|
||||
@JsonProperty("end_tariff")
|
||||
private LocalDateTime endTariff;
|
||||
|
||||
@JsonProperty("tariff_id")
|
||||
private Long tariffId;
|
||||
|
||||
@JsonProperty("tariff_name")
|
||||
private String tariffName;
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TariffRequest {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
@NotBlank
|
||||
@JsonProperty("type")
|
||||
private String type;
|
||||
|
||||
@NotNull
|
||||
@NotBlank
|
||||
@JsonProperty("tariff_name")
|
||||
private String name;
|
||||
|
||||
@Min(value = 0, message = "Price cannot be negative")
|
||||
@JsonProperty("tariff_price")
|
||||
private double price;
|
||||
|
||||
@Min(value = 0, message = "Tokens must be at least 0")
|
||||
@JsonProperty("tariff_tokens")
|
||||
private int tokens;
|
||||
|
||||
@Min(value = 0, message = "Max files count must be at least 0")
|
||||
@JsonProperty("max_files")
|
||||
private int maxFilesCount;
|
||||
|
||||
@Min(value = 0, message = "Disk size must be at least 0")
|
||||
@JsonProperty("disk_size")
|
||||
private int diskSize;
|
||||
|
||||
@Min(value = 0, message = "Max users must be at least 0")
|
||||
@JsonProperty("max_users")
|
||||
private int maxUsers;
|
||||
|
||||
@JsonProperty("action")
|
||||
private String action;
|
||||
|
||||
@JsonProperty("user_token")
|
||||
private String userToken;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package ru.soune.nocopy.dto.tarriff;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class TariffResponse {
|
||||
private String tariffName;
|
||||
private String tariffType;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user