Changes

.env

@@ -11,7 +11,7 @@ LOG_CHANNEL=daily
 
 # 数据库
 DB_CONNECTION=mysql
-DB_HOST=47.243.54.62
+DB_HOST=158.247.203.230
 DB_PORT=13306
 DB_DATABASE=api_niubiyun_xyz
 DB_USERNAME=api_niubiyun_xyz
@@ -19,13 +19,14 @@ DB_PASSWORD=KrkLMazMxthyxepe
 DB_STRICT=false
 
 BROADCAST_DRIVER=redis
-CACHE_DRIVER=redis
+CACHE_DRIVER=file
 QUEUE_CONNECTION=redis
 SESSION_DRIVER=redis
 SESSION_LIFETIME=120
 SESSION_CONNECTION=session
 
 #redis
+
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=
 REDIS_PORT=6379

app/Http/Controllers/Api/Client/V5Controller.php

@@ -7,7 +7,8 @@ use App\Http\Controllers\Controller;
 use App\Models\Node;
 use App\Models\User;
 use Illuminate\Http\Request;
-use Log;
+use Illuminate\Support\Facades\Log;
+
 ###8{yV74aW#_E@HFs2
 
 class V5Controller  extends Controller
@@ -39,12 +40,31 @@ class V5Controller  extends Controller
 
             // 返回文本响应
 
-            return response(['data'=>'orror: no email'], 200);
+            return response(['msg'=>'账号不存在,请核对你的邮箱'], 400);
+        }
+
+        //判断到期
+        $expireTime = $results["expired_at"];
+
+        if ($expireTime < date('Y-m-d H:i:s')){
+            return response()->json(['ret' => 445, 'msg' => "用户到期，请核对你的邮箱"], 400);
         }
 
+        $totalTransfer = $results['transfer_enable'];
+        $usedTransfer = $results['d'] + $results['u'];
+        $unusedTraffic = max($totalTransfer - $usedTransfer, 0);
+
+        if ($results['enable'] == 1){
+            $status = "启用";
+        } else
+        {
+            $status = "禁用";
+        }
         $data = [
             'email' => $results['email'],
             'expired_at' => $results['expired_at'],
+            'status' => $status,
+            'unusedTraffic' => flowAutoShow($unusedTraffic),
         ];
 
         return response($data, 200);

composer.json

