Merge branch 'master' of https://gitea.lihaink.cn/mkm/webman-admin

This reverts commit 8cb2fc3d3c361d0a821a5f1d3bfdde341a9c8251.

.example.env

@@ -1,20 +1 @@
-APP_DEBUG=true
+APP_DEBUG=true

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=likeadmin
DB_USERNAME=root
DB_PASSWORD=root

SESSION_DRIVER=file

REDIS_CONNECTION=default
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
REDIS_DB=24

YLY_PARTNER=25991
YLY_API_KEY=d955cc2296d69b4094c6465aad360dc6b19a8c77
YLY_REQUEST_URL=http://open.10ss.net:8888

UNIQUE_IDENTIFICATION = "11d3"
DEMO_ENV = ""
-HOST="http://0.0.0.0:8545"
-WEB_URL="/"
-DB_CONNECTION=mysql
-DB_HOST=47.109.71.135
-DB_PORT=3306
-DB_DATABASE=webman_admin
-DB_USERNAME=webman_admin
-DB_PASSWORD=nt8mogchd1
-
-SESSION_DRIVER=file
-
-REDIS_CONNECTION=default
-REDIS_HOST=redis
-REDIS_PASSWORD=123456
-REDIS_PORT=6379
-REDIS_DB=24
-
-UNIQUE_IDENTIFICATION = "11d3"
-DEMO_ENV = ""

app/api/controller/IndexController.php

@@ -5,18 +5,12 @@ namespace app\api\controller;
 use app\admin\validate\tools\GenerateTableValidate;
 use app\admin\logic\tools\GeneratorLogic;
 use app\common\controller\BaseLikeAdminController;
