feat: 更新了MakePluginCommand类以支持更新插件
feat: 更新了MakeBootstrapCommand、MakeCommandCommand、MakeMiddlewareCommand和MakeModelCommand类以支持覆盖已存在的文件 feat: 更新了App类以修复可能的路径错误 feat: 更新了Db、Raw、ThinkPHP、Twig和Blade类以支持在视图渲染时合并变量 feat: 更新了webman文件以支持在插件中查找命令
This commit is contained in:
parent
9594bed528
commit
dd676bdc0c
@ -36,15 +36,16 @@ class CartController extends BaseApiController
|
||||
if (!$branchProduct) {
|
||||
return $this->fail('商品不存在');
|
||||
}
|
||||
$params['cart_num']=intval($params['cart_num']);
|
||||
if ($params['cart_num'] < $branchProduct['batch']) {
|
||||
return $this->fail('起批发量低于最低值' . $branchProduct['batch']);
|
||||
}
|
||||
if ($params['cart_num']<1) {
|
||||
$is_bulk = StoreProductUnit::where('id', $branchProduct['unit'])->value('is_bulk');
|
||||
if ($is_bulk == 0) {
|
||||
return $this->fail('非计量商品,不能有小数');
|
||||
}
|
||||
}
|
||||
// if ($params['cart_num']<1) {
|
||||
// $is_bulk = StoreProductUnit::where('id', $branchProduct['unit'])->value('is_bulk');
|
||||
// if ($is_bulk == 0) {
|
||||
// return $this->fail('非计量商品,不能有小数');
|
||||
// }
|
||||
// }
|
||||
|
||||
//数量下单判断
|
||||
$count = Cart::where(['uid' => $params['uid'], 'delete_time' => null, 'is_pay' => 0])->count();
|
||||
@ -82,6 +83,7 @@ class CartController extends BaseApiController
|
||||
{
|
||||
$params = (new CartValidate())->post()->goCheck('change');
|
||||
$params['uid'] = $this->request->userId;
|
||||
$params['cart_num']=intval($params['cart_num']);
|
||||
$res = CartLogic::edit($params, 'dec');
|
||||
if ($res) {
|
||||
return $this->success('修改成功');
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.1",
|
||||
"workerman/webman-framework": "v1.5.19",
|
||||
"workerman/webman-framework": "^1.5.22",
|
||||
"monolog/monolog": "^2.2",
|
||||
"webman/think-orm": "v1.1.1",
|
||||
"vlucas/phpdotenv": "^5.4",
|
||||
@ -33,7 +33,7 @@
|
||||
"ext-json": "*",
|
||||
"phpoffice/phpspreadsheet": "^1.19",
|
||||
"aliyuncs/oss-sdk-php": "^2.6",
|
||||
"webman/console": "^1.2.12",
|
||||
"webman/console": "^1.3.4",
|
||||
"qiniu/php-sdk": "7.4",
|
||||
"qcloud/cos-sdk-v5": "^2.6",
|
||||
"dragonmantank/cron-expression": "^3.3",
|
||||
@ -86,4 +86,4 @@
|
||||
"support\\Plugin::uninstall"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
38
composer.lock
generated
38
composer.lock
generated
@ -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": "188a7d1d9e0401a1be552e084e052580",
|
||||
"content-hash": "fb2dcd2b6d5f80016cfae906588f8bb9",
|
||||
"packages": [
|
||||
{
|
||||
"name": "aliyuncs/oss-sdk-php",
|
||||
@ -7153,23 +7153,17 @@
|
||||
},
|
||||
{
|
||||
"name": "webman/console",
|
||||
"version": "v1.3.4",
|
||||
"version": "v1.3.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/webman-php/console.git",
|
||||
"reference": "ee50a1eca292eea5bf70661aa2ef722e1294814c"
|
||||
"reference": "9ba334486b9c8dc6b88e98f423d8fedfe3d71d45"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/webman-php/console/zipball/ee50a1eca292eea5bf70661aa2ef722e1294814c",
|
||||
"reference": "ee50a1eca292eea5bf70661aa2ef722e1294814c",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
"url": "https://api.github.com/repos/webman-php/console/zipball/9ba334486b9c8dc6b88e98f423d8fedfe3d71d45",
|
||||
"reference": "9ba334486b9c8dc6b88e98f423d8fedfe3d71d45",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/inflector": "^2.0",
|
||||
@ -7208,7 +7202,7 @@
|
||||
"source": "https://github.com/webman-php/console",
|
||||
"wiki": "http://www.workerman.net/doc/webman"
|
||||
},
|
||||
"time": "2024-01-23T03:25:23+00:00"
|
||||
"time": "2024-06-12T01:30:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "webman/log",
|
||||
@ -7569,23 +7563,17 @@
|
||||
},
|
||||
{
|
||||
"name": "workerman/webman-framework",
|
||||
"version": "v1.5.19",
|
||||
"version": "v1.5.22",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/walkor/webman-framework.git",
|
||||
"reference": "9ac7c136b0197a15a31f5092782366abff9a6e06"
|
||||
"reference": "f52d9739a264d99d49427081c8a85303c02a770e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/walkor/webman-framework/zipball/9ac7c136b0197a15a31f5092782366abff9a6e06",
|
||||
"reference": "9ac7c136b0197a15a31f5092782366abff9a6e06",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
"url": "https://api.github.com/repos/walkor/webman-framework/zipball/f52d9739a264d99d49427081c8a85303c02a770e",
|
||||
"reference": "f52d9739a264d99d49427081c8a85303c02a770e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
@ -7633,7 +7621,7 @@
|
||||
"source": "https://github.com/walkor/webman-framework",
|
||||
"wiki": "https://doc.workerman.net/"
|
||||
},
|
||||
"time": "2024-06-17T01:51:40+00:00"
|
||||
"time": "2024-08-04T01:40:07+00:00"
|
||||
},
|
||||
{
|
||||
"name": "workerman/workerman",
|
||||
|
||||
@ -73,13 +73,23 @@ function app_path(string $path = ''): string
|
||||
/**
|
||||
* Public path
|
||||
* @param string $path
|
||||
* @param string|null $plugin
|
||||
* @return string
|
||||
*/
|
||||
function public_path(string $path = ''): string
|
||||
function public_path(string $path = '', string $plugin = null): string
|
||||
{
|
||||
static $publicPath = '';
|
||||
if (!$publicPath) {
|
||||
$publicPath = \config('app.public_path') ?: run_path('public');
|
||||
static $publicPaths = [];
|
||||
$plugin = $plugin ?? '';
|
||||
if (isset($publicPaths[$plugin])) {
|
||||
$publicPath = $publicPaths[$plugin];
|
||||
} else {
|
||||
$prefix = $plugin ? "plugin.$plugin." : '';
|
||||
$pathPrefix = $plugin ? 'plugin' . DIRECTORY_SEPARATOR . $plugin . DIRECTORY_SEPARATOR : '';
|
||||
$publicPath = \config("{$prefix}app.public_path", run_path("{$pathPrefix}public"));
|
||||
if (count($publicPaths) > 32) {
|
||||
$publicPaths = [];
|
||||
}
|
||||
$publicPaths[$plugin] = $publicPath;
|
||||
}
|
||||
return path_combine($publicPath, $path);
|
||||
}
|
||||
@ -244,9 +254,6 @@ function think_view(string $template, array $vars = [], string $app = null): Res
|
||||
* @param array $vars
|
||||
* @param string|null $app
|
||||
* @return Response
|
||||
* @throws LoaderError
|
||||
* @throws RuntimeError
|
||||
* @throws SyntaxError
|
||||
*/
|
||||
function twig_view(string $template, array $vars = [], string $app = null): Response
|
||||
{
|
||||
|
||||
40
vendor/composer/installed.json
vendored
40
vendor/composer/installed.json
vendored
@ -7096,24 +7096,18 @@
|
||||
},
|
||||
{
|
||||
"name": "webman/console",
|
||||
"version": "v1.3.4",
|
||||
"version_normalized": "1.3.4.0",
|
||||
"version": "v1.3.9",
|
||||
"version_normalized": "1.3.9.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/webman-php/console.git",
|
||||
"reference": "ee50a1eca292eea5bf70661aa2ef722e1294814c"
|
||||
"reference": "9ba334486b9c8dc6b88e98f423d8fedfe3d71d45"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/webman-php/console/zipball/ee50a1eca292eea5bf70661aa2ef722e1294814c",
|
||||
"reference": "ee50a1eca292eea5bf70661aa2ef722e1294814c",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
"url": "https://api.github.com/repos/webman-php/console/zipball/9ba334486b9c8dc6b88e98f423d8fedfe3d71d45",
|
||||
"reference": "9ba334486b9c8dc6b88e98f423d8fedfe3d71d45",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/inflector": "^2.0",
|
||||
@ -7122,7 +7116,7 @@
|
||||
"require-dev": {
|
||||
"workerman/webman": "^1.0"
|
||||
},
|
||||
"time": "2024-01-23T03:25:23+00:00",
|
||||
"time": "2024-06-12T01:30:26+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -7509,24 +7503,18 @@
|
||||
},
|
||||
{
|
||||
"name": "workerman/webman-framework",
|
||||
"version": "v1.5.19",
|
||||
"version_normalized": "1.5.19.0",
|
||||
"version": "v1.5.22",
|
||||
"version_normalized": "1.5.22.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/walkor/webman-framework.git",
|
||||
"reference": "9ac7c136b0197a15a31f5092782366abff9a6e06"
|
||||
"reference": "f52d9739a264d99d49427081c8a85303c02a770e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/walkor/webman-framework/zipball/9ac7c136b0197a15a31f5092782366abff9a6e06",
|
||||
"reference": "9ac7c136b0197a15a31f5092782366abff9a6e06",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
|
||||
"preferred": true
|
||||
}
|
||||
]
|
||||
"url": "https://api.github.com/repos/walkor/webman-framework/zipball/f52d9739a264d99d49427081c8a85303c02a770e",
|
||||
"reference": "f52d9739a264d99d49427081c8a85303c02a770e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
@ -7538,7 +7526,7 @@
|
||||
"suggest": {
|
||||
"ext-event": "For better performance. "
|
||||
},
|
||||
"time": "2024-06-17T01:51:40+00:00",
|
||||
"time": "2024-08-04T01:40:07+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
|
||||
12
vendor/composer/installed.php
vendored
12
vendor/composer/installed.php
vendored
@ -957,9 +957,9 @@
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'webman/console' => array(
|
||||
'pretty_version' => 'v1.3.4',
|
||||
'version' => '1.3.4.0',
|
||||
'reference' => 'ee50a1eca292eea5bf70661aa2ef722e1294814c',
|
||||
'pretty_version' => 'v1.3.9',
|
||||
'version' => '1.3.9.0',
|
||||
'reference' => '9ba334486b9c8dc6b88e98f423d8fedfe3d71d45',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../webman/console',
|
||||
'aliases' => array(),
|
||||
@ -1047,9 +1047,9 @@
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'workerman/webman-framework' => array(
|
||||
'pretty_version' => 'v1.5.19',
|
||||
'version' => '1.5.19.0',
|
||||
'reference' => '9ac7c136b0197a15a31f5092782366abff9a6e06',
|
||||
'pretty_version' => 'v1.5.22',
|
||||
'version' => '1.5.22.0',
|
||||
'reference' => 'f52d9739a264d99d49427081c8a85303c02a770e',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../workerman/webman-framework',
|
||||
'aliases' => array(),
|
||||
|
||||
@ -67,6 +67,7 @@ class AppPluginCreateCommand extends Command
|
||||
$this->createViewFile("$base_path/plugin/$name/app/view/index/index.html");
|
||||
$this->createConfigFiles("$base_path/plugin/$name/config", $name);
|
||||
$this->createApiFiles("$base_path/plugin/$name/api", $name);
|
||||
$this->createInstallSqlFile("$base_path/plugin/$name/install.sql");
|
||||
}
|
||||
|
||||
/**
|
||||
@ -171,9 +172,17 @@ EOF;
|
||||
namespace plugin\\$name\api;
|
||||
|
||||
use plugin\admin\api\Menu;
|
||||
use support\Db;
|
||||
use Throwable;
|
||||
|
||||
class Install
|
||||
{
|
||||
|
||||
/**
|
||||
* 数据库连接
|
||||
*/
|
||||
protected static \$connection = 'plugin.admin.mysql';
|
||||
|
||||
/**
|
||||
* 安装
|
||||
*
|
||||
@ -182,6 +191,8 @@ class Install
|
||||
*/
|
||||
public static function install(\$version)
|
||||
{
|
||||
// 安装数据库
|
||||
static::installSql();
|
||||
// 导入菜单
|
||||
if(\$menus = static::getMenus()) {
|
||||
Menu::import(\$menus);
|
||||
@ -200,6 +211,8 @@ class Install
|
||||
foreach (static::getMenus() as \$menu) {
|
||||
Menu::delete(\$menu['key']);
|
||||
}
|
||||
// 卸载数据库
|
||||
static::uninstallSql();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -216,10 +229,17 @@ class Install
|
||||
if (isset(\$context['previous_menus'])) {
|
||||
static::removeUnnecessaryMenus(\$context['previous_menus']);
|
||||
}
|
||||
// 安装数据库
|
||||
static::installSql();
|
||||
// 导入新菜单
|
||||
if (\$menus = static::getMenus()) {
|
||||
Menu::import(\$menus);
|
||||
}
|
||||
// 执行更新操作
|
||||
\$update_file = __DIR__ . '/../update.php';
|
||||
if (is_file(\$update_file)) {
|
||||
include \$update_file;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -263,6 +283,63 @@ class Install
|
||||
Menu::delete(\$name);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 安装SQL
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected static function installSql()
|
||||
{
|
||||
static::importSql(__DIR__ . '/../install.sql');
|
||||
}
|
||||
|
||||
/**
|
||||
* 卸载SQL
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected static function uninstallSql() {
|
||||
// 如果卸载数据库文件存在责直接使用
|
||||
\$uninstallSqlFile = __DIR__ . '/../uninstall.sql';
|
||||
if (is_file(\$uninstallSqlFile)) {
|
||||
static::importSql(\$uninstallSqlFile);
|
||||
return;
|
||||
}
|
||||
// 否则根据install.sql生成卸载数据库文件uninstall.sql
|
||||
\$installSqlFile = __DIR__ . '/../install.sql';
|
||||
if (!is_file(\$installSqlFile)) {
|
||||
return;
|
||||
}
|
||||
\$installSql = file_get_contents(\$installSqlFile);
|
||||
preg_match_all('/CREATE TABLE `(.+?)`/si', \$installSql, \$matches);
|
||||
\$dropSql = '';
|
||||
foreach (\$matches[1] as \$table) {
|
||||
\$dropSql .= "DROP TABLE IF EXISTS `\$table`;\\n";
|
||||
}
|
||||
file_put_contents(\$uninstallSqlFile, \$dropSql);
|
||||
static::importSql(\$uninstallSqlFile);
|
||||
unlink(\$uninstallSqlFile);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入数据库
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function importSql(\$mysqlDumpFile)
|
||||
{
|
||||
if (!\$mysqlDumpFile || !is_file(\$mysqlDumpFile)) {
|
||||
return;
|
||||
}
|
||||
foreach (explode(';', file_get_contents(\$mysqlDumpFile)) as \$sql) {
|
||||
if (\$sql = trim(\$sql)) {
|
||||
try {
|
||||
Db::connection(static::\$connection)->statement(\$sql);
|
||||
} catch (Throwable \$e) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
EOF;
|
||||
@ -271,6 +348,14 @@ EOF;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @return void
|
||||
*/
|
||||
protected function createInstallSqlFile($file)
|
||||
{
|
||||
file_put_contents($file, '');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $base
|
||||
* @param $name
|
||||
|
||||
42
vendor/webman/console/src/Commands/AppPluginUpdateCommand.php
vendored
Normal file
42
vendor/webman/console/src/Commands/AppPluginUpdateCommand.php
vendored
Normal file
@ -0,0 +1,42 @@
|
||||
<?php
|
||||
|
||||
namespace Webman\Console\Commands;
|
||||
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Webman\Console\Util;
|
||||
|
||||
class AppPluginUpdateCommand extends Command
|
||||
{
|
||||
protected static $defaultName = 'app-plugin:update';
|
||||
protected static $defaultDescription = 'App Plugin Update';
|
||||
|
||||
/**
|
||||
* @return void
|
||||
*/
|
||||
protected function configure()
|
||||
{
|
||||
$this->addArgument('name', InputArgument::REQUIRED, 'App plugin name');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param InputInterface $input
|
||||
* @param OutputInterface $output
|
||||
* @return int
|
||||
*/
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
$name = $input->getArgument('name');
|
||||
$output->writeln("Update App Plugin $name");
|
||||
$class = "\\plugin\\$name\\api\\Install";
|
||||
if (!method_exists($class, 'update')) {
|
||||
throw new \RuntimeException("Method $class::update not exists");
|
||||
}
|
||||
call_user_func([$class, 'update'], config("plugin.$name.app.version"), config("plugin.$name.app.version"));
|
||||
return self::SUCCESS;
|
||||
}
|
||||
|
||||
}
|
||||
@ -6,6 +6,7 @@ use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
use Webman\Console\Util;
|
||||
|
||||
|
||||
@ -41,7 +42,7 @@ class MakeBootstrapCommand extends Command
|
||||
$upper = $bootstrap_str === 'Bootstrap';
|
||||
if (!($pos = strrpos($name, '/'))) {
|
||||
$name = ucfirst($name);
|
||||
$file = app_path() . "/$bootstrap_str/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $bootstrap_str . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = $upper ? 'App\Bootstrap' : 'app\bootstrap';
|
||||
} else {
|
||||
if($real_name = Util::guessPath(app_path(), $name)) {
|
||||
@ -54,10 +55,18 @@ class MakeBootstrapCommand extends Command
|
||||
}
|
||||
$path = "$bootstrap_str/" . substr($upper ? ucfirst($name) : $name, 0, $pos);
|
||||
$name = ucfirst(substr($name, $pos + 1));
|
||||
$file = app_path() . "/$path/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = str_replace('/', '\\', ($upper ? 'App/' : 'app/') . $path);
|
||||
}
|
||||
|
||||
if (is_file($file)) {
|
||||
$helper = $this->getHelper('question');
|
||||
$question = new ConfirmationQuestion("$file already exists. Do you want to override it? (yes/no)", false);
|
||||
if (!$helper->ask($input, $output, $question)) {
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
$this->createBootstrap($name, $namespace, $file);
|
||||
if ($enable) {
|
||||
$this->addConfig("$namespace\\$name", config_path() . '/bootstrap.php');
|
||||
|
||||
@ -6,6 +6,7 @@ use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
use Webman\Console\Util;
|
||||
|
||||
|
||||
@ -42,9 +43,18 @@ class MakeCommandCommand extends Command
|
||||
foreach ($items as $item) {
|
||||
$name.=ucfirst($item);
|
||||
}
|
||||
$file = app_path() . "/$command_str/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $command_str . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$upper = $command_str === 'Command';
|
||||
$namespace = $upper ? 'App\Command' : 'app\command';
|
||||
|
||||
if (is_file($file)) {
|
||||
$helper = $this->getHelper('question');
|
||||
$question = new ConfirmationQuestion("$file already exists. Do you want to override it? (yes/no)", false);
|
||||
if (!$helper->ask($input, $output, $question)) {
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
$this->createCommand($name, $namespace, $file, $command);
|
||||
|
||||
return self::SUCCESS;
|
||||
|
||||
@ -6,6 +6,7 @@ use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
use Webman\Console\Util;
|
||||
|
||||
|
||||
@ -41,7 +42,7 @@ class MakeControllerCommand extends Command
|
||||
if (!($pos = strrpos($name, '/'))) {
|
||||
$name = ucfirst($name);
|
||||
$controller_str = Util::guessPath(app_path(), 'controller') ?: 'controller';
|
||||
$file = app_path() . "/$controller_str/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $controller_str . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = $controller_str === 'Controller' ? 'App\Controller' : 'app\controller';
|
||||
} else {
|
||||
$name_str = substr($name, 0, $pos);
|
||||
@ -60,9 +61,18 @@ class MakeControllerCommand extends Command
|
||||
}
|
||||
$path = "$name_str/" . ($upper ? 'Controller' : 'controller');
|
||||
$name = ucfirst(substr($name, $pos + 1));
|
||||
$file = app_path() . "/$path/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = str_replace('/', '\\', ($upper ? 'App/' : 'app/') . $path);
|
||||
}
|
||||
|
||||
if (is_file($file)) {
|
||||
$helper = $this->getHelper('question');
|
||||
$question = new ConfirmationQuestion("$file already exists. Do you want to override it? (yes/no)", false);
|
||||
if (!$helper->ask($input, $output, $question)) {
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
$this->createController($name, $namespace, $file);
|
||||
|
||||
return self::SUCCESS;
|
||||
|
||||
@ -6,6 +6,7 @@ use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
use Webman\Console\Util;
|
||||
|
||||
|
||||
@ -39,7 +40,7 @@ class MakeMiddlewareCommand extends Command
|
||||
$upper = $middleware_str === 'Middleware';
|
||||
if (!($pos = strrpos($name, '/'))) {
|
||||
$name = ucfirst($name);
|
||||
$file = app_path() . "/$middleware_str/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $middleware_str . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = $upper ? 'App\Middleware' : 'app\middleware';
|
||||
} else {
|
||||
if($real_name = Util::guessPath(app_path(), $name)) {
|
||||
@ -52,10 +53,18 @@ class MakeMiddlewareCommand extends Command
|
||||
}
|
||||
$path = "$middleware_str/" . substr($upper ? ucfirst($name) : $name, 0, $pos);
|
||||
$name = ucfirst(substr($name, $pos + 1));
|
||||
$file = app_path() . "/$path/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = str_replace('/', '\\', ($upper ? 'App/' : 'app/') . $path);
|
||||
}
|
||||
|
||||
|
||||
if (is_file($file)) {
|
||||
$helper = $this->getHelper('question');
|
||||
$question = new ConfirmationQuestion("$file already exists. Do you want to override it? (yes/no)", false);
|
||||
if (!$helper->ask($input, $output, $question)) {
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
$this->createMiddleware($name, $namespace, $file);
|
||||
|
||||
return self::SUCCESS;
|
||||
@ -84,9 +93,9 @@ use Webman\Http\Request;
|
||||
|
||||
class $name implements MiddlewareInterface
|
||||
{
|
||||
public function process(Request \$request, callable \$next) : Response
|
||||
public function process(Request \$request, callable \$handler) : Response
|
||||
{
|
||||
return \$next(\$request);
|
||||
return \$handler(\$request);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@ use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
use Webman\Console\Util;
|
||||
|
||||
|
||||
@ -42,7 +43,7 @@ class MakeModelCommand extends Command
|
||||
if (!($pos = strrpos($name, '/'))) {
|
||||
$name = ucfirst($name);
|
||||
$model_str = Util::guessPath(app_path(), 'model') ?: 'model';
|
||||
$file = app_path() . "/$model_str/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $model_str . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = $model_str === 'Model' ? 'App\Model' : 'app\model';
|
||||
} else {
|
||||
$name_str = substr($name, 0, $pos);
|
||||
@ -61,7 +62,7 @@ class MakeModelCommand extends Command
|
||||
}
|
||||
$path = "$name_str/" . ($upper ? 'Model' : 'model');
|
||||
$name = ucfirst(substr($name, $pos + 1));
|
||||
$file = app_path() . "/$path/$name.php";
|
||||
$file = app_path() . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . "$name.php";
|
||||
$namespace = str_replace('/', '\\', ($upper ? 'App/' : 'app/') . $path);
|
||||
}
|
||||
if (!$type) {
|
||||
@ -75,6 +76,15 @@ class MakeModelCommand extends Command
|
||||
}
|
||||
$type = !$database && $thinkorm ? 'tp' : 'laravel';
|
||||
}
|
||||
|
||||
if (is_file($file)) {
|
||||
$helper = $this->getHelper('question');
|
||||
$question = new ConfirmationQuestion("$file already exists. Do you want to override it? (yes/no)", false);
|
||||
if (!$helper->ask($input, $output, $question)) {
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
if ($type == 'tp') {
|
||||
$this->createTpModel($name, $namespace, $file, $connection);
|
||||
} else {
|
||||
|
||||
8
vendor/webman/console/src/webman
vendored
8
vendor/webman/console/src/webman
vendored
@ -27,9 +27,11 @@ if (is_dir($command_path = Util::guessPath(app_path(), '/command', true))) {
|
||||
|
||||
foreach (config('plugin', []) as $firm => $projects) {
|
||||
if (isset($projects['app'])) {
|
||||
if ($command_str = Util::guessPath(base_path() . "/plugin/$firm", 'command')) {
|
||||
$command_path = base_path() . "/plugin/$firm/$command_str";
|
||||
$cli->installCommands($command_path, "plugin\\$firm\\$command_str");
|
||||
foreach (['', '/app'] as $app) {
|
||||
if ($command_str = Util::guessPath(base_path() . "/plugin/$firm{$app}", 'command')) {
|
||||
$command_path = base_path() . "/plugin/$firm{$app}/$command_str";
|
||||
$cli->installCommands($command_path, "plugin\\$firm" . str_replace('/', '\\', $app) . "\\$command_str");
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($projects as $name => $project) {
|
||||
|
||||
@ -208,7 +208,9 @@ class App
|
||||
{
|
||||
if (
|
||||
!$path ||
|
||||
strpos($path, '..') !== false ||
|
||||
$path[0] !== '/' ||
|
||||
strpos($path, '/../') !== false ||
|
||||
substr($path, -3) === '/..' ||
|
||||
strpos($path, "\\") !== false ||
|
||||
strpos($path, "\0") !== false
|
||||
) {
|
||||
@ -227,7 +229,7 @@ class App
|
||||
*/
|
||||
protected static function getFallback(string $plugin = ''): Closure
|
||||
{
|
||||
// when route, controller and action not found, try to use Route::fallback
|
||||
// When route, controller and action not found, try to use Route::fallback
|
||||
return Route::getFallback($plugin) ?: function () {
|
||||
try {
|
||||
$notFoundContent = file_get_contents(static::$publicPath . '/404.html');
|
||||
|
||||
@ -16,6 +16,7 @@ namespace support;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Database\Capsule\Manager;
|
||||
use Illuminate\Database\Connection;
|
||||
|
||||
/**
|
||||
* Class Db
|
||||
@ -32,5 +33,19 @@ use Illuminate\Database\Capsule\Manager;
|
||||
*/
|
||||
class Db extends Manager
|
||||
{
|
||||
/**
|
||||
* @return Manager
|
||||
*/
|
||||
public static function getInstance()
|
||||
{
|
||||
return static::$instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Connection[]
|
||||
*/
|
||||
public static function getConnections()
|
||||
{
|
||||
return static::$instance->getDatabaseManager()->getConnections();
|
||||
}
|
||||
}
|
||||
@ -86,7 +86,7 @@ class LaravelDb implements Bootstrap
|
||||
Timer::add(55, function () use ($default, $connections, $capsule) {
|
||||
foreach ($capsule->getDatabaseManager()->getConnections() as $connection) {
|
||||
/* @var MySqlConnection $connection **/
|
||||
if ($connection->getConfig('driver') == 'mysql') {
|
||||
if ($connection->getConfig('driver') == 'mysql' && $connection->getRawPdo()) {
|
||||
try {
|
||||
$connection->select('select 1');
|
||||
} catch (Throwable $e) {}
|
||||
|
||||
@ -55,7 +55,7 @@ class Blade implements View
|
||||
static $views = [];
|
||||
$request = request();
|
||||
$plugin = $plugin === null ? ($request->plugin ?? '') : $plugin;
|
||||
$app = $app === null ? $request->app : $app;
|
||||
$app = $app === null ? ($request->app ?? '') : $app;
|
||||
$configPrefix = $plugin ? "plugin.$plugin." : '';
|
||||
$baseViewPath = $plugin ? base_path() . "/plugin/$plugin/app" : app_path();
|
||||
$key = "$plugin-$app";
|
||||
@ -67,7 +67,9 @@ class Blade implements View
|
||||
$extension($views[$key]);
|
||||
}
|
||||
}
|
||||
$vars = array_merge((array) $request->_view_vars, $vars);
|
||||
if(isset($request->_view_vars)) {
|
||||
$vars = array_merge((array)$request->_view_vars, $vars);
|
||||
}
|
||||
return $views[$key]->render($template, $vars);
|
||||
}
|
||||
}
|
||||
|
||||
@ -58,11 +58,13 @@ class Raw implements View
|
||||
$plugin = $plugin === null ? ($request->plugin ?? '') : $plugin;
|
||||
$configPrefix = $plugin ? "plugin.$plugin." : '';
|
||||
$viewSuffix = config("{$configPrefix}view.options.view_suffix", 'html');
|
||||
$app = $app === null ? $request->app : $app;
|
||||
$app = $app === null ? ($request->app ?? '') : $app;
|
||||
$baseViewPath = $plugin ? base_path() . "/plugin/$plugin/app" : app_path();
|
||||
$__template_path__ = $app === '' ? "$baseViewPath/view/$template.$viewSuffix" : "$baseViewPath/$app/view/$template.$viewSuffix";
|
||||
|
||||
extract((array) $request->_view_vars);
|
||||
if(isset($request->_view_vars)) {
|
||||
extract((array)$request->_view_vars);
|
||||
}
|
||||
extract($vars);
|
||||
ob_start();
|
||||
// Try to include php file.
|
||||
|
||||
@ -55,7 +55,7 @@ class ThinkPHP implements View
|
||||
{
|
||||
$request = request();
|
||||
$plugin = $plugin === null ? ($request->plugin ?? '') : $plugin;
|
||||
$app = $app === null ? $request->app : $app;
|
||||
$app = $app === null ? ($request->app ?? '') : $app;
|
||||
$configPrefix = $plugin ? "plugin.$plugin." : '';
|
||||
$viewSuffix = config("{$configPrefix}view.options.view_suffix", 'html');
|
||||
$baseViewPath = $plugin ? base_path() . "/plugin/$plugin/app" : app_path();
|
||||
@ -68,7 +68,9 @@ class ThinkPHP implements View
|
||||
$options = array_merge($defaultOptions, config("{$configPrefix}view.options", []));
|
||||
$views = new Template($options);
|
||||
ob_start();
|
||||
$vars = array_merge((array) $request->_view_vars, $vars);
|
||||
if(isset($request->_view_vars)) {
|
||||
$vars = array_merge((array)$request->_view_vars, $vars);
|
||||
}
|
||||
$views->fetch($template, $vars);
|
||||
return ob_get_clean();
|
||||
}
|
||||
|
||||
@ -57,7 +57,7 @@ class Twig implements View
|
||||
static $views = [];
|
||||
$request = request();
|
||||
$plugin = $plugin === null ? ($request->plugin ?? '') : $plugin;
|
||||
$app = $app === null ? $request->app : $app;
|
||||
$app = $app === null ? ($request->app ?? '') : $app;
|
||||
$configPrefix = $plugin ? "plugin.$plugin." : '';
|
||||
$viewSuffix = config("{$configPrefix}view.options.view_suffix", 'html');
|
||||
$key = "$plugin-$app";
|
||||
@ -70,7 +70,9 @@ class Twig implements View
|
||||
$extension($views[$key]);
|
||||
}
|
||||
}
|
||||
$vars = array_merge((array) $request->_view_vars, $vars);
|
||||
if(isset($request->_view_vars)) {
|
||||
$vars = array_merge((array)$request->_view_vars, $vars);
|
||||
}
|
||||
return $views[$key]->render("$template.$viewSuffix", $vars);
|
||||
}
|
||||
}
|
||||
|
||||
8
webman
8
webman
@ -27,9 +27,11 @@ if (is_dir($command_path = Util::guessPath(app_path(), '/command', true))) {
|
||||
|
||||
foreach (config('plugin', []) as $firm => $projects) {
|
||||
if (isset($projects['app'])) {
|
||||
if ($command_str = Util::guessPath(base_path() . "/plugin/$firm", 'command')) {
|
||||
$command_path = base_path() . "/plugin/$firm/$command_str";
|
||||
$cli->installCommands($command_path, "plugin\\$firm\\$command_str");
|
||||
foreach (['', '/app'] as $app) {
|
||||
if ($command_str = Util::guessPath(base_path() . "/plugin/$firm{$app}", 'command')) {
|
||||
$command_path = base_path() . "/plugin/$firm{$app}/$command_str";
|
||||
$cli->installCommands($command_path, "plugin\\$firm" . str_replace('/', '\\', $app) . "\\$command_str");
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($projects as $name => $project) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user