优惠退出BUG,首页升级检测,优化运行时间
This commit is contained in:
parent
73c046b051
commit
f17af17419
@ -225,6 +225,7 @@ class Admin extends AdminController
|
|||||||
//退出登陆
|
//退出登陆
|
||||||
public function logout()
|
public function logout()
|
||||||
{
|
{
|
||||||
|
Cookie::delete('adminAuth');
|
||||||
Session::clear();
|
Session::clear();
|
||||||
$res = ['code'=>0,'msg'=>'退出成功' ];
|
$res = ['code'=>0,'msg'=>'退出成功' ];
|
||||||
|
|
||||||
|
@ -15,17 +15,27 @@ use taoler\com\Api;
|
|||||||
|
|
||||||
class Index extends AdminController
|
class Index extends AdminController
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
protected function initialize()
|
protected function initialize()
|
||||||
{
|
{
|
||||||
parent::initialize();
|
parent::initialize();
|
||||||
$this->domain = Request::scheme().'://www.'.Request::rootDomain();
|
}
|
||||||
$this->api = Db::name('system')->where('id',1)->value('api_url');
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->sys_version = Config::get('taoler.version');
|
||||||
|
$this->sys = Db::name('system')->where('id',1)->find();
|
||||||
|
|
||||||
|
$this->domain = Request::scheme().'://'.$this->sys['domain'];
|
||||||
|
$this->api = $this->sys['api_url'];
|
||||||
if(empty($this->api)){
|
if(empty($this->api)){
|
||||||
$baseUrl = Db::name('system')->where('id',1)->value('base_url');
|
$baseUrl = $this->sys['base_url'];
|
||||||
$this->api = strstr($baseUrl,'/v',true);
|
$this->api = strstr($baseUrl,'/v',true);
|
||||||
}
|
}
|
||||||
}
|
// 控制器初始化显示左侧导航菜单
|
||||||
|
parent::initialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
@ -43,14 +53,31 @@ class Index extends AdminController
|
|||||||
return view();
|
return view();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function home(){
|
public function home()
|
||||||
$sys = Db::name('system')->find(1);
|
{
|
||||||
|
//版本检测
|
||||||
|
$url = $this->sys['upcheck_url'].'?ver='.$this->sys_version;
|
||||||
|
$versions = Api::urlGet($url);
|
||||||
|
if($versions->code == 1){
|
||||||
|
if($versions->up_num > 0){
|
||||||
|
$versions = "当前有{$versions->up_num}个版本需更新,当前可更新至{$versions->version}";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$versions ='当前无可更新版本';
|
||||||
|
}
|
||||||
|
//运行时间
|
||||||
$now = time();
|
$now = time();
|
||||||
$count = $now-$sys['create_time'];
|
$count = $now-$this->sys['create_time'];
|
||||||
$days = floor($count/86400);
|
$days = floor($count/86400);
|
||||||
$hos = floor(($count%86400)/3600);
|
$hos = floor(($count%86400)/3600);
|
||||||
$mins = floor(($count%3600)/60);
|
$mins = floor(($count%3600)/60);
|
||||||
View::assign(['sys'=>$sys,'day'=>$days,'hos'=>$hos,'mins'=>$mins]);
|
$years = floor($days/365);
|
||||||
|
if($years >= 1){
|
||||||
|
$days = floor($days%365);
|
||||||
|
}
|
||||||
|
$runTime = $years ? "{$years}年{$days}天{$hos}时{$mins}分" : "{$days}天{$hos}时{$mins}分";
|
||||||
|
|
||||||
|
View::assign(['runTime'=>$runTime,'versions'=>$versions]);
|
||||||
return View::fetch();
|
return View::fetch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,6 +5,11 @@
|
|||||||
<div class="layui-row layui-col-space15">
|
<div class="layui-row layui-col-space15">
|
||||||
<div class="layui-col-md8">
|
<div class="layui-col-md8">
|
||||||
<div class="layui-row layui-col-space15">
|
<div class="layui-row layui-col-space15">
|
||||||
|
<div class="layui-col-md12">
|
||||||
|
<div class="layui-card">
|
||||||
|
<div class="layui-card-header"><span style="color:red">{$versions}</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="layui-col-md6">
|
<div class="layui-col-md6">
|
||||||
<div class="layui-card">
|
<div class="layui-card">
|
||||||
<div class="layui-card-header">快捷方式</div>
|
<div class="layui-card-header">快捷方式</div>
|
||||||
@ -247,7 +252,7 @@
|
|||||||
<td>运行时间</td>
|
<td>运行时间</td>
|
||||||
<td>
|
<td>
|
||||||
<script type="text/html" template>
|
<script type="text/html" template>
|
||||||
{$day}天{$hos}时{$mins}分
|
{$runTime}
|
||||||
</script>
|
</script>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
Loading…
Reference in New Issue
Block a user