-use app\common\model\auth\Admin;
-use Webman\Config;
 
 class IndexController extends BaseLikeAdminController
 {
     public function index()
     {
-        $password = '123456';
+        return json(['msg' => 'hello']);
-        $passwordSalt = Config::get('project.unique_identification');
-        $create_password = create_password($password, $passwordSalt);
-        Admin::where('id', 1)->update(['password' => $create_password]);
-        return json(['你修改的密码是' => $password]);
     }
 
     /**

composer.json

@@ -44,9 +44,7 @@
     "doctrine/annotations": "^1.14",
     "illuminate/redis": "^10.22",
     "symfony/cache": "^5.4",
-    "next/var-dumper": "^0.1.0",
+    "max/var-dumper": "^0.1.1"
-    "tinywan/jwt": "^1.11",
-    "w7corp/easywechat": "^6.17"
   },
   "suggest": {
     "ext-event": "For better performance. "

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "54006c868283f8498fb5619c1f0de823",
+    "content-hash": "180fd50c18ae54063515e2bae5b5e329",
     "packages": [
         {
             "name": "aliyuncs/oss-sdk-php",
@@ -1355,6 +1355,45 @@
             ],
             "time": "2022-12-02T22:17:43+00:00"
         },
+        {
+            "name": "max/var-dumper",
+            "version": "0.1.1",
+            "dist": {
+                "type": "zip",
+                "url": "https://mirrors.cloud.tencent.com/repository/composer/max/var-dumper/0.1.1/max-var-dumper-0.1.1.zip",
+                "reference": "603bdeb2135b24c9eb91e559df1f9fc6a95b811d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4",
+                "symfony/var-dumper": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Max\\VarDumper\\": "src/"
+                }
+            },
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "chengyao",
+                    "email": "987861463@qq.com"
+                }
+            ],
+            "homepage": "https://github.com/marxphp/var-dumper",
+            "time": "2023-07-07T12:54:36+00:00"
+        },
         {
             "name": "monolog/monolog",
             "version": "2.9.1",
@@ -1518,55 +1557,6 @@
             ],
             "time": "2023-09-07T16:43:50+00:00"
         },
-        {
-            "name": "next/var-dumper",
-            "version": "0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/next-laboratory/var-dumper.git",
-                "reference": "ec86735e0df42240acc57341e4d5c1b8cff6b522"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/next-laboratory/var-dumper/zipball/ec86735e0df42240acc57341e4d5c1b8cff6b522",
-                "reference": "ec86735e0df42240acc57341e4d5c1b8cff6b522",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.4",
-                "symfony/var-dumper": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.1.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Next\\VarDumper\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "chengyao",
-                    "email": "987861463@qq.com"
-                }
-            ],
-            "homepage": "https://github.com/next-laboratory/var-dumper",
-            "support": {
-                "issues": "https://github.com/next-laboratory/var-dumper/issues",
-                "source": "https://github.com/next-laboratory/var-dumper/tree/0.1"
-            },
-            "time": "2023-10-31T02:27:04+00:00"
-        },
         {
             "name": "nikic/fast-route",
             "version": "v1.3.0",
@@ -4130,102 +4120,43 @@
             "time": "2022-08-27T08:29:08+00:00"
         },
         {
-            "name": "thenorthmemory/xml",
+            "name": "textalk/websocket",
-            "version": "1.1.1",
+            "version": "1.5.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/TheNorthMemory/xml.git",
-                "reference": "6f50c63450a0b098772423f8bdc3c4ad2c4c30bb"
-            },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TheNorthMemory/xml/zipball/6f50c63450a0b098772423f8bdc3c4ad2c4c30bb",
+                "url": "https://mirrors.cloud.tencent.com/repository/composer/textalk/websocket/1.5.8/textalk-websocket-1.5.8.zip",
-                "reference": "6f50c63450a0b098772423f8bdc3c4ad2c4c30bb",
+                "reference": "d05dbaa97500176447ffb1f1800573f23085ab13",
                 "shasum": ""
             },
             "require": {
-                "ext-libxml": "*",
+                "php": "^7.2 | ^8.0",
-                "ext-simplexml": "*",
+                "psr/log": "^1 | ^2 | ^3"
-                "php": ">=7.1.2"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.89 || ^1.0",
+                "php-coveralls/php-coveralls": "^2.0",
-                "phpunit/phpunit": "^7.5 || ^8.5.16 || ^9.3.5"
+                "phpunit/phpunit": "^8.0|^9.0",
+                "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "TheNorthMemory\\Xml\\": "src/"
+                    "WebSocket\\": "lib"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache-2.0"
+                "ISC"
             ],
             "authors": [
                 {
-                    "name": "James ZHANG",
+                    "name": "Fredrik Liljegren"
-                    "homepage": "https://github.com/TheNorthMemory"
+                },
+                {
+                    "name": "Sören Jensen",
+                    "email": "soren@abicart.se"
                 }
             ],
-            "description": "A wrapper of the XML parser and builder",
+            "description": "WebSocket client and server",
-            "homepage": "https://github.com/TheNorthMemory/xml",
+            "time": "2022-04-26T06:28:24+00:00"
-            "keywords": [
-                "xml-builder",
-                "xml-parser"
-            ],
-            "support": {
-                "issues": "https://github.com/TheNorthMemory/xml/issues",
-                "source": "https://github.com/TheNorthMemory/xml/tree/1.1.1"
-            },
-            "time": "2023-01-15T06:01:13+00:00"
-        },
-        {
-            "name": "tinywan/jwt",
-            "version": "v1.11.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Tinywan/webman-jwt.git",
-                "reference": "1b067c998d970c252b8ad113a460922f8108b9ac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Tinywan/webman-jwt/zipball/1b067c998d970c252b8ad113a460922f8108b9ac",
-                "reference": "1b067c998d970c252b8ad113a460922f8108b9ac",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "firebase/php-jwt": "^6.8",
-                "php": "^7.1||^8.0",
-                "workerman/webman-framework": "^1.2.1||^2.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.6",
-                "illuminate/database": "^8.83",
-                "mockery/mockery": "^1.5",
-                "phpstan/phpstan": "^1.4",
-                "phpunit/phpunit": "^9.0",
-                "topthink/think-orm": "^2.0",
-                "vimeo/psalm": "^4.22",
-                "workerman/webman": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Tinywan\\Jwt\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "JSON Web Token (JWT) for webman plugin",
-            "support": {
-                "issues": "https://github.com/Tinywan/webman-jwt/issues",
-                "source": "https://github.com/Tinywan/webman-jwt/tree/v1.11.3"
-            },
-            "time": "2025-04-10T12:05:48+00:00"
         },
         {
             "name": "tinywan/storage",
@@ -4799,6 +4730,6 @@
         "php": ">=7.2",
         "ext-json": "*"
     },
-    "platform-dev": {},
+    "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }

config/exception.php

@@ -14,5 +14,5 @@
 
 return [
 //    '' => support\exception\Handler::class,
-    '' => \App\ExceptionHandler::class,
+    '' => app\common\exception\Handler::class,
 ];

config/redis.php

@@ -14,9 +14,9 @@
 
 return [
     'default' => [
-        'host' =>getenv('REDIS_HOST'),
+        'host' => '127.0.0.1',
-        'password' => getenv('REDIS_PASSWORD'),
+        'password' => null,
-        'port' => getenv('REDIS_PORT'),
+        'port' => 6379,
-        'database' => getenv('REDIS_DB'),
+        'database' => 0,
     ],
 ];

config/server.php

@@ -13,7 +13,7 @@
  */
 
 return [
-    'listen' => getenv('HOST'),
+    'listen' => 'http://0.0.0.0:8787',
     'transport' => 'tcp',
     'context' => [],
     'name' => 'webman',