Merge branch 'development' of github.com:visuddhinanda/mint into development

.gitignore

@@ -6,5 +6,6 @@
 *.log
 .stop
 *.xz
+*.md5
 
 /k8s/

api-v12/composer.json

@@ -10,16 +10,19 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "firebase/php-jwt": "^6.11",
+        "aws/aws-sdk-php": "^3.369",
+        "casbin/casbin": "^4.1",
+        "firebase/php-jwt": "^7.0",
         "godruoyi/php-snowflake": "^3.2",
         "guzzlehttp/guzzle": "^7.9",
         "intervention/image": "^3.11",
         "laravel/framework": "^12.0",
         "laravel/tinker": "^2.10.1",
         "mustache/mustache": "^2.14",
+        "opensearch-project/opensearch-php": "^2.4",
         "php-amqplib/php-amqplib": "^3.7",
         "php-ffmpeg/php-ffmpeg": "^1.3",
-        "phpoffice/phpspreadsheet": "^4.3"
+        "phpoffice/phpspreadsheet": "^5.3"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",

dashboard-v6/vite.config.ts

@@ -9,6 +9,7 @@ export default defineConfig({
     port: 4000,
     proxy: {
       "/api": "http://127.0.0.1:8080",
+      "/api-v2026": "http://127.0.0.1:8088",
     },
   },
   plugins: [react()],

scripts/3rd-pack.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+export WORKSPACE=$PWD
+export PHP_VERSION="$(php -r 'echo PHP_VERSION;')"
+export VERSION="$(uname -m)-$(date "+%4Y%m%d%H%M%S")"
+export XZ_OPT=-9
+export TAR="tar -cJf"
+
+git config --global --add safe.directory $PWD
+
+if [[ "$PHP_VERSION" == "8.1.34" ]]; then    
+    cd $WORKSPACE/
+    $TAR api-v8-$VERSION.tar.xz -C api-v8 node_modules package-lock.json vendor composer.lock public/node_modules public/package-lock.json public/vendor public/composer.lock
+    $TAR dashboard-v4-$VERSION.tar.xz -C dashboard-v4/dashboard node_modules yarn.lock
+elif [[ "$PHP_VERSION" == "8.4.16" ]]; then
+    cd $WORKSPACE/api-v12/
+    composer install --optimize-autoloader --no-dev
+    npm install
+    cd $WORKSPACE/dashboard-v6/
+    npm install
+
+    cd $WORKSPACE/
+    $TAR api-v12-$VERSION.tar.xz -C api-v12 node_modules package-lock.json vendor composer.lock    
+    $TAR dashboard-v6-$VERSION.tar.xz -C dashboard-v6 node_modules package-lock.json
+else
+    echo "unsupported php version $PHP_VERSION"
+    exit 1
+fi
+
+md5sum *-$VERSION.tar.xz > $VERSION.md5
+echo "done($VERSION)."
+exit 0
+

scripts/laravel.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+git config --global --add safe.directory $PWD
+
+composer require guzzlehttp/guzzle
+composer require opensearch-project/opensearch-php
+composer require phpoffice/phpspreadsheet
+composer require aws/aws-sdk-php
+composer require firebase/php-jwt
+composer require casbin/casbin
+
+exit 0

scripts/third-dependencies-pack.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export VERSION=$(date "+%4Y%m%d%H%M%S")
-
-if [[ "$#" -eq 1 && "$1" == "dashboard" ]]; then
-    XZ_OPT=-9 tar -cJf dashboard-v6-$VERSION.tar.xz -C dashboard-v6 node_modules package-lock.json
-    XZ_OPT=-9 tar -cJf dashboard-v4-$VERSION.tar.xz -C dashboard-v4/dashboard node_modules yarn.lock
-elif [[ "$#" -eq 1 && "$1" == "laravel" ]]; then
-    XZ_OPT=-9 tar -cJf dashboard-$VERSION.tar.xz -C xxx node_modules package-lock.json
-else
-    echo "USAGE: $0 dashboard|laravel"
-    exit 1
-fi
-
-exit 0
-