diff --git a/backend/.wwebjs_cache/2.3000.1013462610.html b/backend/.wwebjs_cache/2.3000.1013462610.html new file mode 100644 index 000000000..0d6898b1f --- /dev/null +++ b/backend/.wwebjs_cache/2.3000.1013462610.html @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + +WhatsApp Web + + +
WhatsApp
 Protegida com a criptografia de ponta a ponta
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/Dockerfile b/backend/Dockerfile index 0353bb583..e1656deb2 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -24,6 +24,8 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true WORKDIR /usr/src/app COPY package*.json ./ RUN npm install +RUN npm uninstall @types/lodash +RUN npm install @types/lodash@4.17.5 COPY . . RUN npm run build @@ -37,4 +39,4 @@ EXPOSE 3000 ENTRYPOINT ["dumb-init", "--"] CMD dockerize -wait tcp://${DB_HOST}:3306 \ && npx sequelize db:migrate \ - && node dist/server.js \ No newline at end of file + && node dist/server.js diff --git a/backend/package.json b/backend/package.json index 71169fb15..942bea32f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -39,7 +39,7 @@ "sequelize-typescript": "^1.1.0", "socket.io": "^3.0.5", "uuid": "^8.3.2", - "whatsapp-web.js": "^1.23.0", + "whatsapp-web.js": "github:pedroslopez/whatsapp-web.js#webpack-exodus", "yup": "^0.32.8" }, "devDependencies": { diff --git a/backend/src/libs/wbot.ts b/backend/src/libs/wbot.ts index 1b6794f6e..63e05579a 100644 --- a/backend/src/libs/wbot.ts +++ b/backend/src/libs/wbot.ts @@ -44,6 +44,7 @@ export const initWbot = async (whatsapp: Whatsapp): Promise => { } const args:String = process.env.CHROME_ARGS || ""; + const wwebVersion = '2.2407.3'; const wbot: Session = new Client({ session: sessionCfg, @@ -53,7 +54,11 @@ export const initWbot = async (whatsapp: Whatsapp): Promise => { // @ts-ignore browserWSEndpoint: process.env.CHROME_WS || undefined, args: args.split(' ') - } + }, + webVersionCache: { + type: 'remote', + remotePath: `https://raw.githubusercontent.com/wppconnect-team/wa-version/main/html/${wwebVersion}.html`, + }, }); wbot.initialize(); diff --git a/docker-compose.yaml b/docker-compose.yaml index 35266455e..9f969c33b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -48,9 +48,10 @@ services: mysql: image: ${MYSQL_ENGINE:-mariadb}:${MYSQL_VERSION:-10.6} - command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin - volumes: - - ./.docker/data/:/var/lib/mysql + # command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin + # volumes: + # - ./.docker/data/:/var/lib/mysql:rw + user: mysql environment: - MYSQL_DATABASE=${MYSQL_DATABASE:-whaticket} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-strongpassword} diff --git a/frontend/public/android-chrome-192x192.png b/frontend/public/android-chrome-192x192.png index ceef74f09..67b731cd8 100644 Binary files a/frontend/public/android-chrome-192x192.png and b/frontend/public/android-chrome-192x192.png differ diff --git a/frontend/public/apple-touch-icon.png b/frontend/public/apple-touch-icon.png index 758b8c85e..53a5d9a92 100644 Binary files a/frontend/public/apple-touch-icon.png and b/frontend/public/apple-touch-icon.png differ diff --git a/frontend/public/favicon-16x16.png b/frontend/public/favicon-16x16.png index 1de1e2e1f..b91f1387a 100644 Binary files a/frontend/public/favicon-16x16.png and b/frontend/public/favicon-16x16.png differ diff --git a/frontend/public/favicon-32x32.png b/frontend/public/favicon-32x32.png index 1c174e620..80d32e153 100644 Binary files a/frontend/public/favicon-32x32.png and b/frontend/public/favicon-32x32.png differ diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico index d58ccc44c..80d32e153 100644 Binary files a/frontend/public/favicon.ico and b/frontend/public/favicon.ico differ diff --git a/frontend/public/index.html b/frontend/public/index.html index a65e48663..d9761be7e 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -1,7 +1,7 @@ - + - WhaTicket + WhaTicket - FJ Sistemas {
- - + + avatar {i18n.t("login.title")} diff --git a/images/chat2.png b/images/chat2.png deleted file mode 100644 index f53d2d5ec..000000000 Binary files a/images/chat2.png and /dev/null differ diff --git a/images/chat3.png b/images/chat3.png deleted file mode 100644 index 9298dbe36..000000000 Binary files a/images/chat3.png and /dev/null differ diff --git a/images/contacts1.png b/images/contacts1.png deleted file mode 100644 index dac8742ac..000000000 Binary files a/images/contacts1.png and /dev/null differ diff --git a/images/multiple-whatsapps2.png b/images/multiple-whatsapps2.png deleted file mode 100644 index 807c9779d..000000000 Binary files a/images/multiple-whatsapps2.png and /dev/null differ diff --git a/images/whaticket-queues.gif b/images/whaticket-queues.gif deleted file mode 100644 index a091333a4..000000000 Binary files a/images/whaticket-queues.gif and /dev/null differ