Merge remote-tracking branch 'origin/master'

app/Http/Controllers/MessageController.php

@@ -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,
@@ -460,12 +460,16 @@ class MessageController extends Controller
     // 添加手动发送消息(会创建模板)
     private function sendmanualmessage(Request $request, $id, $viewid)
     {
-        Csrf($request);
+        
 
         $perms_arr = ['manualmessage_send'];
         $res_perm = $this->getUserPerms($request,$perms_arr);
         $manualmessage_send = $res_perm['manualmessage_send'];
 
+        if(!$manualmessage_send){
+            die("您没有权限查看");
+        }
+
         //为所有历史消息的操作类型赋值
         $op_type = '';
         if(empty($request['op_type']))
@@ -643,7 +647,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 +676,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');
         }
@@ -732,6 +736,9 @@ class MessageController extends Controller
     {
         $perms_arr = ['businessNotice'];
         $res_perm = $this->getUserPerms($request,$perms_arr);
+        if(!$res_perm || !$res_perm["businessNotice"]){
+            die("您没有权限查看");
+        }
         $data=[
             'have_perm'=>$res_perm,
             'id'=>$id,

app/Logic/SystemNoticeLogic.php

@@ -408,6 +408,7 @@ class SystemNoticeLogic
     public function businessNoticeList($where)
     {
         $obj = (new BusinessNoticeModel())->getWhereObj($where);
+        
         $returnData = $obj->paginate($where['limit'])->toArray();
 
         if(empty($returnData['data'])){
@@ -423,7 +424,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;
     }
 

config/database.php

@@ -137,6 +137,7 @@ return [
         ],
 
 
+
     ],
 
     /*

config/msgconfig.php

@@ -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',
 

config/website.php

 <?php
-
 return [
     '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);
 $response = $kernel->handle(
     $request = Illuminate\Http\Request::capture()
 );
-
 $response->send();
 $kernel->terminate($request, $response);

public/js/public_notice.js

@@ -25,13 +25,15 @@ layui.use([], function () {
                 right2=365
             }
             const css = `
+            .noticepoplk{font-size:14px;}
+            .noticepoplk .layui-form-label{ padding: 9px 15px!important;}
             .nrtx{line-height:38px;}
 .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_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%)}}`;
-            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.body.insertAdjacentHTML('afterbegin', html);
             pageS.getList()
@@ -99,7 +101,7 @@ layui.use([], function () {
                 const obj_i= pageS.noticeList.filter(item=>item.business_notice_id==business_notice_id)
                 console.log(obj_i)
                 const conHtml_ = `
-                <div style="padding:20px;">
+                <div style="padding:20px;" class="noticepoplk">
                     <div class="layui-form-item " style="margin-bottom:0px;">
                         <div class="layui-inline">
                             <label class="layui-form-label required">公告标题</label>