From 06d132050f40d9403af62c2efb8fffa7d9e73c74 Mon Sep 17 00:00:00 2001 From: Eugene Zadyra Date: Wed, 29 Nov 2023 00:42:08 +0100 Subject: [PATCH] #50 fixed 409 Error: HTTP/1.1 409 Conflict --- .drone.yml | 37 +++++++++++--------- api/src/main/scala/com/lbs/api/ApiBase.scala | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6d6dd98..68940d5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,23 +43,6 @@ steps: branch: master event: push - - name: deploy_and_restart - image: appleboy/drone-ssh - settings: - host: - from_secret: digitalocean_host - username: - from_secret: digitalocean_user - key: - from_secret: digitalocean_key - script: - - service luxmed-bot stop - - (cd ~/luxmed-bot && rm -f docker-compose.yml && wget https://raw.githubusercontent.com/dyrkin/luxmed-booking-service/master/docker/docker-compose.yml) - - service luxmed-bot start - when: - branch: master - event: push - --- kind: pipeline @@ -108,3 +91,23 @@ steps: when: branch: master event: push + + - name: deploy_and_restart + image: appleboy/drone-ssh + settings: + host: + from_secret: digitalocean_host + username: + from_secret: digitalocean_user + key: + from_secret: digitalocean_key + script: + - cd ~/luxmed-bot + - docker-compose down || true + - rm -f docker-compose.yml + - wget https://raw.githubusercontent.com/dyrkin/luxmed-booking-service/master/docker/docker-compose-arm64.yml -O docker-compose.yml + - docker-compose pull + - docker-compose up -d + when: + branch: master + event: push \ No newline at end of file diff --git a/api/src/main/scala/com/lbs/api/ApiBase.scala b/api/src/main/scala/com/lbs/api/ApiBase.scala index 86b5a65..8f58927 100644 --- a/api/src/main/scala/com/lbs/api/ApiBase.scala +++ b/api/src/main/scala/com/lbs/api/ApiBase.scala @@ -17,7 +17,7 @@ trait ApiBase { Map( Host -> "portalpacjenta.luxmed.pl", Origin -> "https://portalpacjenta.luxmed.pl", - `Custom-User-Agent` -> "PatientPortal; 4.21.0; 12345678-3F3C-2C63-375B-BBA12392F44C; iOS; 16.3.0; iPhone14,5", + `Custom-User-Agent` -> "PatientPortal; 4.29.0; 12345678-3F3C-2C63-375B-BBA12392F44C; iOS; 17.1.1; iPhone14,5", `User-Agent` -> "Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148", Accept -> "application/json, text/plain, */*", `Accept-Encoding` -> "gzip, deflate, br",