diff --git a/module/upgrade/js/consistency.ui.js b/module/upgrade/js/consistency.ui.js index ef031d4722..992bc97d89 100644 --- a/module/upgrade/js/consistency.ui.js +++ b/module/upgrade/js/consistency.ui.js @@ -2,6 +2,7 @@ function updateProgressInterval() { $.get($.createLink('upgrade', 'ajaxFixConsistency', 'version=' + version)); logOffset = 0; + prevLog = ''; interval = setInterval(function() { var url = $.createLink('upgrade', 'ajaxGetFixLogs', 'offset=' + logOffset); @@ -9,7 +10,11 @@ function updateProgressInterval() { logOffset = result.offset; - if(result.log) $('#logBox').append(result.log); + if(result.log && prevLog != result.log) + { + $('#logBox').append(result.log); + prevLog = result.log; + } $('#progressBox').html(result.progress + '%'); let element = document.getElementById('logBox'); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 5dcb205cf9..2e54664f01 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -612,7 +612,7 @@ class upgradeModel extends model /* 记录执行的sql并且记录执行结果。 */ /* Record the executed sql and the result. */ $sqlLines = explode(';', $fixSqls); - file_put_contents($logFile, count($sqlLines) . "\n", FILE_APPEND); + file_put_contents($logFile, count($sqlLines) . "\n"); foreach($sqlLines as $fixSQL) { file_put_contents($logFile, $fixSQL, FILE_APPEND);