@@ -1,107 +1,107 @@
 {
-  "name": "proxypanel/proxypanel",
-  "type": "project",
-  "description": "Proxy panel is a proxy account management system, it supports shadowsocks, shadowsocksr, v2ray, trojan and more.",
-  "keywords": [
-    "laravel",
-    "proxypanel"
-  ],
-  "license": "MIT",
-  "require": {
-    "php": "^7.2.5|^8.0",
-    "ext-json": "*",
-    "ext-mbstring": "*",
-    "ext-openssl": "*",
-    "ext-simplexml": "*",
-    "appstract/laravel-opcache": "^4.0",
-    "doctrine/dbal": "^2.12",
-    "fideloper/proxy": "^4.4",
-    "fruitcake/laravel-cors": "^2.0",
-    "geoip2/geoip2": "^2.10",
-    "guzzlehttp/guzzle": "^6.3.1|^7.0.1",
-    "ip2location/ip2location-laravel": "^1.2",
-    "ipip/db": "^1.0",
-    "jenssegers/agent": "^2.6",
-    "laravel-notification-channels/bearychat": "^1.4",
-    "laravel-notification-channels/telegram": "^0.5.1",
-    "laravel/framework": "^7.29",
-    "laravel/tinker": "^2.5",
-    "mews/captcha": "^3.1",
-    "mews/purifier": "^3.3",
-    "overtrue/laravel-lang": "^4.0",
-    "phpoffice/phpspreadsheet": "^1.14",
-    "rap2hpoutre/laravel-log-viewer": "^1.6",
-    "riverslei/payment": "^5.1",
-    "spatie/laravel-permission": "^3.17",
-    "srmklive/paypal": "^1.7",
-    "stripe/stripe-php": "^7.61",
-    "symfony/yaml": "^5.2",
-    "tymon/jwt-auth": "^1.0",
-    "xhat/payjs": "^1.4",
-    "zbrettonye/geetest": "^1.2",
-    "zbrettonye/hcaptcha": "^1.0",
-    "zbrettonye/no-captcha": "^1.0",
-    "zoujingli/ip2region": "^1.0"
-  },
-  "require-dev": {
-    "barryvdh/laravel-debugbar": "^3.4",
-    "barryvdh/laravel-ide-helper": "^2.8",
-    "facade/ignition": "^2.0",
-    "fakerphp/faker": "^1.9.1",
-    "laravel/telescope": "^3.5",
-    "mockery/mockery": "^1.3.1",
-    "nunomaduro/collision": "^4.3",
-    "phpunit/phpunit": "^8.5.8|^9.3.3"
-  },
-  "config": {
-    "optimize-autoloader": true,
+    "name": "proxypanel/proxypanel",
+    "type": "project",
+    "description": "Proxy panel is a proxy account management system, it supports shadowsocks, shadowsocksr, v2ray, trojan and more.",
+    "keywords": [
+        "laravel",
+        "proxypanel"
+    ],
+    "license": "MIT",
+    "require": {
+        "php": "^7.2.5|^8.0",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "ext-simplexml": "*",
+        "appstract/laravel-opcache": "^4.0",
+        "doctrine/dbal": "^2.12",
+        "fideloper/proxy": "^4.4",
+        "fruitcake/laravel-cors": "^2.0",
+        "geoip2/geoip2": "^2.10",
+        "guzzlehttp/guzzle": "^6.3.1|^7.0.1",
+        "ip2location/ip2location-laravel": "^1.2",
+        "ipip/db": "^1.0",
+        "jenssegers/agent": "^2.6",
+        "laravel-notification-channels/bearychat": "^1.4",
+        "laravel-notification-channels/telegram": "^0.5.1",
+        "laravel/framework": "^7.29",
+        "laravel/tinker": "^2.5",
+        "mews/captcha": "^3.1",
+        "mews/purifier": "^3.3",
+        "overtrue/laravel-lang": "^4.0",
+        "phpoffice/phpspreadsheet": "^1.14",
+        "rap2hpoutre/laravel-log-viewer": "^1.6",
+        "riverslei/payment": "^5.1",
+        "spatie/laravel-permission": "^3.17",
+        "srmklive/paypal": "^1.7",
+        "stripe/stripe-php": "^7.61",
+        "symfony/yaml": "^5.2",
+        "tymon/jwt-auth": "^1.0",
+        "xhat/payjs": "^1.4",
+        "zbrettonye/geetest": "^1.2",
+        "zbrettonye/hcaptcha": "^1.0",
+        "zbrettonye/no-captcha": "^1.0",
+        "zoujingli/ip2region": "^1.0"
+    },
+    "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.4",
+        "barryvdh/laravel-ide-helper": "^2.8",
+        "facade/ignition": "^2.0",
+        "fakerphp/faker": "^1.9.1",
+        "laravel/telescope": "^3.5",
+        "mockery/mockery": "^1.3.1",
+        "nunomaduro/collision": "^4.3",
+        "phpunit/phpunit": "^8.5.8|^9.3.3"
+    },
+    "config": {
+        "optimize-autoloader": true,
 
-    "sort-packages": true
-  },
-  "extra": {
-    "laravel": {
-      "dont-discover": [
-        "laravel/telescope"
-      ]
-    }
-  },
-  "autoload": {
-    "psr-4": {
-      "App\\": "app/"
+        "sort-packages": true
     },
-    "classmap": [
-      "database/seeds",
-      "database/factories"
-    ],
-    "files": [
-      "app/helpers.php"
-    ]
-  },
-  "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"
-    ],
-    "post-root-package-install": [
-      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-    ],
-    "post-create-project-cmd": [
-      "@php artisan key:generate --ansi"
-    ],
-    "check-style": "php-cs-fixer fix --dry-run --diff .",
-    "fix-style": "php-cs-fixer fix ."
-  },
-  "repositories": {
-    "packagist": {
-      "type": "composer",
-      "url": "https://mirrors.aliyun.com/composer/"
+    "extra": {
+        "laravel": {
+            "dont-discover": [
+                "laravel/telescope"
+            ]
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/"
+        },
+        "classmap": [
+            "database/seeds",
+            "database/factories"
+        ],
+        "files": [
+            "app/helpers.php"
+        ]
+    },
+    "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"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ],
+        "check-style": "php-cs-fixer fix --dry-run --diff .",
+        "fix-style": "php-cs-fixer fix ."
+    },
+    "repositories": {
+        "packagist": {
+            "type": "composer",
+            "url": "https://mirrors.aliyun.com/composer/"
+        }
     }
-  }
 }

storage/framework/.gitignore

@@ -1,8 +0,0 @@
-config.php
-routes.php
-schedule-*
-compiled.php
-services.json
-events.scanned.php
-routes.scanned.php
-down

storage/framework/cache/.gitignore

@@ -1,3 +0,0 @@
-*
-!data/
-!.gitignore

storage/framework/sessions/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

storage/framework/testing/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore