Update codebase

This commit is contained in:
Hamza-Ayed
2026-08-09 16:56:13 +03:00
parent 95e2e4f35d
commit b64debaa88
1058 changed files with 164327 additions and 113928 deletions
+53 -15
View File
@@ -1,13 +1,13 @@
# ============================================================
# Siro Docker Environment Variables
# Tripz Docker Environment Variables
# ============================================================
# --- 1. Core Settings ---
PHP_VERSION=8.2
HTTP_PORT=8183
APP_DOMAIN=api.tripz-egypt.com
APP_ISSUER=SiroApp
APP_DEBUG=true
APP_ISSUER=TripzApp
APP_DEBUG=false
APP_COUNTRY=Jordan
APP_CURRENCY=JOD
@@ -46,6 +46,14 @@ DB_TRANSIT_NAME=transitDB
DB_TRANSIT_USER=transitUser
DB_TRANSIT_PASS=Tr4ns!t_Tr!pz_P@ss2026
# قاعدة طلبات الطعام — منفصلة عن بقية القواعد (انظر mysql/init/06-foodDB.sql)
DB_FOOD_HOST=mysql
DB_FOOD_PORT=3306
DB_FOOD_NAME=tripz_food
DB_FOOD_USER=tripz_food
# ⚠️ يجب أن تطابق mysql/init/06-foodDB.sql — غيّرها قبل الإقلاع الأول.
DB_FOOD_PASS=CHANGE_ME_STRONG_PASSWORD
# --- 3. Redis ---
REDIS_HOST=redis
REDIS_PORT=6379
@@ -62,6 +70,13 @@ RIDE_SOCKET_URL=http://socket_passenger:3031
# وهو داخل حاوية socket_driver يشير لنفسها، فلا يصل الراكب أي تحديث موقع.
PASSENGER_SOCKET_INTERNAL_URL=http://socket_passenger:3031
# --- 4.5 Host Socket Ports (على سيرفر مشترك مع نسخ أخرى) ---
# siro يحجز: 12020/13030/14040 · intaleq يحجز: 12032/13032
# تربز يعمل على المنافذ التالية — لا تغيّرها إلا بعد التحقق من ss -tlnp
DRIVER_SOCKET_PORT=12022
PASSENGER_SOCKET_PORT=13033
FOOD_SOCKET_PORT=14042
# --- 5. External Sockets & URLs ---
LOCATION_SOCKET_URL=http://socket_driver:2021
PASSENGER_SOCKET_URL=http://socket_passenger:3031
@@ -95,6 +110,20 @@ WALLET_SECRET_KEY_PATH=/keys/.secret_key_pay
ENCRYPTION_KEY_PATH=/keys/.enckey
PAYMENT_INTERNAL_KEY_PATH=/keys/.internal_socket_key
# --- 6.b خادم TURN (مكالمات الصوت: الرحلات + توصيل الطعام) ---
# ⚠️ منافذ TURN مختلفة عن نسخة سيرو على نفس السيرفر:
# سيرو: 3478 / relay 49160–49300 · تربز هنا: 3479 / relay 49301–49400
TURN_HOST=turn.api.tripz-egypt.com
TURN_EXTERNAL_IP=
TURN_REALM=api.tripz-egypt.com
TURN_PORT=3479
# لا تجعلها true إلا بعد تركيب شهادة TLS فعلياً على coturn (انظر turnserver.conf)
TURN_TLS_ENABLED=false
TURN_TLS_PORT=5350
TURN_SECRET_PATH=/keys/turn_secret
TURN_STATIC_AUTH_SECRET=
TURN_CREDENTIAL_TTL=43200
# --- 7. Third-Party APIs ---
GEMINI_API_KEY=AIzaSyDHp0yXCGWqnd4ynlCCWzDz9Un1EJOKeW8
SMS_API_ENDPOINT=https://sms.kazumi.me/api/sms/send-sms
@@ -122,28 +151,37 @@ APP_SIGNATURE_SERVICE_IOS=com.example.serviceIntaleq
# --- 9. Nabeh & Transit & Commisions ---
NABEH_EMAIL=hamza@test.com
NABEH_PASSWORD=Test1234!
NABEH_API_KEY=siro_integration_key_789
NABEH_API_KEY=tripz_integration_key_789
NABEH_OTP_APP_KEY=f3a9e7c1b8d5f2a4c6e9b1d3f5a7c9e1b3d5f7a9c1e3b5d7f9a1c3e5b7d9f1
VITE_API_BASE=https://jordan-siro.intaleqapp.com/backend/transit
VITE_API_BASE=https://api.tripz-egypt.com/backend/transit
TRANSIT_STUDENT_ID_KEY=zH34tS6xMMSamq6uqv1WZWlDrmjAbnMk
TRANSIT_ADMIN_ORIGINS=https://transit.siromove.com,https://admin.siromove.com
APP_DEEP_LINK_BASE=https://siromove.com/driver/transit-activate
TRANSIT_ADMIN_ORIGINS=https://transit.tripz-egypt.com,https://admin.tripz-egypt.com
APP_DEEP_LINK_BASE=https://api.tripz-egypt.com/driver/transit-activate
SIRO_COMMISSION_JO=0.15
SIRO_COMMISSION_SY=0.12
SIRO_COMMISSION_EG=0.10
SIRO_COMMISSION_IQ=0.14
TRIPZ_COMMISSION_JO=0.15
TRIPZ_COMMISSION_SY=0.12
TRIPZ_COMMISSION_EG=0.10
TRIPZ_COMMISSION_IQ=0.14
# --- 9.b Food Orders (طلبات الطعام) ---
FOOD_ENABLED=true
FOOD_SOCKET_URL=http://socket_food:4041
FOOD_SOCKET_PORT=14042
FOOD_MERCHANT_ORIGINS=https://food-merchant.tripz-egypt.com,https://admin.tripz-egypt.com
FOOD_COMMISSION_PERCENT=15
FOOD_DELIVERY_BASE_FEE=
FOOD_MAX_ACTIVE_ORDERS_PER_USER=3
# --- 10. Admin & Access ---
ADMIN_TOOL_IPS=92.241.36.211,92.241.36.165,92.241.37.3
ALLOWED_UPLOAD_HOST=siromove.com
ALLOWED_TESTER_EMAILS=driver_tester@siromove.com,passenger_tester@siromove.com
ALLOWED_UPLOAD_HOST=api.tripz-egypt.com
ALLOWED_TESTER_EMAILS=driver_tester@tripz-egypt.com,passenger_tester@tripz-egypt.com
# ⚠️ لازم يغطّي كل قيمة في القسم 4/5 أعلاه: isAllowedSocketUrl() تعمل
# str_starts_with، وأي عنوان غير مغطّى تُسقَط رسائله (بلا أي أثر قبل هذا الإصلاح).
# أسماء حاويات Docker إجبارية هنا — لا تحذفها واستبدلها بالـ IP فقط.
ALLOWED_SOCKET_URLS=http://socket_driver,http://socket_passenger,http://nginx,http://188.68.36.205:2021,http://188.68.36.205:3031,https://location.intaleq.xyz
ALLOWED_ORIGIN=https://siromove.com
ALLOWED_SOCKET_URLS=http://socket_driver,http://socket_passenger,http://socket_food,http://nginx
ALLOWED_ORIGIN=https://api.tripz-egypt.com
ADMIN_PHONE_NUMBERS=963992952235,963942542053,962772735902
SERVICE_PHONE1=963952475740
SERVICE_PHONE2=963952475742