From b7c027015c0fbac417b74f6c74ba52ce1f5d3383 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Tue, 28 Sep 2021 10:30:45 +0000 Subject: [PATCH 01/25] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 769edbf..7b79dd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ COPY database /var/www/database COPY composer-prod.* /var/www/ -RUN composer clearcache && COMPOSER=composer-prod.json composer update --no-scripts +RUN composer clearcache && COMPOSER=composer-prod.json composer install --no-scripts COPY . /var/www From 4c699ffdb093d4ebdf126711c56596942b3a9ff9 Mon Sep 17 00:00:00 2001 From: azizi Date: Thu, 30 Sep 2021 16:42:54 +0000 Subject: [PATCH 02/25] Update '.gitattributes' --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 967315d..dbb821a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ *.scss linguist-vendored *.js linguist-vendored CHANGELOG.md export-ignore + From 28f7d12a8eb80c27ef32a430cf4729b966aba9ab Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 6 Oct 2021 18:05:21 +0000 Subject: [PATCH 03/25] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b79dd9..b2046a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM dfs1368/laravel-php-fpm:7.4 +FROM dfs1368/laravel-php-fpm:7.4.1 WORKDIR /var/www From 153b049f32a6e853cc44998c42e52ab0417ad67b Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 6 Oct 2021 18:25:59 +0000 Subject: [PATCH 04/25] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2046a8..7b79dd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM dfs1368/laravel-php-fpm:7.4.1 +FROM dfs1368/laravel-php-fpm:7.4 WORKDIR /var/www From 3e4618b8f6378d89ecea62d98075fdaba30affdc Mon Sep 17 00:00:00 2001 From: azizi Date: Tue, 12 Oct 2021 15:04:55 +0000 Subject: [PATCH 05/25] Update '.gitignore' --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd1ded0..978a758 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ /development/ # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,laravel,vuejs,phpstorm -# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs,phpstorm +# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs, phpstorm composer-prod.json ### Laravel ### From 67d77176533f7c2129c7c92ad629333ff471c58d Mon Sep 17 00:00:00 2001 From: azizi Date: Mon, 15 Nov 2021 14:28:45 +0000 Subject: [PATCH 06/25] Update 'Jenkinsfile' --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4dbea50..781bc84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,6 @@ pipeline { node { label 'willa' } - } stages { stage('build') { From 5c6c919ba8b1d019b9d1b3053ab04c9519964c1e Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 17:19:22 +0330 Subject: [PATCH 07/25] fix --- .drone.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2193f47..0e372da 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,23 +2,28 @@ kind: pipeline type: exec name: default +settings: + sh_key: + from_secret: id-rsa + steps: -- name: build - commands: - - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" - - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker + - name: build_production + commands: + - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" + - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker + settiong -- name: deploy - commands: - - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d - - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine service cron start - - docker exec willaengine php artisan config:cache - - docker exec willaengine php artisan route:cache + - name: deploy_production + commands: + - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d + - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" + - docker exec willaengine service cron start + - docker exec willaengine php artisan config:cache + - docker exec willaengine php artisan route:cache trigger: branch: - - master + - master environment: - IMAGE_NAME=willaengine From 645852a6d6d64632ca22b1002b5613f60a4fcd20 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 17:20:24 +0330 Subject: [PATCH 08/25] drone --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0e372da..56d0908 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,6 @@ steps: commands: - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker - settiong - name: deploy_production commands: From cbe5c3dd0ccdbdcdb2dc0a528b9833d04f765eb3 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 17:28:10 +0330 Subject: [PATCH 09/25] drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 56d0908..5510cd4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: default settings: sh_key: - from_secret: id-rsa + from_secret: /home/administrator/.ssh/id_rsa steps: - name: build_production From 5254a98f0b4247c4810796556b76b8c9c586f2f6 Mon Sep 17 00:00:00 2001 From: farid Date: Mon, 28 Mar 2022 09:03:27 +0430 Subject: [PATCH 10/25] fix: remove cron command from drone file --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4037b2a..d65bb61 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,6 @@ steps: commands: - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine service cron start - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache when: From 307e2eaf6ffb59eff47d0913c27dcc574b8fef8b Mon Sep 17 00:00:00 2001 From: farid Date: Mon, 28 Mar 2022 20:13:21 +0430 Subject: [PATCH 11/25] feat: add worker file --- worker.conf | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 worker.conf diff --git a/worker.conf b/worker.conf new file mode 100644 index 0000000..fbd319c --- /dev/null +++ b/worker.conf @@ -0,0 +1,28 @@ +[supervisord] +nodaemon=true +user = root +[supervisorctl] +[inet_http_server] +port = 127.0.0.1:9001 +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[program:scheduler] +process_name=%(program_name)s_%(process_num)02d +command=/bin/sh -c "while [ true ]; do (php /var/www/html/artisan schedule:run --verbose --no-interaction &); sleep 60; done" +autostart=true +autorestart=true +numprocs=1 +user=www-data +redirect_stderr=true +stdout_logfile=/var/log/supervisor/scheduler.log + +# [program:check-sms-status] +# command=php /var/www/html/artisan queue:work redis --queue=check-sms-status --tries=3 +# process_name=%(program_name)s_%(process_num)02d +# autostart=true +# autorestart=true +# user=www-data +# numprocs=3 +# redirect_stderr=true +# stdout_logfile=/var/log/supervisor/sms-status.log From 1acc9d3cafe59de60e25d390be9205703132ff27 Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Mon, 11 Apr 2022 15:09:08 +0430 Subject: [PATCH 12/25] add drone --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 4037b2a..2a10bb9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,6 +18,7 @@ steps: - docker exec willaengine service cron start - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache + - docker exec willaengine php artisan migrate --path=vendor/wm/lms/database/migrations --force when: branch: - master From 48afbc1b0a0dc9a2f3aa75e3cc228fb5f37b770e Mon Sep 17 00:00:00 2001 From: Ali Qasemi Date: Mon, 11 Apr 2022 15:11:10 +0430 Subject: [PATCH 13/25] delete worker conf --- worker.conf | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 worker.conf diff --git a/worker.conf b/worker.conf deleted file mode 100644 index b27ee62..0000000 --- a/worker.conf +++ /dev/null @@ -1,41 +0,0 @@ -[supervisord] -nodaemon=true -user = root -[supervisorctl] -[inet_http_server] -port = 127.0.0.1:9001 -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[program:scheduler] -process_name=%(program_name)s_%(process_num)02d -command=/bin/sh -c "while [ true ]; do (php /var/www/html/artisan schedule:run --verbose --no-interaction &); sleep 60; done" -autostart=true -autorestart=true -numprocs=1 -user=www-data -redirect_stderr=true -stdout_logfile=/var/log/supervisor/scheduler.log - -[program:change-store-order-status] -command=php /var/www/html/artisan queue:work redis --queue=change_to_successful_store_order --tries=3 -process_name=%(program_name)s_%(process_num)02d -autostart=true -autorestart=true -user=www-data -numprocs=3 -redirect_stderr=true -stdout_logfile=/var/log/supervisor/sms-status.log - - - -# [program:check-sms-status] -# command=php /var/www/html/artisan queue:work redis --queue=check-sms-status --tries=3 -# process_name=%(program_name)s_%(process_num)02d -# autostart=true -# autorestart=true -# user=www-data -# numprocs=3 -# redirect_stderr=true -# stdout_logfile=/var/log/supervisor/sms-status.log - From a0570fa149b410e25ecf1d31274e6ed9224211f8 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Mon, 11 Apr 2022 10:50:05 +0000 Subject: [PATCH 14/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 45688ef..14491c7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache - - docker exec willaengine php artisan migrate --path=vendor/wm/lms/database/migrations --force + - docker network connect nginx_default willaengine when: branch: - master From 23ef28994c983bbf639b9326919640202a9bf49f Mon Sep 17 00:00:00 2001 From: saeid Date: Tue, 31 May 2022 12:48:59 +0430 Subject: [PATCH 15/25] fix: add global seeder --- database/seeds/DatabaseSeeder.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 018ff10..f0de38d 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -12,15 +12,12 @@ class DatabaseSeeder extends Seeder */ public function run() { - $this->call(ModuleSeeder::class); - $this->call(CategorySeeder::class); - $this->call(BusinessSeeder::class); - $this->call(UserSeeder::class); - $this->call(CitySeeder::class); - $this->call(DistrictSeeder::class); - $this->call(DomainSeeder::class); - $this->call(HelpSeeder::class); - $this->call(PermissionCategorySeeder::class); - $this->call(RoleSeeder::class); + $this->call(CoreSeeder::class); + $this->call(CommonSeeder::class); + $this->call(CRMSeeder::class); + $this->call(ProductSeeder::class); + $this->call(StoreSeeder::class); + $this->call(ServiceSeeder::class); + $this->call(FinanceSeeder::class); } } From d4fcb7e2bcd7059ca6b5edee837f5a64c3e25bac Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Wed, 20 Jul 2022 19:54:35 +0430 Subject: [PATCH 16/25] fix --- .drone.yml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index be6df0e..0003d61 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,6 +15,7 @@ steps: commands: - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" + - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer install predis/predis" - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache - docker network connect nginx_default willaengine diff --git a/composer.json b/composer.json index eb36d00..84f24fd 100644 --- a/composer.json +++ b/composer.json @@ -89,7 +89,7 @@ "repositories": [ { "type": "path", - "url": "./modules/crm" + "url": "./modules/wm-crm" }, { "type": "path", From 6001a9abd8cb4053958f6c2f354d1fbb05d5f0c3 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Wed, 20 Jul 2022 19:58:15 +0430 Subject: [PATCH 17/25] fix --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0003d61..74d8436 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ steps: commands: - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer install predis/predis" + - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer require predis/predis" - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache - docker network connect nginx_default willaengine From 2b1487899855d52d85b13cfb5fda1dda94dedd9c Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Wed, 20 Jul 2022 20:07:14 +0430 Subject: [PATCH 18/25] fix --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 74d8436..90f929f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,6 +16,7 @@ steps: - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer require predis/predis" + - docker exec willaengine bash -c "export REDIS_CLIENT=predis" - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache - docker network connect nginx_default willaengine From 8d640032e5cc39357b360135f88086c9eae6de25 Mon Sep 17 00:00:00 2001 From: saeid Date: Thu, 21 Jul 2022 16:46:23 +0430 Subject: [PATCH 19/25] fix --- worker.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worker.conf b/worker.conf index 5bcad9d..03ff324 100644 --- a/worker.conf +++ b/worker.conf @@ -18,13 +18,16 @@ redirect_stderr=true stdout_logfile=/var/log/supervisor/scheduler.log [program:change-store-order-status] -command=php /var/www/html/artisan queue:work redis --queue=change_to_successful_store_order --tries=3 process_name=%(program_name)s_%(process_num)02d +command=php /var/www/html/artisan queue:work redis --queue=change_to_successful_store_order --sleep=3 --tries=3 --max-time=3600 autostart=true autorestart=true +stopasgroup=true +killasgroup=true user=www-data numprocs=3 redirect_stderr=true +stopwaitsecs=3600 stdout_logfile=/var/log/supervisor/change-store-order-status.log From b8a3cf99aaac40808521ddbc0d08ee5863ecbc06 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 21 Jul 2022 17:08:24 +0430 Subject: [PATCH 20/25] fix update drone file --- .drone.yml | 2 -- worker.conf | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 90f929f..be6df0e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,8 +15,6 @@ steps: commands: - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer require predis/predis" - - docker exec willaengine bash -c "export REDIS_CLIENT=predis" - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache - docker network connect nginx_default willaengine diff --git a/worker.conf b/worker.conf index 03ff324..7381088 100644 --- a/worker.conf +++ b/worker.conf @@ -31,7 +31,7 @@ stopwaitsecs=3600 stdout_logfile=/var/log/supervisor/change-store-order-status.log -[program:change-store-order-status] +[program:create-store-product] command=php /var/www/html/artisan queue:work redis --queue=create_store_product --tries=3 process_name=%(program_name)s_%(process_num)02d autostart=true From b2ff2ce4ce5060f28c680a28036f7904baaf1d07 Mon Sep 17 00:00:00 2001 From: saeid Date: Sat, 23 Jul 2022 13:41:12 +0430 Subject: [PATCH 21/25] fix --- app/Exceptions/Handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index ee4413b..b614487 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -61,7 +61,7 @@ class Handler extends ExceptionHandler } elseif ($exception instanceof HasRelationException) { return response()->json(Responser::error([$exception->getMessage()]), 422); } elseif ($this->isHttpException($exception)) { - if ($exception->getStatusCode() == 404) { + if ($exception->getStatusCode() == 404 and in_array("web",$request->route()->middleware())) { return response()->view('webBuilder::errors.404', [], 404); } } From d7f86993dc611b394159f650245c86a448a8efb8 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Mon, 25 Jul 2022 11:32:38 +0430 Subject: [PATCH 22/25] fix --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index be6df0e..680c8d3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,7 +41,7 @@ steps: # - docker exec willaengine-staging_php service supervisor start # - docker exec willaengine-staging_php bash -c "php artisan db:seed --class=CalculationMethodSeeder" # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations - # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations + - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/store/database/migrations when: branch: - dev From dea3de3b0cafe86c4045782f3d4c69634decae8d Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Mon, 25 Jul 2022 17:42:38 +0430 Subject: [PATCH 23/25] fix --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 680c8d3..948ba33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,7 @@ steps: - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache + - docker exec willaengine php artisan migrate --path=vendor/wm/store/database/migrations --force - docker network connect nginx_default willaengine when: branch: From 35bf5d4db6c7144786dce98aada94fbf8f7b3fd8 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Mon, 25 Jul 2022 18:43:53 +0430 Subject: [PATCH 24/25] fix --- worker.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker.conf b/worker.conf index 7381088..133dde4 100644 --- a/worker.conf +++ b/worker.conf @@ -39,7 +39,7 @@ autorestart=true user=www-data numprocs=3 redirect_stderr=true -stdout_logfile=/var/log/supervisor/sms-status.log +stdout_logfile=/var/log/supervisor/create-store-product.log # [program:check-sms-status] From e7a2633523c0873b0ccadc4fc418ffc2322e148f Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Mon, 25 Jul 2022 19:29:07 +0430 Subject: [PATCH 25/25] fix --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 948ba33..92c432d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,6 +15,7 @@ steps: commands: - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" + - docker exec willaengine_worker bash -c "COMPOSER=composer-prod.json composer update" - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache - docker exec willaengine php artisan migrate --path=vendor/wm/store/database/migrations --force