Compare commits

..

No commits in common. "b3a69567b6ef1f2c0e23143a4a3663fd3e386189" and "913f2d7700ffa47ef193f17d350eb2dc7711504d" have entirely different histories.

7 changed files with 165 additions and 69 deletions

View File

@ -1 +1,20 @@
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 = "" APP_DEBUG=true
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 = ""

View File

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

View File

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

189
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "180fd50c18ae54063515e2bae5b5e329", "content-hash": "54006c868283f8498fb5619c1f0de823",
"packages": [ "packages": [
{ {
"name": "aliyuncs/oss-sdk-php", "name": "aliyuncs/oss-sdk-php",
@ -1355,45 +1355,6 @@
], ],
"time": "2022-12-02T22:17:43+00:00" "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", "name": "monolog/monolog",
"version": "2.9.1", "version": "2.9.1",
@ -1557,6 +1518,55 @@
], ],
"time": "2023-09-07T16:43:50+00:00" "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", "name": "nikic/fast-route",
"version": "v1.3.0", "version": "v1.3.0",
@ -4120,43 +4130,102 @@
"time": "2022-08-27T08:29:08+00:00" "time": "2022-08-27T08:29:08+00:00"
}, },
{ {
"name": "textalk/websocket", "name": "thenorthmemory/xml",
"version": "1.5.8", "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/TheNorthMemory/xml.git",
"reference": "6f50c63450a0b098772423f8bdc3c4ad2c4c30bb"
},
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://mirrors.cloud.tencent.com/repository/composer/textalk/websocket/1.5.8/textalk-websocket-1.5.8.zip", "url": "https://api.github.com/repos/TheNorthMemory/xml/zipball/6f50c63450a0b098772423f8bdc3c4ad2c4c30bb",
"reference": "d05dbaa97500176447ffb1f1800573f23085ab13", "reference": "6f50c63450a0b098772423f8bdc3c4ad2c4c30bb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2 | ^8.0", "ext-libxml": "*",
"psr/log": "^1 | ^2 | ^3" "ext-simplexml": "*",
"php": ">=7.1.2"
}, },
"require-dev": { "require-dev": {
"php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^0.12.89 || ^1.0",
"phpunit/phpunit": "^8.0|^9.0", "phpunit/phpunit": "^7.5 || ^8.5.16 || ^9.3.5"
"squizlabs/php_codesniffer": "^3.5"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"WebSocket\\": "lib" "TheNorthMemory\\Xml\\": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"ISC" "Apache-2.0"
], ],
"authors": [ "authors": [
{ {
"name": "Fredrik Liljegren" "name": "James ZHANG",
}, "homepage": "https://github.com/TheNorthMemory"
{
"name": "Sören Jensen",
"email": "soren@abicart.se"
} }
], ],
"description": "WebSocket client and server", "description": "A wrapper of the XML parser and builder",
"time": "2022-04-26T06:28:24+00:00" "homepage": "https://github.com/TheNorthMemory/xml",
"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", "name": "tinywan/storage",
@ -4730,6 +4799,6 @@
"php": ">=7.2", "php": ">=7.2",
"ext-json": "*" "ext-json": "*"
}, },
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.3.0" "plugin-api-version": "2.6.0"
} }

View File

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

View File

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

View File

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