lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-24 03:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix update from 1.5 error

Browse Source
This commit is contained in:
xiaomlove
2022-03-08 21:01:12 +08:00
parent 98a33baf81
commit 57569d7c51
5 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nexus/Install/Install.php
+10 -4
View File
@@ -106,7 +106,7 @@ class Install
$filename = basename($path);
$count = preg_match('/create_(.*)_table.php/', $filename, $matches);
if ($count) {
$tables[$matches[1]] = $filename;
$tables[$matches[1]] = "database/migrations/$filename";
}
}
return $tables;
@@ -202,7 +202,7 @@ class Install
require $originalConfigFile;
$settings = require $defaultSettingsFile;
$settingsFromDb = [];
if (get_row_count('settings') > 0) {
if (NexusDB::schema()->hasTable('settings') && get_row_count('settings') > 0) {
$settingsFromDb = get_setting();
}
$this->doLog("settings form db: " . json_encode($settingsFromDb));
@@ -424,7 +424,7 @@ class Install
$this->doLog("[CREATE ENV] key: $key, new value: $value from example.");
$newData[$key] = $value;
}
if ($scene == 'install') {
if ($scene == 'install' || !file_exists($envFile)) {
if ($key == 'APP_ENV') {
$newData[$key] = 'production';
}
@@ -487,6 +487,9 @@ class Install
public function saveSettings($settings)
{
if (!NexusDB::schema()->hasTable('settings')) {
$this->runMigrate('database/migrations/2021_06_08_113437_create_settings_table.php');
}
foreach ($settings as $prefix => $group) {
$this->doLog("[SAVE SETTING], prefix: $prefix, nameAndValues: " . json_encode($group));
saveSetting($prefix, $group);
@@ -549,7 +552,9 @@ class Install
}
$command = "php " . ROOT_PATH . "artisan migrate";
if (!is_null($path)) {
$command .= " --path=$path";
foreach ((array)$path as $key => $value) {
$command .= " --path=$value";
}
}
$command .= " --force";
$this->executeCommand($command);
@@ -582,4 +587,5 @@ class Install
$this->doLog("[DATABASE_SEED] success.");
}
}
}
nexus/Install/Update.php
+1
View File
@@ -194,6 +194,7 @@ class Update extends Install
} else {
$this->doLog("no need to run [MIGRATE_TORRENT_TAG]");
}
}
private function migrateAttendance()
nexus/Install/update/update.php
+14 -3
View File
@@ -44,6 +44,13 @@ if ($currentStep == 2) {
'name' => 'Description',
'published_at' => 'Release at',
];
try {
$timezone = nexus_env('TIMEZONE');
} catch (\Exception $exception) {
$update->doLog("no .env file, release time is github original");
$timezone = null;
}
$tableRows[] = [
'checkbox' => sprintf('<input type="radio" name="version_url" value="manual"/>'),
'tag_name' => 'Manual',
@@ -51,8 +58,10 @@ if ($currentStep == 2) {
'published_at' => '---',
];
$latestCommit = $update->getLatestCommit();
$time = \Carbon\Carbon::parse($latestCommit['committer']['date']);
$time->tz = nexus_env('TIMEZONE');
$time = \Carbon\Carbon::parse($latestCommit['commit']['committer']['date']);
if ($timezone) {
$time->tz = $timezone;
}
$tableRows[] = [
'checkbox' => sprintf('<input type="radio" name="version_url" value="development|%s"/>', $latestCommit['sha']),
'tag_name' => 'Latest development code',
@@ -64,7 +73,9 @@ if ($currentStep == 2) {
continue;
}
$time = \Carbon\Carbon::parse($version['published_at']);
$time->tz = nexus_env('TIMEZONE');
if ($timezone) {
$time->tz = $timezone;
}
$versionUrl = $version['tag_name'] . '|' . $version['tarball_url'];
$checked = !empty($_REQUEST['version_url']) && $_REQUEST['version_url'] == $versionUrl ? ' checked' : '';
$tableRows[] = [