blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-06-07 20:48:09 +08:00
Code Issues Projects Releases Wiki Activity

fix(command): 修复迁移打包选项与发布清理逻辑

Browse Source
This commit is contained in:
Anyon 2026-04-02 13:19:30 +08:00
parent 27568cecfa
commit a58b8c0b29
2 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/think-library/src/support/command/Package.php
View File

@ -80,11 +80,13 @@ class Package extends Command
*/
private function createScheme(): bool
{
$force = $this->input->hasOption('force');
$force = boolval($this->input->getOption('force'));
$table = trim((string)$this->input->getOption('table'));
$all = boolval($this->input->getOption('all'));
// 接收指定打包数据表
if ($this->input->hasOption('table')) {
$tables = str2arr(strtr($this->input->getOption('table'), '|', ','));
} elseif ($this->input->hasOption('all')) {
if ($table !== '') {
$tables = str2arr(strtr($table, '|', ','));
} elseif ($all) {
[$tables] = SystemService::getTables();
} else {
$tables = Library::$sapp->config->get('phinx.tables', []);
@ -134,10 +136,12 @@ class Package extends Command
*/
private function createBackup(): bool
{
$backup = trim((string)$this->input->getOption('backup'));
$all = boolval($this->input->getOption('all'));
// 接收指定打包数据表
if ($this->input->hasOption('backup')) {
$tables = str2arr(strtr($this->input->getOption('backup'), '|', ','));
} elseif ($this->input->hasOption('all')) {
if ($backup !== '') {
$tables = str2arr(strtr($backup, '|', ','));
} elseif ($all) {
[$tables] = SystemService::getTables();
} else {
[$tables] = SystemService::getTables();

41
plugin/think-library/src/support/command/Publish.php
View File

@ -91,9 +91,50 @@ class Publish extends Command
// 复制数据库脚本
$frdir = rtrim($copy, '\/') . DIRECTORY_SEPARATOR . 'database';
$this->cleanupPublishedMigrations($frdir, syspath('database/migrations'));
ToolsExtend::copy($frdir, syspath('database/migrations'), [], $force, false);
}
/**
* 清理已改名但仍残留在根目录的旧迁移脚本.
*/
private function cleanupPublishedMigrations(string $source, string $target): void
{
if (!is_dir($source) || !is_dir($target)) {
return;
}
$sourceMigrations = [];
foreach (ToolsExtend::find($source, 1, function (\SplFileInfo $info) {
return $info->isFile() && strtolower($info->getExtension()) === 'php';
}) as $file) {
$name = basename($file);
if (preg_match('/^\d{14}_(.+\.php)$/', $name, $match)) {
$sourceMigrations[$match[1]] = $name;
}
}
if (empty($sourceMigrations)) {
return;
}
foreach (ToolsExtend::find($target, 1, function (\SplFileInfo $info) {
return $info->isFile() && strtolower($info->getExtension()) === 'php';
}) as $file) {
$name = basename($file);
if (!preg_match('/^(\d{14})_(.+\.php)$/', $name, $match)) {
continue;
}
[$version, $suffix] = [$match[1], $match[2]];
if (($sourceMigrations[$suffix] ?? $name) === $name) {
continue;
}
@unlink(rtrim($target, '\/') . DIRECTORY_SEPARATOR . $name);
if (is_dir($dataPath = rtrim($target, '\/') . DIRECTORY_SEPARATOR . $version)) {
ToolsExtend::remove($dataPath);
}
}
}
/**
* 解析 json 包.
* @return $this