Compare commits
No commits in common. 'dev' and 'UI.page-editor' have entirely different histories.
dev
...
UI.page-ed
@ -1,53 +0,0 @@
|
|||||||
kind: pipeline
|
|
||||||
type: exec
|
|
||||||
name: default
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: build to production
|
|
||||||
commands:
|
|
||||||
- docker build -t registry.willaspace.com/willaspace/willaengine-test:latest --build-arg COMPOSER_FILE_NAME=composer-prod .
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- master
|
|
||||||
|
|
||||||
- name: deploy to production
|
|
||||||
commands:
|
|
||||||
- cd /apps/willaengine/ ; docker-compose up -d
|
|
||||||
- docker exec willaengine-test bash -c "COMPOSER=composer-prod.json composer update"
|
|
||||||
- docker exec willaengine-test php artisan config:cache
|
|
||||||
- docker exec willaengine-test php artisan route:cache
|
|
||||||
# - docker exec willaengine_worker bash -c "COMPOSER=composer-prod.json composer update"
|
|
||||||
# - docker exec willaengine_worker service supervisor start
|
|
||||||
# - docker network connect nginx_default willaengine
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- master
|
|
||||||
|
|
||||||
|
|
||||||
- name: build to staging
|
|
||||||
commands:
|
|
||||||
- docker build -t registry.willaspace.com/willaspace/willaengine-staging:latest --build-arg COMPOSER_FILE_NAME=composer-staging -f Dockerfile.staging .
|
|
||||||
- docker build -t registry.willaspace.com/willaspace/willaengine-staging-nginx:latest -f Dockerfile.nginx .
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- dev
|
|
||||||
|
|
||||||
- name: deploy to staging
|
|
||||||
commands:
|
|
||||||
- cd /apps/willaengine-staging/ ; docker-compose up -d
|
|
||||||
- docker exec willaengine-staging_php bash -c "COMPOSER=composer-staging.json composer update"
|
|
||||||
- docker exec willaengine-staging_php bash -c "php artisan route:cache"
|
|
||||||
- docker exec willaengine-staging_php bash -c "php artisan config:cache"
|
|
||||||
- docker exec willaengine-staging_worker bash -c "COMPOSER=composer-staging.json composer update"
|
|
||||||
- docker exec willaengine-staging_worker service supervisor start
|
|
||||||
- docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations --force
|
|
||||||
- docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/store/database/migrations --force
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- dev
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
branch:
|
|
||||||
- master
|
|
||||||
- dev
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# rsync script
|
|
||||||
|
|
||||||
git pull origin master
|
|
||||||
|
|
||||||
cd modules
|
|
||||||
for f in *
|
|
||||||
do
|
|
||||||
cd $f && git pull origin master && cd ..
|
|
||||||
done
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
npm install
|
|
||||||
|
|
||||||
rm -r /home/administrator/apps/willaengine/public/js/vue
|
|
||||||
|
|
||||||
npm run prod
|
|
||||||
|
|
||||||
rm -r /home/administrator/apps/nginx/www/willaengine/public/js/vue
|
|
||||||
rm -r /home/administrator/apps/nginx/www/willamall/public/js/vue
|
|
||||||
rm -r /home/administrator/apps/nginx/www/willaarts/public/js/vue
|
|
||||||
|
|
||||||
cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willaengine/public/js/
|
|
||||||
|
|
||||||
cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willamall/public/js/
|
|
||||||
|
|
||||||
cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willaarts/public/js/
|
|
||||||
|
|
||||||
cp /home/administrator/apps/willaengine/public/mix-manifest.json /home/administrator/apps/nginx/www/willaengine/public/
|
|
||||||
|
|
||||||
cp /home/administrator/apps/willaengine/public/mix-manifest.json /home/administrator/apps/nginx/www/willaarts/public/
|
|
||||||
|
|
||||||
|
|
||||||
sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willaarts/public
|
|
||||||
|
|
||||||
sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willamall/public
|
|
||||||
|
|
||||||
sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willaengine
|
|
@ -1,28 +1,23 @@
|
|||||||
FROM willaengine/standard-laravel:7.4
|
FROM dfs1368/laravel-php-fpm:7.4
|
||||||
|
|
||||||
ARG COMPOSER_FILE_NAME=composer
|
WORKDIR /var/www
|
||||||
|
|
||||||
WORKDIR /var/www/html
|
RUN apt install -y sendmail libpng-dev
|
||||||
|
RUN docker-php-ext-install gd
|
||||||
|
RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
|
||||||
|
|
||||||
#####################################
|
COPY database /var/www/database
|
||||||
# Composer:
|
COPY composer.* /var/www/
|
||||||
#####################################
|
|
||||||
|
|
||||||
COPY database /var/www/html/database
|
RUN composer clearcache && composer update --no-scripts
|
||||||
|
|
||||||
COPY $COMPOSER_FILE_NAME.* /var/www/html/
|
COPY . /var/www
|
||||||
|
|
||||||
RUN COMPOSER=$COMPOSER_FILE_NAME.json composer install --no-scripts
|
|
||||||
|
|
||||||
COPY . /var/www/html
|
|
||||||
|
|
||||||
RUN chown -R www-data:www-data \
|
RUN chown -R www-data:www-data \
|
||||||
/var/www/html/public \
|
/var/www/public \
|
||||||
/var/www/html/storage \
|
/var/www/storage \
|
||||||
/var/www/html/bootstrap/cache \
|
/var/www/bootstrap/cache
|
||||||
/var/www/.ssh \
|
|
||||||
/var/www/html/storage/letsencrypt && \
|
|
||||||
chmod 755 /var/www/html/storage/letsencrypt/Bash/auth-hook.sh
|
|
||||||
|
|
||||||
|
RUN mv .env.prod .env
|
||||||
|
|
||||||
RUN php artisan morphmap:cache
|
RUN php artisan optimize
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
FROM nginx:1.21.1
|
|
||||||
|
|
||||||
COPY public /var/www/html/public
|
|
@ -1,6 +0,0 @@
|
|||||||
FROM fsaravi/standard-laravel:7.4
|
|
||||||
|
|
||||||
WORKDIR /var/www/html
|
|
||||||
RUN php artisan morphmap:cache
|
|
||||||
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent {
|
|
||||||
node {
|
|
||||||
label 'willa'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stages {
|
|
||||||
stage('build') {
|
|
||||||
when {
|
|
||||||
branch 'master'
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
sh 'cd /home/administrator/apps/${IMAGE_NAME}/;docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest .'
|
|
||||||
sh 'cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('deploy to production') {
|
|
||||||
when {
|
|
||||||
branch 'master'
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
sh 'cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d'
|
|
||||||
sh 'docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update"'
|
|
||||||
sh 'docker exec willaengine service cron start'
|
|
||||||
sh 'docker exec willaengine php artisan config:cache'
|
|
||||||
sh 'docker exec willaengine php artisan route:cache'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('deploy to staging') {
|
|
||||||
when {
|
|
||||||
branch 'dev'
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
sh 'echo ${IMAGE_NAME}-staging comming soon ...'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
IMAGE_NAME = 'willaengine'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use WM\Core\Models\Business;
|
|
||||||
use WM\Core\Models\User;
|
|
||||||
|
|
||||||
class UserChangeInformation extends Command
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The name and signature of the console command.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $signature = 'transport:user';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The console command description.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $description = 'transport users';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new command instance.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
private function firstNameLengthUpdate(User $user)
|
|
||||||
{
|
|
||||||
$fistName = $user->first_name;
|
|
||||||
|
|
||||||
$fistNameLength = strlen(utf8_decode($fistName));
|
|
||||||
|
|
||||||
$user->update([
|
|
||||||
'first_name_length' => $fistNameLength
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the console command.
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
|
|
||||||
$users = User::all();
|
|
||||||
|
|
||||||
foreach ($users as $user) {
|
|
||||||
|
|
||||||
$business = Business::find($user->business_id);
|
|
||||||
|
|
||||||
if (!is_null($business)) {
|
|
||||||
|
|
||||||
if ($business->user_id == $user->id) {
|
|
||||||
|
|
||||||
$this->firstNameLengthUpdate($user);
|
|
||||||
$business->user()->attach($user->id, [
|
|
||||||
'responsibility' => $user->responsibility,
|
|
||||||
'is_owner' => 1
|
|
||||||
]);
|
|
||||||
$this->info("add and update user : $user->id");
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
$this->firstNameLengthUpdate($user);
|
|
||||||
$business->user()->attach($user->id, [
|
|
||||||
'responsibility' => $user->responsibility
|
|
||||||
]);
|
|
||||||
$this->info("add and update user : $user->id");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,168 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "willaengine/laravel",
|
|
||||||
"type": "project",
|
|
||||||
"description": "The WillaEngine Applications.",
|
|
||||||
"keywords": [
|
|
||||||
"framework",
|
|
||||||
"laravel",
|
|
||||||
"WillaEngine"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"require": {
|
|
||||||
"php": "^7.4",
|
|
||||||
"coraxster/flysystem-aws-s3-v3-minio": "^1.0",
|
|
||||||
"fideloper/proxy": "^4.0",
|
|
||||||
"io-developer/php-whois": "^4.0",
|
|
||||||
"kalnoy/nestedset": "^6.0",
|
|
||||||
"laravel/framework": "^8.0",
|
|
||||||
"laravel/passport": "^10",
|
|
||||||
"laravel/tinker": "^2.0",
|
|
||||||
"maatwebsite/excel": "^3.1",
|
|
||||||
"owen-it/laravel-auditing": "^13.5",
|
|
||||||
"sentry/sentry-laravel": "^2.3",
|
|
||||||
"silber/bouncer": "v1.0.0-rc.10",
|
|
||||||
"spatie/laravel-medialibrary": "^8.0.0",
|
|
||||||
"wm/admin": "dev-master",
|
|
||||||
"wm/app-management": "dev-master",
|
|
||||||
"wm/blog": "dev-master",
|
|
||||||
"wm/common": "dev-master",
|
|
||||||
"wm/contact-us": "dev-master",
|
|
||||||
"wm/core": "dev-master",
|
|
||||||
"wm/crm": "dev-master",
|
|
||||||
"wm/finance": "dev-master",
|
|
||||||
"wm/lms": "dev-master",
|
|
||||||
"wm/notification": "dev-master",
|
|
||||||
"wm/portfolio": "dev-master",
|
|
||||||
"wm/product": "dev-master",
|
|
||||||
"wm/roll-call": "dev-master",
|
|
||||||
"wm/service": "dev-master",
|
|
||||||
"wm/service-store": "dev-master",
|
|
||||||
"wm/store": "dev-master",
|
|
||||||
"wm/web-builder": "dev-master",
|
|
||||||
"zircote/swagger-php": "^3.0"
|
|
||||||
},
|
|
||||||
"provide": {
|
|
||||||
"ext-imagick": "*"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"facade/ignition": "^2.3.6",
|
|
||||||
"fzaninotto/faker": "^1.4",
|
|
||||||
"mockery/mockery": "^1.0",
|
|
||||||
"nunomaduro/collision": "^5.0",
|
|
||||||
"phpunit/phpunit": "^9.0"
|
|
||||||
},
|
|
||||||
"config": {
|
|
||||||
"optimize-autoloader": true,
|
|
||||||
"preferred-install": "dist",
|
|
||||||
"sort-packages": true,
|
|
||||||
"allow-plugins": {
|
|
||||||
"php-http/discovery": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"extra": {
|
|
||||||
"laravel": {
|
|
||||||
"dont-discover": []
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"App\\": "app/",
|
|
||||||
"Modules\\": "Modules/"
|
|
||||||
},
|
|
||||||
"classmap": [
|
|
||||||
"database/seeds",
|
|
||||||
"database/factories"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"autoload-dev": {
|
|
||||||
"psr-4": {
|
|
||||||
"Tests\\": "tests/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"minimum-stability": "dev",
|
|
||||||
"prefer-stable": true,
|
|
||||||
"scripts": {
|
|
||||||
"post-autoload-dump": [
|
|
||||||
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
|
|
||||||
"@php artisan package:discover --ansi",
|
|
||||||
"@php artisan morphmap:cache"
|
|
||||||
],
|
|
||||||
"post-root-package-install": [
|
|
||||||
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
|
|
||||||
],
|
|
||||||
"post-create-project-cmd": [
|
|
||||||
"@php artisan key:generate --ansi"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
|
|
||||||
"repositories": [
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/crm.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/common.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/core.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/blog.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/portfolio.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/product.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
c "type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/service.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/store.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/notification.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/roll-call.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/app-management.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/web-builder.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/finance.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/service-store.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/admin.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/lms.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/contact-us.git"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,166 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "laravel/laravel",
|
|
||||||
"type": "project",
|
|
||||||
"description": "The Laravel Framework.",
|
|
||||||
"keywords": [
|
|
||||||
"framework",
|
|
||||||
"laravel"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"require": {
|
|
||||||
"php": "^7.4",
|
|
||||||
"coraxster/flysystem-aws-s3-v3-minio": "^1.0",
|
|
||||||
"fideloper/proxy": "^4.0",
|
|
||||||
"laravel/framework": "^8.0",
|
|
||||||
"laravel/passport": "^10",
|
|
||||||
"laravel/tinker": "^2.0",
|
|
||||||
"maatwebsite/excel": "^3.1",
|
|
||||||
"matthiasmullie/minify": "^1.3",
|
|
||||||
"kalnoy/nestedset": "^6.0",
|
|
||||||
"sentry/sentry-laravel": "^2.3",
|
|
||||||
"spatie/laravel-medialibrary": "^8.0.0",
|
|
||||||
"io-developer/php-whois": "^4.0",
|
|
||||||
"silber/bouncer": "v1.0.0-rc.10",
|
|
||||||
"wm/blog": "dev-dev",
|
|
||||||
"wm/common": "dev-dev",
|
|
||||||
"wm/core": "dev-dev",
|
|
||||||
"wm/crm": "dev-dev",
|
|
||||||
"wm/portfolio": "dev-dev",
|
|
||||||
"wm/product": "dev-dev",
|
|
||||||
"wm/service": "dev-dev",
|
|
||||||
"wm/store": "dev-dev",
|
|
||||||
"wm/finance": "dev-dev",
|
|
||||||
"wm/admin": "dev-dev",
|
|
||||||
"wm/web-builder": "dev-dev",
|
|
||||||
"wm/app-management": "dev-dev",
|
|
||||||
"wm/notification": "dev-dev",
|
|
||||||
"wm/roll-call": "dev-dev",
|
|
||||||
"wm/lms": "dev-dev",
|
|
||||||
"wm/service-store": "dev-dev",
|
|
||||||
"predis/predis": "^1.1",
|
|
||||||
"wm/contact-us": "dev-dev",
|
|
||||||
"zircote/swagger-php": "^3.0"
|
|
||||||
},
|
|
||||||
"provide": {
|
|
||||||
"ext-imagick": "*"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"facade/ignition": "^2.3.6",
|
|
||||||
"fzaninotto/faker": "^1.4",
|
|
||||||
"mockery/mockery": "^1.0",
|
|
||||||
"nunomaduro/collision": "^5.0",
|
|
||||||
"phpunit/phpunit": "^9.0"
|
|
||||||
},
|
|
||||||
"config": {
|
|
||||||
"optimize-autoloader": true,
|
|
||||||
"preferred-install": "dist",
|
|
||||||
"sort-packages": true
|
|
||||||
},
|
|
||||||
"extra": {
|
|
||||||
"laravel": {
|
|
||||||
"dont-discover": []
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"App\\": "app/",
|
|
||||||
"Modules\\": "Modules/"
|
|
||||||
},
|
|
||||||
"classmap": [
|
|
||||||
"database/seeds",
|
|
||||||
"database/factories"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"autoload-dev": {
|
|
||||||
"psr-4": {
|
|
||||||
"Tests\\": "tests/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"minimum-stability": "dev",
|
|
||||||
"prefer-stable": true,
|
|
||||||
"scripts": {
|
|
||||||
"post-autoload-dump": [
|
|
||||||
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
|
|
||||||
"@php artisan package:discover --ansi",
|
|
||||||
"@php artisan morphmap:cache"
|
|
||||||
],
|
|
||||||
"post-root-package-install": [
|
|
||||||
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
|
|
||||||
],
|
|
||||||
"post-create-project-cmd": [
|
|
||||||
"@php artisan key:generate --ansi"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
|
|
||||||
"repositories": [
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/crm.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/common.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/core.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/blog.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/portfolio.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/product.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/service.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/store.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/notification.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/roll-call.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/app-management.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/web-builder.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/finance.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/service-store.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/admin.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/lms.git"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "vcs",
|
|
||||||
"url": "git@git.willaspace.com:WillaEngine-Project/contact-us.git"
|
|
||||||
}
|
|
||||||
|
|
||||||
]
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load Diff
@ -1,52 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If set to false, no activities will be saved to the database.
|
|
||||||
*/
|
|
||||||
'enabled' => env('ACTIVITY_LOGGER_ENABLED', true),
|
|
||||||
|
|
||||||
/*
|
|
||||||
* When the clean-command is executed, all recording activities older than
|
|
||||||
* the number of days specified here will be deleted.
|
|
||||||
*/
|
|
||||||
'delete_records_older_than_days' => 365,
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If no log name is passed to the activity() helper
|
|
||||||
* we use this default log name.
|
|
||||||
*/
|
|
||||||
'default_log_name' => 'default',
|
|
||||||
|
|
||||||
/*
|
|
||||||
* You can specify an auth driver here that gets user models.
|
|
||||||
* If this is null we'll use the default Laravel auth driver.
|
|
||||||
*/
|
|
||||||
'default_auth_driver' => null,
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If set to true, the subject returns soft deleted models.
|
|
||||||
*/
|
|
||||||
'subject_returns_soft_deleted_models' => false,
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This model will be used to log activity.
|
|
||||||
* It should be implements the Spatie\Activitylog\Contracts\Activity interface
|
|
||||||
* and extend Illuminate\Database\Eloquent\Model.
|
|
||||||
*/
|
|
||||||
'activity_model' => \Spatie\Activitylog\Models\Activity::class,
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is the name of the table that will be created by the migration and
|
|
||||||
* used by the Activity model shipped with this package.
|
|
||||||
*/
|
|
||||||
'table_name' => 'activity_log',
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is the database connection that will be used by the migration and
|
|
||||||
* the Activity model shipped with this package. In case it's not set
|
|
||||||
* Laravel database.default will be used instead.
|
|
||||||
*/
|
|
||||||
'database_connection' => env('ACTIVITY_LOGGER_DB_CONNECTION'),
|
|
||||||
];
|
|
@ -1,171 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
'enabled' => env('AUDITING_ENABLED', true),
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Implementation
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Define which Audit model implementation should be used.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'implementation' => OwenIt\Auditing\Models\Audit::class,
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| User Morph prefix & Guards
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Define the morph prefix and authentication guards for the User resolver.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'user' => [
|
|
||||||
'morph_prefix' => 'user',
|
|
||||||
'guards' => [
|
|
||||||
'web',
|
|
||||||
'api',
|
|
||||||
'apicore'
|
|
||||||
],
|
|
||||||
'resolver' => OwenIt\Auditing\Resolvers\UserResolver::class
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Resolvers
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Define the User, IP Address, User Agent and URL resolver implementations.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
'resolvers' => [
|
|
||||||
'ip_address' => OwenIt\Auditing\Resolvers\IpAddressResolver::class,
|
|
||||||
'user_agent' => OwenIt\Auditing\Resolvers\UserAgentResolver::class,
|
|
||||||
'url' => OwenIt\Auditing\Resolvers\UrlResolver::class,
|
|
||||||
'business_id'=> WM\Common\Services\Audit\BusinessResolver::class,
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Events
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The Eloquent events that trigger an Audit.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'events' => [
|
|
||||||
'created',
|
|
||||||
'updated',
|
|
||||||
'deleted',
|
|
||||||
'restored'
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Strict Mode
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Enable the strict mode when auditing?
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'strict' => false,
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Global exclude
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Have something you always want to exclude by default? - add it here.
|
|
||||||
| Note that this is overwritten (not merged) with local exclude
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'exclude' => [],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Empty Values
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Should Audit records be stored when the recorded old_values & new_values
|
|
||||||
| are both empty?
|
|
||||||
|
|
|
||||||
| Some events may be empty on purpose. Use allowed_empty_values to exclude
|
|
||||||
| those from the empty values check. For example when auditing
|
|
||||||
| model retrieved events which will never have new and old values.
|
|
||||||
|
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'empty_values' => true,
|
|
||||||
'allowed_empty_values' => [
|
|
||||||
'retrieved'
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Timestamps
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Should the created_at, updated_at and deleted_at timestamps be audited?
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'timestamps' => false,
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Threshold
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Specify a threshold for the amount of Audit records a model can have.
|
|
||||||
| Zero means no limit.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'threshold' => 0,
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Driver
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The default audit driver used to keep track of changes.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'driver' => 'database',
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Driver Configurations
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Available audit drivers and respective configurations.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'drivers' => [
|
|
||||||
'database' => [
|
|
||||||
'table' => 'audits',
|
|
||||||
'connection' => null,
|
|
||||||
],
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Audit Console
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Whether console events should be audited (eg. php artisan db:seed).
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'console' => true,
|
|
||||||
];
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,58 +0,0 @@
|
|||||||
const mix = require('laravel-mix');
|
|
||||||
const path = require('path');
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Mix Asset Management
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Mix provides a clean, fluent API for defining some Webpack build steps
|
|
||||||
| for your Laravel application. By default, we are compiling the Sass
|
|
||||||
| file for the application as well as bundling up all the JS files.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
mix.webpackConfig({
|
|
||||||
resolve: {
|
|
||||||
extensions: ["*", ".js", ".jsx", ".vue", ".ts", ".tsx", '.json', '.d.ts'],
|
|
||||||
alias: {
|
|
||||||
'@JS': path.resolve(__dirname, 'resources/js'),
|
|
||||||
'@Home': path.resolve(__dirname, 'resources/js/Home'),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
output: {
|
|
||||||
chunkFilename: 'js/vue/chunks/[name].[chunkhash].js',
|
|
||||||
},
|
|
||||||
module: {
|
|
||||||
rules: [
|
|
||||||
{
|
|
||||||
test: /\.ts$/,
|
|
||||||
loader: "ts-loader",
|
|
||||||
options: { appendTsSuffixTo: [/\.vue$/] },
|
|
||||||
exclude: /node_modules/
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
mix.js('resources/js/Home/app.js', 'public/js/vue/Home').vue({version: 2});
|
|
||||||
|
|
||||||
require('./modules/wm-core/webpack.mix');
|
|
||||||
require('./modules/wm-common/webpack.mix');
|
|
||||||
require('./modules/wm-crm/webpack.mix');
|
|
||||||
require('./modules/wm-blog/webpack.mix');
|
|
||||||
require('./modules/wm-portfolio/webpack.mix');
|
|
||||||
require('./modules/wm-product/webpack.mix');
|
|
||||||
require('./modules/wm-service/webpack.mix');
|
|
||||||
require('./modules/wm-store/webpack.mix');
|
|
||||||
require('./modules/wm-admin/webpack.mix');
|
|
||||||
require('./modules/wm-notification/webpack.mix');
|
|
||||||
require('./modules/wm-roll-call/webpack.mix');
|
|
||||||
require('./modules/wm-finance/webpack.mix');
|
|
||||||
require('./modules/wm-app-management/webpack.mix');
|
|
||||||
require('./modules/wm-web-builder/webpack.mix');
|
|
||||||
require('./modules/wm-lms/webpack.mix');
|
|
||||||
require('./modules/wm-service-store/webpack.mix');
|
|
||||||
require('./modules/wm-contact-us/webpack.mix');
|
|
||||||
// require('./modules/wm-warehouse/webpack.mix');
|
|
||||||
// require('./modules/wm-reservation/webpack.mix');
|
|
||||||
|
|
||||||
mix.version();
|
|
@ -1,59 +0,0 @@
|
|||||||
const mix = require('laravel-mix');
|
|
||||||
const path = require('path');
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Mix Asset Management
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Mix provides a clean, fluent API for defining some Webpack build steps
|
|
||||||
| for your Laravel application. By default, we are compiling the Sass
|
|
||||||
| file for the application as well as bundling up all the JS files.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
mix.webpackConfig({
|
|
||||||
resolve: {
|
|
||||||
extensions: ["*", ".js", ".jsx", ".vue", ".ts", ".tsx", '.json', '.d.ts'],
|
|
||||||
alias: {
|
|
||||||
'@JS': path.resolve(__dirname, 'resources/js'),
|
|
||||||
'@Home': path.resolve(__dirname, 'resources/js/Home'),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
output: {
|
|
||||||
chunkFilename: 'js/vue/chunks/[name].[chunkhash].js',
|
|
||||||
},
|
|
||||||
module: {
|
|
||||||
rules: [
|
|
||||||
{
|
|
||||||
test: /\.ts$/,
|
|
||||||
loader: "ts-loader",
|
|
||||||
options: { appendTsSuffixTo: [/\.vue$/] },
|
|
||||||
exclude: /node_modules/
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
mix.js('resources/js/Home/app.js', 'public/js/vue/Home').vue({version: 2});
|
|
||||||
|
|
||||||
require('./vendeor/wm/core/webpack.mix');
|
|
||||||
require('./vendeor/wm/common/webpack.mix');
|
|
||||||
require('./vendeor/wm/crm/webpack.mix');
|
|
||||||
require('./vendeor/wm/blog/webpack.mix');
|
|
||||||
require('./vendeor/wm/portfolio/webpack.mix');
|
|
||||||
require('./vendeor/wm/product/webpack.mix');
|
|
||||||
require('./vendeor/wm/service/webpack.mix');
|
|
||||||
require('./vendeor/wm/store/webpack.mix');
|
|
||||||
require('./vendeor/wm/admin/webpack.mix');
|
|
||||||
require('./vendeor/wm/notification/webpack.mix');
|
|
||||||
require('./vendeor/wm/roll-call/webpack.mix');
|
|
||||||
require('./vendeor/wm/finance/webpack.mix');
|
|
||||||
require('./vendeor/wm/app-management/webpack.mix');
|
|
||||||
require('./vendeor/wm/web-builder/webpack.mix');
|
|
||||||
require('./vendeor/wm/service-store/webpack.mix');
|
|
||||||
require('./vendeor/wm/lms/webpack.mix');
|
|
||||||
require('./vendeor/wm/service-store/webpack.mix');
|
|
||||||
require('./vendeor/wm/contact-us/webpack.mix');
|
|
||||||
// require('./vendeor/wm/warehouse/webpack.mix');
|
|
||||||
// require('./vendeor/wm/reservation/webpack.mix');
|
|
||||||
|
|
||||||
mix.version();
|
|
@ -1,55 +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]
|
|
||||||
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
|
|
||||||
|
|
||||||
[program:create-store-product]
|
|
||||||
process_name=%(program_name)s_%(process_num)02d
|
|
||||||
command=php /var/www/html/artisan queue:work redis --queue=create_store_product --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/create-store-product.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
|
|
Loading…
Reference in new issue