muzi
/
apeblog
mirror of https://github.com/1099438829/apeblog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正

This commit is contained in:
liyukun 2021-11-03 22:39:02 +08:00
parent ad78a38601
commit b763d9f8c3
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/admin/controller/Databases.php
View File

@ -273,8 +273,8 @@ class Databases extends AuthController
public function import(){ public function import(){
$data = Util::postMore([ $data = Util::postMore([
['key',''], ['key',''],
['part',''], ['part',null],
['start',''], ['start',null],
]); ]);
if(is_numeric($data['key']) && is_null($data['part']) && is_null($data['start'])){ //初始化 if(is_numeric($data['key']) && is_null($data['part']) && is_null($data['start'])){ //初始化
//获取备份文件信息 //获取备份文件信息
@ -294,9 +294,9 @@ class Databases extends AuthController
$last = end($list); $last = end($list);
if(count($list) === $last[0]){ if(count($list) === $last[0]){
session('backup_list', $list); //缓存备份列表 session('backup_list', $list); //缓存备份列表
return app("json")->success("初始化完成",'code'); return app("json")->success("初始化完成",array('part' => 1, 'start' => 0));
} else { } else {
return app("json")->fail("备份文件可能已经损坏，请检查",'code'); return app("json")->fail("备份文件可能已经损坏，请检查");
} }
} elseif(is_numeric($data['part']) && is_numeric($data['start'])) { } elseif(is_numeric($data['part']) && is_numeric($data['start'])) {
$list = session('backup_list'); $list = session('backup_list');
@ -313,7 +313,7 @@ class Databases extends AuthController
return app("json")->success("正在还原...#{$data['part']}",'code'); return app("json")->success("正在还原...#{$data['part']}",'code');
} else { } else {
session('backup_list', null); session('backup_list', null);
return app("json")->success("还原完成",'code'); return app("json")->success("还原完成");
} }
} else { } else {
$data = array('part' => $data['part'], 'start' => $data['start'][0]); $data = array('part' => $data['part'], 'start' => $data['start'][0]);

20
app/admin/view/databases/import.html
View File

@ -73,12 +73,12 @@
events: { events: {
'click .btn-import': function (event, value, row, index) { 'click .btn-import': function (event, value, row, index) {
var self = this, status = "."; var self = this, status = ".";
$.get("/admin/databases/import", success, "json"); $.post("/admin/databases/import", {"key":row.key}, success, "json");
window.onbeforeunload = function(){ return "正在还原数据库，请不要关闭！" } window.onbeforeunload = function(){ return "正在还原数据库，请不要关闭！" }
return false; return false;
function success(data){ function success(data){
if(data.code){ if(data.status){
console.log(data)
if(data.gz){ if(data.gz){
data.msg += status; data.msg += status;
if(status.length === 5){ if(status.length === 5){
@ -87,10 +87,15 @@
status += "."; status += ".";
} }
} }
$(self).parent().prev().text(data.msg); $('#tb_departments').bootstrapTable('updateRow',{
index: index,
row: {
status: data.msg,
}
})
if(data.data.part){ if(data.data.part){
$.get(self.href, $.post("/admin/databases/import",
{"part" : data.data.part, "start" : data.data.start}, {"key":row.key,"part" : data.data.part, "start" : data.data.start},
success, success,
"json" "json"
); );
@ -98,7 +103,8 @@
window.onbeforeunload = function(){ return null; } window.onbeforeunload = function(){ return null; }
} }
} else { } else {
top.layer.msg(data.msg?data.msg:'操作失败',{icon: 2,time:data.wait*1000}); parent.lightyear.notify(data.msg?data.msg:'操作失败', 'danger', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
return false;
} }
} }
}, },