Skip to content

Commit 70a2c18

Browse files
DavidsonGomesDavidsonGomes
committed
Merge branch 'release/2.3.2'
2 parents 9cdb897 + b8953f1 commit 70a2c18

File tree

13 files changed

+293
-131
lines changed

13 files changed

+293
-131
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
# 2.3.1 (develop)
1+
# 2.3.2 (2025-09-02)
2+
3+
### Features
4+
5+
* Add support to socks proxy
6+
7+
### Fixed
8+
9+
* Added key id into webhook payload in n8n service
10+
* Enhance RabbitMQ controller with improved connection management and shutdown procedures
11+
* Convert outgoing images to JPEG before sending with Chatwoot
12+
* Update baileys dependency to version 6.7.19
13+
14+
# 2.3.1 (2025-07-29)
215

316
### Feature
417

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div align="center">
44

5-
[![Docker Image (https://img.shields.io/badge/Docker-Image-blue)](https://hub.docker.com/r/evoapicloud/evolution-api)]
5+
[![Docker Image](https://img.shields.io/badge/Docker-image-blue)](https://hub.docker.com/r/evoapicloud/evolution-api)
66
[![Whatsapp Group](https://img.shields.io/badge/Group-WhatsApp-%2322BC18)](https://evolution-api.com/whatsapp)
77
[![Discord Community](https://img.shields.io/badge/Discord-Community-blue)](https://evolution-api.com/discord)
88
[![Postman Collection](https://img.shields.io/badge/Postman-Collection-orange)](https://evolution-api.com/postman)

‎docker-compose.yaml‎

Lines changed: 38 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,75 @@
1+
version: "3.8"
2+
13
services:
2-
34
api:
45
container_name: evolution_api
56
image: evoapicloud/evolution-api:latest
67
restart: always
78
depends_on:
89
- redis
9-
- postgres
10+
- evolution-postgres
1011
ports:
11-
- 8080:8080
12+
- "127.0.0.1:8080:8080"
1213
volumes:
1314
- evolution_instances:/evolution/instances
1415
networks:
1516
- evolution-net
17+
- dokploy-network
1618
env_file:
1719
- .env
1820
expose:
19-
- 8080
21+
- "8080"
2022

2123
redis:
24+
container_name: evolution_redis
2225
image: redis:latest
23-
networks:
24-
- evolution-net
25-
container_name: redis
26+
restart: always
2627
command: >
2728
redis-server --port 6379 --appendonly yes
2829
volumes:
2930
- evolution_redis:/data
30-
ports:
31-
- 6379:6379
31+
networks:
32+
evolution-net:
33+
aliases:
34+
- evolution-redis
35+
dokploy-network:
36+
aliases:
37+
- evolution-redis
38+
expose:
39+
- "6379"
3240

33-
postgres:
34-
container_name: postgres
41+
evolution-postgres:
42+
container_name: evolution_postgres
3543
image: postgres:15
36-
networks:
37-
- evolution-net
38-
command: [
39-
"postgres",
40-
"-c", "max_connections=200",
41-
"-c", "listen_addresses=*",
42-
"-c", "shared_buffers=256MB",
43-
"-c", "effective_cache_size=1GB",
44-
"-c", "work_mem=4MB"
45-
]
4644
restart: always
47-
ports:
48-
- 5432:5432
45+
env_file:
46+
- .env
47+
command:
48+
- postgres
49+
- -c
50+
- max_connections=1000
51+
- -c
52+
- listen_addresses=*
4953
environment:
50-
- POSTGRES_USER=user
51-
- POSTGRES_PASSWORD=pass
52-
- POSTGRES_DB=evolution_db
53-
- POSTGRES_HOST_AUTH_METHOD=trust
54+
- POSTGRES_DB=${POSTGRES_DATABASE}
55+
- POSTGRES_USER=${POSTGRES_USERNAME}
56+
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
5457
volumes:
55-
- postgres_data:/var/lib/postgresql/data
56-
57-
# pgbouncer:
58-
# image: edoburu/pgbouncer:latest
59-
# environment:
60-
# DB_HOST: postgres
61-
# DB_USER: user
62-
# DB_PASSWORD: pass
63-
# POOL_MODE: transaction
64-
# AUTH_TYPE: trust
65-
# MAX_CLIENT_CONN: 1000
66-
# DEFAULT_POOL_SIZE: 25
67-
# depends_on:
68-
# - postgres
69-
# ports:
70-
# - "6543:5432"
71-
# networks:
72-
# - evolution-net
58+
- postgres_data:/var/lib/postgresql/data
59+
networks:
60+
- evolution-net
61+
- dokploy-network
62+
expose:
63+
- "5432"
7364

7465
volumes:
7566
evolution_instances:
7667
evolution_redis:
7768
postgres_data:
7869

79-
8070
networks:
8171
evolution-net:
8272
name: evolution-net
8373
driver: bridge
74+
dokploy-network:
75+
external: true

‎package-lock.json‎

Lines changed: 66 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
"sharp": "^0.34.2",
101101
"socket.io": "^4.8.1",
102102
"socket.io-client": "^4.8.1",
103+
"socks-proxy-agent": "^8.0.5",
103104
"swagger-ui-express": "^5.0.1",
104105
"tsup": "^8.3.5"
105106
},

‎prisma/mysql-schema.prisma‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -647,22 +647,22 @@ model IsOnWhatsapp {
647647

648648
model N8n {
649649
id String @id @default(cuid())
650-
enabled Boolean @default(true) @db.Boolean
650+
enabled Boolean @default(true) @db.TinyInt(1)
651651
description String? @db.VarChar(255)
652652
webhookUrl String? @db.VarChar(255)
653653
basicAuthUser String? @db.VarChar(255)
654654
basicAuthPass String? @db.VarChar(255)
655655
expire Int? @default(0) @db.Int
656656
keywordFinish String? @db.VarChar(100)
657-
delayMessage Int? @db.Integer
657+
delayMessage Int? @db.Int
658658
unknownMessage String? @db.VarChar(100)
659659
listeningFromMe Boolean? @default(false)
660660
stopBotFromMe Boolean? @default(false)
661661
keepOpen Boolean? @default(false)
662-
debounceTime Int? @db.Integer
662+
debounceTime Int? @db.Int
663663
ignoreJids Json?
664664
splitMessages Boolean? @default(false)
665-
timePerChar Int? @default(50) @db.Integer
665+
timePerChar Int? @default(50) @db.Int
666666
triggerType TriggerType?
667667
triggerOperator TriggerOperator?
668668
triggerValue String?
@@ -677,15 +677,15 @@ model N8nSetting {
677677
id String @id @default(cuid())
678678
expire Int? @default(0) @db.Int
679679
keywordFinish String? @db.VarChar(100)
680-
delayMessage Int? @db.Integer
680+
delayMessage Int? @db.Int
681681
unknownMessage String? @db.VarChar(100)
682682
listeningFromMe Boolean? @default(false)
683683
stopBotFromMe Boolean? @default(false)
684684
keepOpen Boolean? @default(false)
685-
debounceTime Int? @db.Integer
685+
debounceTime Int? @db.Int
686686
ignoreJids Json?
687687
splitMessages Boolean? @default(false)
688-
timePerChar Int? @default(50) @db.Integer
688+
timePerChar Int? @default(50) @db.Int
689689
createdAt DateTime? @default(now()) @db.Timestamp
690690
updatedAt DateTime @updatedAt @db.Timestamp
691691
Fallback N8n? @relation(fields: [n8nIdFallback], references: [id])
@@ -696,21 +696,21 @@ model N8nSetting {
696696

697697
model Evoai {
698698
id String @id @default(cuid())
699-
enabled Boolean @default(true) @db.Boolean
699+
enabled Boolean @default(true) @db.TinyInt(1)
700700
description String? @db.VarChar(255)
701701
agentUrl String? @db.VarChar(255)
702702
apiKey String? @db.VarChar(255)
703703
expire Int? @default(0) @db.Int
704704
keywordFinish String? @db.VarChar(100)
705-
delayMessage Int? @db.Integer
705+
delayMessage Int? @db.Int
706706
unknownMessage String? @db.VarChar(100)
707707
listeningFromMe Boolean? @default(false)
708708
stopBotFromMe Boolean? @default(false)
709709
keepOpen Boolean? @default(false)
710-
debounceTime Int? @db.Integer
710+
debounceTime Int? @db.Int
711711
ignoreJids Json?
712712
splitMessages Boolean? @default(false)
713-
timePerChar Int? @default(50) @db.Integer
713+
timePerChar Int? @default(50) @db.Int
714714
triggerType TriggerType?
715715
triggerOperator TriggerOperator?
716716
triggerValue String?
@@ -725,15 +725,15 @@ model EvoaiSetting {
725725
id String @id @default(cuid())
726726
expire Int? @default(0) @db.Int
727727
keywordFinish String? @db.VarChar(100)
728-
delayMessage Int? @db.Integer
728+
delayMessage Int? @db.Int
729729
unknownMessage String? @db.VarChar(100)
730730
listeningFromMe Boolean? @default(false)
731731
stopBotFromMe Boolean? @default(false)
732732
keepOpen Boolean? @default(false)
733-
debounceTime Int? @db.Integer
733+
debounceTime Int? @db.Int
734734
ignoreJids Json?
735735
splitMessages Boolean? @default(false)
736-
timePerChar Int? @default(50) @db.Integer
736+
timePerChar Int? @default(50) @db.Int
737737
createdAt DateTime? @default(now()) @db.Timestamp
738738
updatedAt DateTime @updatedAt @db.Timestamp
739739
Fallback Evoai? @relation(fields: [evoaiIdFallback], references: [id])

‎prisma/postgresql-migrations/20250116001415_add_wavoip_token_to_settings_table/migration.sql‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,4 @@ Warnings:
66
*/
77

88
-- AlterTable
9-
DO $$
10-
BEGIN
11-
IF NOT EXISTS (
12-
SELECT 1
13-
FROM information_schema.columns
14-
WHERE table_name = 'Setting'
15-
AND column_name = 'wavoipToken'
16-
) THEN
17-
ALTER TABLE "Setting" ADD COLUMN "wavoipToken" VARCHAR(100);
18-
END IF;
19-
END $$;
9+
ALTER TABLE "Setting" ADD COLUMN IF NOT EXISTS "wavoipToken" VARCHAR(100);

0 commit comments

Comments
 (0)