Skip to content

李洋 / 消息系统

Go to a project
Commit 1727f2a7 by gongyang
Options

Merge remote-tracking branch 'origin/master'

parents dca1ded1 5d697ff3
Inline Side-by-side
Showing with 40 additions and 11 deletions
app/Http/Controllers/MessageController.php
...@@ -122,6 +122,7 @@ class MessageController extends Controller ...@@ -122,6 +122,7 @@ class MessageController extends Controller
'options' => '[]', 'options' => '[]',
'referer' => $referer, 'referer' => $referer,
]; ];
return view($viewid, $data); return view($viewid, $data);
} }
...@@ -136,7 +137,6 @@ class MessageController extends Controller ...@@ -136,7 +137,6 @@ class MessageController extends Controller
if ($menuconfig && !($menus = json_decode($menuconfig->config_data))) if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
$menus = []; $menus = [];
$referer = $this->get_referer($request); $referer = $this->get_referer($request);
$data = [ $data = [
'header' => $request->user->header, 'header' => $request->user->header,
...@@ -460,12 +460,16 @@ class MessageController extends Controller ...@@ -460,12 +460,16 @@ class MessageController extends Controller
// 添加手动发送消息(会创建模板) // 添加手动发送消息(会创建模板)
private function sendmanualmessage(Request $request, $id, $viewid) private function sendmanualmessage(Request $request, $id, $viewid)
{ {
Csrf($request);
$perms_arr = ['manualmessage_send']; $perms_arr = ['manualmessage_send'];
$res_perm = $this->getUserPerms($request,$perms_arr); $res_perm = $this->getUserPerms($request,$perms_arr);
$manualmessage_send = $res_perm['manualmessage_send']; $manualmessage_send = $res_perm['manualmessage_send'];
if(!$manualmessage_send){
die("您没有权限查看");
}
//为所有历史消息的操作类型赋值 //为所有历史消息的操作类型赋值
$op_type = ''; $op_type = '';
if(empty($request['op_type'])) if(empty($request['op_type']))
...@@ -643,7 +647,7 @@ class MessageController extends Controller ...@@ -643,7 +647,7 @@ class MessageController extends Controller
//区分环境 //区分环境
$current_domain = $_SERVER['HTTP_HOST']; $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'); $bid = Config('msgconfig.perm_bid_local');
$perm_url = Config('msgconfig.perm_domain_local'); $perm_url = Config('msgconfig.perm_domain_local');
...@@ -672,7 +676,7 @@ class MessageController extends Controller ...@@ -672,7 +676,7 @@ class MessageController extends Controller
{ {
$current_domain = $_SERVER['HTTP_HOST']; $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'); return Config('msgconfig.config_id_local');
} }
...@@ -732,6 +736,9 @@ class MessageController extends Controller ...@@ -732,6 +736,9 @@ class MessageController extends Controller
{ {
$perms_arr = ['businessNotice']; $perms_arr = ['businessNotice'];
$res_perm = $this->getUserPerms($request,$perms_arr); $res_perm = $this->getUserPerms($request,$perms_arr);
if(!$res_perm || !$res_perm["businessNotice"]){
die("您没有权限查看");
}
$data=[ $data=[
'have_perm'=>$res_perm, 'have_perm'=>$res_perm,
'id'=>$id, 'id'=>$id,
......
app/Logic/SystemNoticeLogic.php
...@@ -408,6 +408,7 @@ class SystemNoticeLogic ...@@ -408,6 +408,7 @@ class SystemNoticeLogic
public function businessNoticeList($where) public function businessNoticeList($where)
{ {
$obj = (new BusinessNoticeModel())->getWhereObj($where); $obj = (new BusinessNoticeModel())->getWhereObj($where);
$returnData = $obj->paginate($where['limit'])->toArray(); $returnData = $obj->paginate($where['limit'])->toArray();
if(empty($returnData['data'])){ if(empty($returnData['data'])){
...@@ -423,7 +424,6 @@ class SystemNoticeLogic ...@@ -423,7 +424,6 @@ class SystemNoticeLogic
$value['top_status_cn'] = array_get(BusinessNoticeModel::$topCn,$value['top_status'],''); $value['top_status_cn'] = array_get(BusinessNoticeModel::$topCn,$value['top_status'],'');
$value['source_cn'] = array_get(BusinessNoticeModel::$sourceCn,$value['source'],''); $value['source_cn'] = array_get(BusinessNoticeModel::$sourceCn,$value['source'],'');
} }
return $returnData; return $returnData;
} }
......
config/database.php
...@@ -137,6 +137,7 @@ return [ ...@@ -137,6 +137,7 @@ return [
], ],
], ],
/* /*
......
config/msgconfig.php
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
return [ return [
//域名 //域名
'domain_local'=>'message.liexin.net', 'domain_local'=>env("DOMAIN_LOCAL","message.liexin.net"),
'domain_sz'=>'szmessage.ichunt.net', 'domain_sz'=>'szmessage.ichunt.net',
'domain_release'=>'message.ichunt.net', 'domain_release'=>'message.ichunt.net',
......
config/website.php
<?php <?php
return [ return [
'admin' => ['yyc@ichunt.com'], 'admin' => ['yyc@ichunt.com'],
......
public/.htaccess
<IfModule mod_rewrite.c>
<IfModule mod_negotiation.c>
Options -MultiViews -Indexes
</IfModule>
RewriteEngine On
# Handle Authorization Header
RewriteCond %{HTTP:Authorization} .
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
# Redirect Trailing Slashes If Not A Folder...
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_URI} (.+)/$
RewriteRule ^ %1 [L,R=301]
# Send Requests To Front Controller...
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]
</IfModule>
public/index.php
...@@ -55,6 +55,5 @@ $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); ...@@ -55,6 +55,5 @@ $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
$response = $kernel->handle( $response = $kernel->handle(
$request = Illuminate\Http\Request::capture() $request = Illuminate\Http\Request::capture()
); );
$response->send(); $response->send();
$kernel->terminate($request, $response); $kernel->terminate($request, $response);
public/js/public_notice.js
...@@ -25,13 +25,15 @@ layui.use([], function () { ...@@ -25,13 +25,15 @@ layui.use([], function () {
right2=365 right2=365
} }
const css = ` const css = `
.noticepoplk{font-size:14px;}
.noticepoplk .layui-form-label{ padding: 9px 15px!important;}
.nrtx{line-height:38px;} .nrtx{line-height:38px;}
.noticeitemxo{margin-right:30px;cursor: pointer;} .noticeitemxo{margin-right:30px;cursor: pointer;}
.fbggank{position:fixed;top:0;right:${right2}px;z-index:9999;top:9px;} .fbggank{position:fixed;top:0;right:${right2}px;z-index:9999;top:9px;background: #FFC400;}
#ann_box{position:fixed;top:0;left:${left}px;right:${right1}px;height:50px;line-height:50px;background:rgba(0,0,0,0);color:#333;overflow:hidden;z-index:9999;font-size:14px;} #ann_box{position:fixed;top:0;left:${left}px;right:${right1}px;height:50px;line-height:50px;background:rgba(0,0,0,0);color:#333;overflow:hidden;z-index:9999;font-size:14px;}
#ann_txt{white-space:nowrap;display:inline-block;padding-left:100%;animation:ann_scroll 200s linear infinite;} #ann_txt{white-space:nowrap;display:inline-block;padding-left:100%;animation:ann_scroll 200s linear infinite;}
@keyframes ann_scroll{0%{transform:translateX(0)}100%{transform:translateX(-100%)}}`; @keyframes ann_scroll{0%{transform:translateX(0)}100%{transform:translateX(-100%)}}`;
const html = `<div id="ann_box"><div id="ann_txt"></div></div><a class="layui-btn layui-btn-sm fbggank" href="http://message.ichunt.net/manage/businessNotice" target="_blank">发布公告</a>`; const html = `<div id="ann_box"><div id="ann_txt"></div></div><a class="layui-btn layui-btn-sm fbggank" href="https://message.ichunt.net/manage/businessNotice" target="_blank">发布公告</a>`;
document.head.insertAdjacentHTML('beforeend', `<style>${css}</style>`); document.head.insertAdjacentHTML('beforeend', `<style>${css}</style>`);
document.body.insertAdjacentHTML('afterbegin', html); document.body.insertAdjacentHTML('afterbegin', html);
pageS.getList() pageS.getList()
...@@ -99,7 +101,7 @@ layui.use([], function () { ...@@ -99,7 +101,7 @@ layui.use([], function () {
const obj_i= pageS.noticeList.filter(item=>item.business_notice_id==business_notice_id) const obj_i= pageS.noticeList.filter(item=>item.business_notice_id==business_notice_id)
console.log(obj_i) console.log(obj_i)
const conHtml_ = ` const conHtml_ = `
<div style="padding:20px;"> <div style="padding:20px;" class="noticepoplk">
<div class="layui-form-item " style="margin-bottom:0px;"> <div class="layui-form-item " style="margin-bottom:0px;">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label required">公告标题</label> <label class="layui-form-label required">公告标题</label>
......
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