Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

application/admin/controller/Sensitivec.php

@@ -69,7 +69,7 @@ class Sensitivec extends Base
             'status' => config('kf_status')
         ]);
 
-        return $this->fetch();
+        return $this->fetch('kfnotice/index');
     }
 
     //敏感词编辑

application/service/controller/Common.php

@@ -48,6 +48,13 @@ class Common extends Base
 
     }//end verifyToken()
 
+    protected  function  doTokenCheck(){
+        if (!$this->verifyToken()){
+            return json(['code' => -1, 'data' => [], 'msg' => 'check false!']);
+            exit;
+        }
+    }
+
 
     /**
      * 获取用户信息

application/service/controller/Dinterface.php

@@ -12,7 +12,9 @@ class Dinterface extends Common
 
     public function getNotice()
     {
-        $uid = input('param.uid');
+        $this->doTokenCheck();
+
+        $uid = input('post.uid');
         $uid = intval(trim($uid, 'KF'));
         $rets = (new ServicenoticeModel())->where(['uid' => $uid, 'readtime' => 0])->order('id asc')->limit(20)->select();
         if ($rets) {

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -406,7 +406,7 @@ class Events
         foreach ($kfs as $gruop => $fs) {
             foreach ($fs as $kfid => $kfdata) {
                 if ($kfdata['status'] == 1) {
-                    $ret[$gruop][] = ['id' => $kfid, 'name' => $kfdata['name'], 'job_member' => $kfdata['job_name']];
+                    $ret[$gruop][] = ['id' => $kfid, 'name' => $kfdata['name'], 'job_member' => $kfdata['job_name'],'avatar'=>$kfdata['avatar']];
                 }
             }
         }