version 4.1 release

pull/212/head
warlee 2017-09-07 19:48:56 +08:00
parent 4b6e9822ff
commit edfed0c318
38 changed files with 106 additions and 91 deletions

View File

@ -54,7 +54,7 @@ class user extends Controller{
if(in_array(ACT,$this->notCheckACT)) return;//不需要判断的action
if(in_array(ST.'.'.ACT,$this->notCheckApp)) return;//不需要判断的对应入口
if(isset($_SESSION['kodLogin']) && $_SESSION['kodLogin']===true){
if(isset($_SESSION['kodLogin']) && $_SESSION['kodLogin']===true && $this->user){
$user = systemMember::getInfo($this->user['userID']);
$this->_loginSuccess($user);
return;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
3da99D58Peis1s2dd7GSYD4GrWpjzK9lLbakz2q2VFETxpTNv6CZYpXHg3Vg0W0J

View File

@ -1 +0,0 @@
b6d9RfH-GxWoMzhjQrmq11aRkzAOgg06K-Wjt6uk7-PYyOuD5Ucy1KHvEKqxOXAT

View File

@ -20,6 +20,16 @@ class toolsCommonPlugin extends PluginBase{
$system = DATA_PATH.'system/';
$bakcupLast = $system.'backup/last/';
$backupLastDay = $system.'backup/day/'.date('Ymd',time()).'/';
//每N天备份一次;首次备份当天
$backupRepeat = 5;
$day = intval(date('d',time()));
if( !@file_exists($bakcupLast) ||
(!@file_exists($backupLastDay) && $day % $backupRepeat == 0)
){
mk_dir($backupLastDay);
$this->backupTo($backupLastDay);
}
//每天覆盖备份一次
if(!@file_exists($bakcupLast)){
@ -30,16 +40,6 @@ class toolsCommonPlugin extends PluginBase{
if(time() - $lastTime > 60*60*24){
$this->backupTo($bakcupLast);
}
//每N天备份一次;
$backupRepeat = 5;
if(intval(date('d',time())) % $backupRepeat == 0){
if(@file_exists($backupLastDay)){
return;
}
mk_dir($backupLastDay);
$this->backupTo($backupLastDay);
}
}
private function backupTo($folder){
$system = DATA_PATH.'system/';

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long