Commit eaaaee50 by 孙龙

优化

parent 7e5d9965
......@@ -122,6 +122,7 @@ class MessageController extends Controller
'options' => '[]',
'referer' => $referer,
];
return view($viewid, $data);
}
......@@ -136,7 +137,6 @@ class MessageController extends Controller
if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
$menus = [];
$referer = $this->get_referer($request);
$data = [
'header' => $request->user->header,
......@@ -643,7 +643,7 @@ class MessageController extends Controller
//区分环境
$current_domain = $_SERVER['HTTP_HOST'];
if($current_domain === Config('msgconfig.domain_local'))
if($current_domain === Config('msgconfig.domain_local') || $current_domain === 'message.liexinlocal.com')
{
$bid = Config('msgconfig.perm_bid_local');
$perm_url = Config('msgconfig.perm_domain_local');
......@@ -672,7 +672,7 @@ class MessageController extends Controller
{
$current_domain = $_SERVER['HTTP_HOST'];
if($current_domain === Config('msgconfig.domain_local') || $current_domain === 'message.liexindev.net')
if($current_domain === Config('msgconfig.domain_local') || $current_domain === 'message.liexindev.net' || $current_domain === 'message.liexinlocal.com')
{
return Config('msgconfig.config_id_local');
}
......
......@@ -396,6 +396,7 @@ class SystemNoticeLogic
public function businessNoticeList($where)
{
$obj = (new BusinessNoticeModel())->getWhereObj($where);
$returnData = $obj->paginate($where['limit'])->toArray();
if(empty($returnData['data'])){
......@@ -411,7 +412,6 @@ class SystemNoticeLogic
$value['top_status_cn'] = array_get(BusinessNoticeModel::$topCn,$value['top_status'],'');
$value['source_cn'] = array_get(BusinessNoticeModel::$sourceCn,$value['source'],'');
}
return $returnData;
}
......
......@@ -137,6 +137,7 @@ return [
],
],
/*
......
......@@ -9,7 +9,7 @@
return [
//域名
'domain_local'=>'message.liexin.net',
'domain_local'=>env("DOMAIN_LOCAL","message.liexin.net"),
'domain_sz'=>'szmessage.ichunt.net',
'domain_release'=>'message.ichunt.net',
......
<?php
return [
'admin' => ['yyc@ichunt.com'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment