vali 6 jaren geleden
bovenliggende
commit
5369df62e6

+ 7 - 8
websockServ/app/lib/DB_pool.php

@@ -10,7 +10,7 @@ namespace app\lib;
 
 
 /**
- *  swoole 数据库连接池 BY 凌晨
+ *  swoole 数据库连接池 BY Vali
  * 'worker_num' => 20, //worker进程数量
  * 'task_worker_num' => 10, //task进程数量 即为维持的MySQL连接的数量
  * 'daemonize'=> 1,          //设置守护进程
@@ -41,10 +41,10 @@ class DB_pool
         $this->worker_num = 5;
         $this->task_worker_num = 5;
         $this->dispatch_mode = 2;
-        $this->daemonize = 1;
+        $this->daemonize = true ;
         $this->max_request = 10000;
-        $filename = date("Y-m-d", time());
-        $this->log_file = "../logs/mysqlpoole_" . $filename . '.log';
+        $filename = date("Ymd", time());
+        $this->log_file = "../logs/DB_pool_err_" . $filename . '.log';
         $this->serv = new \swoole\server($this->host, $this->server_port);
         $this->serv->set(array(
             'worker_num' => $this->worker_num,
@@ -53,9 +53,6 @@ class DB_pool
             'daemonize' => $this->daemonize,
             'log_file' => $this->log_file,
             'dispatch_mode' => $this->dispatch_mode,
-            'package_max_length'=> 4 * 1024 *1024,
-            'buffer_output_size'=> 4 * 1024 *1024,
-            'socket_buffer_size' => 8 * 1024 *1024
         ));
 
         $this->db_type = $config['db_type'] ? $config['db_type'] : 'mysql';
@@ -134,7 +131,9 @@ class DB_pool
             if (in_array($link->errorCode(), [2013, 2006])) {//错误码为2013,或者2006,则重连数据库,重新执行sql
                 $link = null;
                 goto HELL;
-            } else {
+            }
+            $errinfoArr = $link->errorInfo();
+            if (!($errinfoArr['0']=='00000' && $errinfoArr['1'] =='' &&  $errinfoArr['2']=='')){
                 $data['status'] = 'false';
                 $data['data'] = $link->errorInfo();
                 $this->serv->finish(json_encode($data, 256));

+ 1 - 1
websockServ/app/lib/DataPack.php

@@ -35,7 +35,7 @@ class DataPack
             self::Create($array);
         }
         $ret = [
-            'id' => self::UUID(),
+            'id' => isset(self::$Datas['id']) ? self::$Datas['id'] : self::UUID(),
             'fr' => isset(self::$Datas['from']) ? self::$Datas['from'] : 0,
             'to' => isset(self::$Datas['to']) ? self::$Datas['to'] : 0,
             'ct' => time(),

+ 6 - 1
websockServ/app/lib/Mconsts.php

@@ -30,7 +30,12 @@ defined('ON_OPEN') or define("ON_OPEN", 'ON_OPEN');
 defined('TIME_RSYNC_KEY') or define("TIME_RSYNC_KEY", 'TIME_RSYNC_KEY');                     //时间同步的写获取者
 
 defined('MSG_REDIS_SUBSCRIBE') or define("MSG_REDIS_SUBSCRIBE", 'MSG_REDIS_SUBSCRIBE');      //redis 消息订阅key
-defined('MSG_INDEX') or define("MSG_INDEX", 'MSG_INDEX_QIPAI');                                     //redis 消息订阅key首页中奖消息
+
+defined('MSG_BOARD') or define("MSG_BOARD", 'MSG_BOARD');                                     //通用广播消息队列键名
+defined('MSG_TO_ONE_USER') or define("MSG_TO_ONE_USER", 'MSG_TO_ONE_USER');                   //通用单用户消息队列键名
+defined('DO_TICK_USER') or define("DO_TICK_USER", 'DO_TICK_USER');                             //需要提下线的单用户消息队列键名
+defined('USER_BLACK_HASH') or define("USER_BLACK_HASH", 'USER_BLACK_HASH');                    //用户黑名单,不能连上线 has表
+
 ////
 
 

+ 44 - 19
websockServ/app/logic/MyServerV2.php

@@ -27,8 +27,19 @@ class MyServerV2
 
     public function __construct()
     {
-        $this->serv = new \swoole_websocket_server("0.0.0.0", 9090);
-        $this->serv->set(GlobConfigs::getKey('swoolev2'));
+        $config = GlobConfigs::getKey('swoole');
+        $this->serv = new \swoole_websocket_server($config['host'], $config['port']);
+        $this->serv->set($config['sets']);
+
+        //内存表(用户uid和fd的双向映射表)
+        $fd_table = new \swoole_table($config['maxUsers']);
+        $fd_table->column("uid", \swoole_table::TYPE_INT, 4);
+        $fd_table->create();
+        $user_table = new \swoole_table($config['maxUsers']);
+        $user_table->column("fid", \swoole_table::TYPE_INT, 4);
+        $user_table->create();
+        $this->serv->ftable = $fd_table;
+        $this->serv->utable = $user_table;
 
         $this->serv->on('Start', array($this, 'onStart'));
         $this->serv->on('WorkerStart', array($this, 'onWorkerStart'));
@@ -137,9 +148,9 @@ class MyServerV2
 
     public function onMessage($serv, $frame)
     {
-        if ( strtolower($frame->data->data)  == '{"type":"ping"}'){
-                $serv->send($frame->fd,'{"type":"pong"}');
-                return ;
+        if (strtolower($frame->data->data) == '{"type":"ping"}') {
+            $serv->send($frame->fd, '{"type":"pong"}');
+            return;
         }
         Wlog::getInstance()->WriteLog($frame);
         $serv->task($frame);
@@ -147,7 +158,7 @@ class MyServerV2
 
     public function onOpen($serv, $request)
     {
-        Wlog::getInstance()->WriteLog(['onOpenData',$request]);
+        //Wlog::getInstance()->WriteLog(['onOpenData', $request]);
         $token = isset($request->get['token']) ? $request->get['token'] : '';
         //$uid = isset($request->get['uid']) ? $request->get['uid'] : '';
         $fd = $request->fd;
@@ -156,21 +167,29 @@ class MyServerV2
             return;
         }
         $token_uid = $uid = intval($this->workRedis->hget(MAPS_TOKEN_UID, md5($token)));
-        if (empty($token) || !$token_uid ) {
+        if (empty($token) || !$token_uid) {
             $serv->push($request->fd, DataPack::toJson(['mtype' => 'system_msg', 'stype' => 'invalid_token', 'data' => ['msg' => '无效的token']]));
             $serv->disconnect($request->fd);
             return;
         }
 
-        $oldfid = $this->workRedis->hget(MAPS_UID_FID, $uid);
-        if ($oldfid != '' && $oldfid != $fd && $serv->exist($oldfid)) {
-            $serv->push($oldfid, DataPack::toJson(['mtype' => 'system_msg', 'stype' => 'force_logout', 'data' => [ 'msg' => '你已在其它地方登陆,本次退出!']]));
-            $serv->disconnect($oldfid);
+        //管理员账号可以多连
+        $adminconfig = GlobConfigs::getKey('admin_conf');
+        if ($adminconfig['admin_uid'] != $uid) {
+            $oldfid = $this->workRedis->hget(MAPS_UID_FID, $uid);
+            if ($oldfid != '' && $oldfid != $fd && $serv->exist($oldfid)) {
+                $serv->push($oldfid, DataPack::toJson(['mtype' => 'system_msg', 'stype' => 'force_logout', 'data' => ['msg' => '你已在其它地方登陆,本次退出!']]));
+                $serv->disconnect($oldfid);
+            }
+
+            $this->workRedis->hset(MAPS_UID_FID, $uid, $fd);
+            $this->workRedis->hset(MAPS_FID_UID, $fd, $uid);
+            $serv->ftable->set($fd, ['uid' => $uid]);
+            $serv->utable->set($uid, ['fid' => $fd]);
         }
 
-        $this->workRedis->hset(MAPS_UID_FID, $uid, $fd);
-        $this->workRedis->hset(MAPS_FID_UID, $fd, $uid);
-        $serv->push($fd, DataPack::toJson(['mtype' => 'system_msg', 'stype' => 'well_come', 'data' => [ 'msg' => '成功接入']]));
+
+        $serv->push($fd, DataPack::toJson(['mtype' => 'system_msg', 'stype' => 'well_come', 'data' => ['msg' => '成功接入']]));
     }
 
     public function onTask($serv, \Swoole\Server\Task $task)
@@ -179,7 +198,7 @@ class MyServerV2
             Wlog::getInstance()->WriteLog($task, 1, $serv->worker_id);
             CmdProxy::getInstance()->ParaCMD($serv, $task);
         } catch (\Exception $e) {
-            Wlog::getInstance()->WriteLog(['onTask error:',$task,$e->getCode() . ' ' . $e->getMessage()], 3, $serv->worker_id);
+            Wlog::getInstance()->WriteLog(['onTask error:', $task, $e->getCode() . ' ' . $e->getMessage()], 3, $serv->worker_id);
             echo "发生异常." . $e->getCode() . ' ' . $e->getMessage() . "\n";
         }
     }
@@ -191,8 +210,14 @@ class MyServerV2
     public function onClose($serv, $fd, $from_id)
     {
         $uid = $this->workRedis->hget("MAPS_FID_UID", $fd);
-        $this->workRedis->hdel(MAPS_UID_FID, $uid);
-        $this->workRedis->hdel(MAPS_FID_UID, $fd);
+        $adminconfig = GlobConfigs::getKey('admin_conf');
+        if ($adminconfig['admin_uid'] != $uid) {
+            $this->workRedis->hdel(MAPS_UID_FID, $uid);
+            $this->workRedis->hdel(MAPS_FID_UID, $fd);
+
+            $serv->ftable->del($fd);
+            $serv->utable->del($uid);
+        }
         echo "ClientFd:{$fd} -- uid:{$uid} close connection!\n";
     }
 
@@ -327,8 +352,8 @@ class MyServerV2
             $redis->del(MAPS_FID_UID);
             //$redis->del(MAPS_TOKEN_UID);
             //$redis->del(MAPS_UID_TOKEN);
-            $redis->hset(MAPS_UID_TOKEN,$adminconf['admin_uid'],$adminconf['md5']);
-            $redis->hset(MAPS_TOKEN_UID,$adminconf['md5'],$adminconf['admin_uid']);
+            $redis->hset(MAPS_UID_TOKEN, $adminconf['admin_uid'], $adminconf['md5']);
+            $redis->hset(MAPS_TOKEN_UID, $adminconf['md5'], $adminconf['admin_uid']);
             $redis->exec();
             $redis->close();
         }

+ 122 - 30
websockServ/app/logic/SubServer.php

@@ -25,20 +25,16 @@ class SubServer
 
     public function __construct()
     {
-        $this->configs = GlobConfigs::getKey('swoolev_subserv');
+        $this->configs = GlobConfigs::getKey('swoole_subserv');
         $this->serv = new \swoole_websocket_server($this->configs['host'], $this->configs['port']);
-
-        unset($this->configs['host']);
-        unset($this->configs['port']);
-        $this->serv->set($this->configs);
+        $this->serv->set($this->configs['sets']);
 
         $this->serv->on('Start', array($this, 'onStart'));
         $this->serv->on('WorkerStart', array($this, 'onWorkerStart'));
         $this->serv->on('message', array($this, 'onMessage'));
         $this->serv->on('close', array($this, 'onClose'));
         $this->serv->on('open', array($this, 'onOpen'));
-        $this->serv->on('task', array($this, 'onTask'));
-        $this->serv->on('Finish', array($this, 'onFinish'));
+
 
         return $this->serv->start();
     }
@@ -61,9 +57,28 @@ class SubServer
 
         if ($worker_id == 0) {
             $serv->tick(1000, function () use ($serv, $worker_id) {
-                $msg_index_aray = $this->getIndexMsg();
+                $msg_index_aray = $this->getBoardMsg();
                 if (!empty($msg_index_aray)) {
-                    $this->sendIndexMsg($msg_index_aray);
+                    $this->SendMsgComm('msg_board', $msg_index_aray);
+                }
+            });
+        }
+
+        if ($worker_id == 1) {
+            $serv->tick(1000, function () use ($serv, $worker_id) {
+                $msg_user_array = $this->getSingMsg();
+                if (!empty($msg_user_array)) {
+                    $this->SendMsgComm('msg_to_one_user', $msg_user_array);
+                    //$this->sendSingMsg($msg_user_array);
+                }
+            });
+        }
+        
+        if ($worker_id == 2) {
+            $serv->tick(5000, function () use ($serv, $worker_id) {
+                $msg_tick_array = $this->getDoTick();
+                if (!empty($msg_tick_array)) {
+                    $this->SendMsgComm('do_tick', $msg_tick_array);
                 }
             });
         }
@@ -77,7 +92,6 @@ class SubServer
         if ($this->workRedis) {
             $this->workRedis->close();
         }
-
     }
 
 
@@ -91,15 +105,6 @@ class SubServer
 
     }
 
-    public function onTask($serv, \Swoole\Server\Task $task)
-    {
-
-    }
-
-    public function onFinish($serv, $task_id, $data)
-    {
-    }
-
     public function onClose($serv, $fd, $from_id)
     {
 
@@ -152,27 +157,115 @@ class SubServer
 
     ////////////////////////
     //去redis里找 msg_index 是否有数据,有取出来,
-    private function getIndexMsg()
+    private function getBoardMsg()
+    {
+        $redis = $this->workRedis;
+        $len = $redis->LLEN(MSG_BOARD);
+
+        if ($len <= 0) {
+            return;
+        }
+        $datas = [];
+        while ($now = $redis->rpop(MSG_BOARD)) {
+            if (empty($now)) {
+                break;
+            }
+            $now = json_decode($now, true);
+            if (!isset($now['stype']) || empty($now['stype'])) {
+                Wlog::getInstance()->WriteLog(['数据格式误,没有stype字段[subserver]', $now]);
+                continue;
+            }
+            if (!isset($now['data'])) {
+                Wlog::getInstance()->WriteLog(['数据格式误,没有data字段[subserver]', $now]);
+                continue;
+            }
+            $datas[] = $now;
+        }
+
+        return $datas;
+    }
+
+
+    private function getSingMsg()
     {
         $redis = $this->workRedis;
-        $len = $redis->LLEN(MSG_INDEX);
+        $len = $redis->LLEN(MSG_TO_ONE_USER);
 
-        if ($len <=0 ) {
+        if ($len <= 0) {
             return;
         }
+
         $datas = [];
-        while ($now = $redis->rpop(MSG_INDEX)) {
+        while ($now = $redis->rpop(MSG_TO_ONE_USER)) {
             if (empty($now)) {
                 break;
             }
+            $now = json_decode($now, true);
+            if (!isset($now['mtype']) || empty($now['mtype'])) {
+                Wlog::getInstance()->WriteLog(['数据格式误,没有mtype字段[subserver]', $now]);
+                continue;
+            }
+
+            if (!isset($now['stype']) || empty($now['stype'])) {
+                Wlog::getInstance()->WriteLog(['数据格式误,没有stype字段[subserver]', $now]);
+                continue;
+            }
+            if (!isset($now['data'])) {
+                Wlog::getInstance()->WriteLog(['数据格式误,没有data字段[subserver]', $now]);
+                continue;
+            }
+
+            if (!isset($now['to']) || empty($now['to'])) {
+                Wlog::getInstance()->WriteLog(['数据格式误,没有to字段或为空[subserver]', $now]);
+                continue;
+            }
+
+            if (!isset($now['from'])) {
+                Wlog::getInstance()->WriteLog(['数据格式误,没有from字段[subserver]', $now]);
+                continue;
+            }
+
+            $now['confirm'] = (isset($now['confirm']) && $now['confirm'] == 1) ? 1 : 0;
+
             $datas[] = $now;
         }
+        return $datas;
+    }
+
+    private function getDoTick()
+    {
+        $redis = $this->workRedis;
+        $len = $redis->LLEN(DO_TICK_USER);
+
+        if ($len <= 0) {
+            return;
+        }
 
+        $datas = [];
+        while ($now = $redis->rpop(DO_TICK_USER)) {
+            if (empty($now)) {
+                break;
+            }
+            $allArray = json_decode($now, true);
+            if (!is_array($allArray)) {
+                Wlog::getInstance()->WriteLog(['数据格式误,不是全法数组[subserver-getDoTick]', $now]);
+            }
+            foreach ($allArray as $one) {
+                if (!isset($one['uid']) || empty($one['uid'])) {
+                    Wlog::getInstance()->WriteLog(['数据格式误,没有uid字段[subserver-getDoTick]', $now]);
+                    continue;
+                }
+                if (!isset($one['msg'])) {
+                    Wlog::getInstance()->WriteLog(['数据格式误,没有msg字段[subserver-getDoTick]', $now]);
+                    continue;
+                }
+                $datas[] = $one;
+            }
+        }
         return $datas;
     }
 
-    ///如果有msg_index数据,就通知服务端下发
-    private function sendIndexMsg($msg_index_aray)
+    private function SendMsgComm($act, $msgArray)
     {
         $conf = GlobConfigs::getKey('admin_conf');
         $token = $conf['admin_token'];
@@ -181,19 +274,18 @@ class SubServer
 
         $arr = [
             'cmd' => 'subserv',
-            'act' => 'index_msg',
-            'data' => $msg_index_aray,
+            'act' => $act,
+            'data' => $msgArray,
             'time' => time(),
             'token' => '',
         ];
         $str = json_encode($arr, 256);
-        $r = $client->send($str);
-        $reciv = $client->receive();
+        $client->send($str);
+        $client->receive();
         $client->close();
 
         unset($client);
     }
-    /////////////////////////
 
 
 }

+ 26 - 15
websockServ/app/logic/cmdpro/CmdInf.php

@@ -1,5 +1,6 @@
 <?php
-namespace  app\logic\cmdpro;
+
+namespace app\logic\cmdpro;
 /**
  * Created by PhpStorm.
  * User: Administrator
@@ -29,10 +30,12 @@ data:
 
 use app\lib\DataPack;
 use app\lib\Wlog;
+use app\lib\GlobConfigs;
 
 class   CmdInf
 {
-    public function paraCmd($serv, \Swoole\Server\Task $task){
+    public function paraCmd($serv, \Swoole\Server\Task $task)
+    {
         $fd = $task->data->fd;
         $dataPack = json_decode($task->data->data, true);
         $method = isset($dataPack['act']) ? $dataPack['act'] : '';
@@ -42,34 +45,42 @@ class   CmdInf
             return;
         }
 
-        try{
-            return $this->$method($serv,$task);
-        }catch (\Exception $e){
-            echo "发生异常或错误:".$e->getFile().' '.$e->getLine().' '.$e->getCode().' '.$e->getMessage()."\r\n";
-            return ;
+        try {
+            return $this->$method($serv, $task);
+        } catch (\Exception $e) {
+            echo "发生异常或错误:" . $e->getFile() . ' ' . $e->getLine() . ' ' . $e->getCode() . ' ' . $e->getMessage() . "\r\n";
+            return;
         }
 
     }
 
     //单发
-    public function sendTo($serv,$fd,$dataString,$close=false)
+    public function sendTo($serv, $fd, $dataString, $close = false)
     {
-        $serv->push($fd,$dataString);
-        if ($close){
+        $serv->push($fd, $dataString);
+        if ($close) {
             $serv->disconnect($fd);
         }
         return true;
     }
 
     //在线广播
-    public function onlineBroad($serv,$dataString){
-        foreach($serv->connections as $fd)
-        {
-            $serv->push($fd,$dataString);
+    public function onlineBroad($serv, $dataString)
+    {
+        foreach ($serv->connections as $fd) {
+            $serv->push($fd, $dataString);
         }
     }
 
-
+    //用uid发
+    public function sendToUid($serv, $uid, $dataString, $close = false)
+    {
+        $fd = intval($serv->utable->get($uid,'fid'));
+        if ($fd) {
+            return $this->sendTo($serv, $fd, $dataString, $close);
+        }
+        return false;
+    }
 
 
 }

+ 59 - 7
websockServ/app/logic/cmdpro/CmdSubser.php

@@ -5,29 +5,81 @@
  * Date: 2019/5/21
  * Time: 16:57
  */
+
 namespace app\logic\cmdpro;
 
 use app\lib\DataPack;
+use app\lib\Wlog;
 use app\logic\cmdpro\CmdInf as CmdInf;
 
-class CmdSubser  extends CmdInf
+class CmdSubser extends CmdInf
 {
     public function index_msg($serv, $task)
     {
-        go(function()use($serv,$task){
+        go(function () use ($serv, $task) {
             $pack = json_decode($task->data->data, true);
             $msgarr = $pack['data'];
-            if (!is_array($msgarr)){
-                return ;
+            if (!is_array($msgarr)) {
+                return;
             }
-            foreach ($msgarr as $msg){
-                $msg = DataPack::toJson(['mtype'=>'system_msg','stype'=>'index_msg','data'=>$msg]);
-                $this->onlineBroad($serv, $msg );
+            foreach ($msgarr as $msg) {
+                $msg = DataPack::toJson(['mtype' => 'system_msg', 'stype' => 'index_msg', 'data' => $msg]);
+                $this->onlineBroad($serv, $msg);
             }
         });
     }
 
+    public function msg_board($serv, $task)
+    {
+        go(function () use ($serv, $task) {
+            $pack = json_decode($task->data->data, true);
+            $msgarr = $pack['data'];
+            if (!is_array($msgarr)) {
+                return;
+            }
+            foreach ($msgarr as $msg) {
+                $stype = $msg['stype'];
+                $data = $msg['data'];
+                $msg = DataPack::toJson(['mtype' => 'system_msg', 'stype' => $stype, 'data' => $data]);
+                $this->onlineBroad($serv, $msg);
+            }
+        });
+    }
 
+    public function msg_to_one_user($serv, $task)
+    {
+        go(function () use ($serv, $task) {
+            $pack = json_decode($task->data->data, true);
+            $msgarr = $pack['data'];
+            if (!is_array($msgarr)) {
+                return;
+            }
+            foreach ($msgarr as $msg) {
+                $msgJson = DataPack::toJson($msg);
+                $this->sendToUid($serv, $msg['to'], $msgJson);
+            }
+        });
+    }
+
+    public function do_tick($serv, $task)
+    {
+        $pack = json_decode($task->data->data, true);
+        $datas = $pack['data'];
+        if (!is_array($datas)) {
+            Wlog::getInstance()->WriteLog("无效的数据格式dotick:" . $task->data->data);
+            return;
+        }
+        foreach ($datas as $key => $val) {
+            $uid = $val['uid'];
+            $msg = $val['msg'];
+            $fid = $serv->utable->get($uid, 'fid');
+            if ($fid) {
+                $this->sendTo($serv, $fid, $msg);
+                $serv->disconnect($fid);
+            }
+        }
+        return true;
+    }
 
 
 }

+ 2 - 2
websockServ/commands/clientws1.php

@@ -54,8 +54,8 @@ function  getTimeid(){
     global  $timerId ;
     return $timerId  ;
 }
-
-$url = "?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJib3JuIiwiaWF0IjoxNTU5MDI3Mzk1LCJleHAiOjE1NTkwMzQ1OTUsIm5iZiI6MTU1OTAyNzQ1NSwic3ViIjoxMCwianRpIjoiOGVlODI5Y2QtNjM3Mi1iNjUyLTYxYWItMWY3YWViYTNhODM0In0.eLuHFc5uhTAc87DVCAnTKzRloZS0n79jYWTYE9ea7E0";
+$config = \app\lib\GlobConfigs::getKey('admin_conf');
+$url = "?token=".$config['admin_token'];
 $client->connect("192.168.2.200", 9090, $url , 0.5 , true);
 
 

+ 1 - 4
websockServ/commands/mysql_poole_client_test.php

@@ -15,9 +15,6 @@ require __DIR__.'/../vendor/autoload.php';
 $config  = \app\lib\GlobConfigs::getKey('pgsqlpoole');
 
 $client    = new swoole_client(SWOOLE_SOCK_TCP);
-$client->set(array(
-    'socket_buffer_size'     => 1024*1024*8, //2M缓存区
-));
 $rts= $client->connect('192.168.2.200', $config['poole_port'], 10) or die("连接失败");//链接mysql客户端
 
 if (!$rts){
@@ -30,7 +27,7 @@ $resdata = $client->recv();
 print_r(json_decode($resdata,true)) ;
 
 
-$sql ="update  members  set  name='12-".rand(100,500)."'  where id=57";
+$sql ="update  members  set  name='12-".rand(100,500)."'  where id=57000";
 $client->send($sql);
 $resdata = $client->recv();
 print_r(json_decode($resdata,true)) ;

+ 33 - 46
websockServ/configs/configs.php

@@ -30,6 +30,8 @@ $tmp_config = [
             'collation' => 'utf8_unicode_ci',
             'prefix' => ''
         ],
+
+        //redis配置
         'redis' => [
             'host' => '192.168.2.200',
             'port' => 26379,
@@ -41,44 +43,37 @@ $tmp_config = [
         'swoole' => [
             'host' => '0.0.0.0',
             'port' => '9090',
-            'worker_num' => 2,
-            'daemonize' => true,
-            'max_request' => 50,
-            'task_enable_coroutine' => true,
-            'dispatch_mode' => 2,
-            'debug_mode' => 1,
-            'task_worker_num' => 5,
-            'log_file' => '../logs/err.log',
-        ],
-        //数据库代理连接池
-        'swoolev2' => [
-            'host' => '0.0.0.0',
-            'port' => '9091',
-            'worker_num' => 2,
-            'daemonize' => true,
-            'max_request' => 5000,
-            'task_enable_coroutine' => true,
-            'dispatch_mode' => 2,
-            'debug_mode' => 1,
-            'task_worker_num' => 10,
-            'log_file' => '../logs/errv2.log',
+            'maxUsers' => 4096,
+            'sets' => [
+                'worker_num' => 2,
+                'daemonize' => true,
+                'max_request' => 50,
+                'task_enable_coroutine' => true,
+                'dispatch_mode' => 2,
+                'debug_mode' => 1,
+                'task_worker_num' => 5,
+                'log_file' => '../logs/swoole_'.date("Ymd").'.log',
+            ],
         ],
+
         //子进程业务
-        'swoolev_subserv' => [
+        'swoole_subserv' => [
             'host' => '0.0.0.0',
             'port' => '9092',
-            'worker_num' => 2,
-            'daemonize' => true,
-            'max_request' => 5000,
-            'task_enable_coroutine' => true,
-            'dispatch_mode' => 2,
-            'debug_mode' => 1,
-            'task_worker_num' => 1,
-            'log_file' => '../logs/errv3.log',
+            'sets'=>[
+                'worker_num' => 3,
+                'daemonize' => true,
+                'max_request' => 5000,
+                'task_enable_coroutine' => true,
+                'dispatch_mode' => 2,
+                'debug_mode' => 1,
+                'log_file' => '../logs/swoole_subserv_'.date("Ymd").'.log',
+            ],
         ],
 
-        'pgsqlpoole'=>[
-            'poole_host' => '0.0.0.0' ,
+        //数据库代理配置--pgsql
+        'pgsqlpoole' => [
+            'poole_host' => '0.0.0.0',
             'poole_port' => 9091,
 
             'db_type' => 'pgsql',
@@ -88,8 +83,9 @@ $tmp_config = [
             'db_user' => 'kaiyou',
             'db_pwd' => '123456',
         ],
-        'mysqlpoole'=>[
-            'poole_host' => '0.0.0.0' ,
+        //数据库代理配置--mysql
+        'mysqlpoole' => [
+            'poole_host' => '0.0.0.0',
             'poole_port' => 9091,
 
             'db_type' => 'mysql',
@@ -99,21 +95,12 @@ $tmp_config = [
             'db_user' => 'vali',
             'db_pwd' => '1234',
         ],
-        'commpoole'=>[
-            'poole_host' => '0.0.0.0' ,
-            'poole_port' => 9091,
 
-            'db_type' => 'mysql',
-            'db_host' => '192.168.2.200',
-            'db_port' => 3306,
-            'db_name' => 'ds_cms',
-            'db_user' => 'vali',
-            'db_pwd' => '1234',
-        ],
-        'admin_conf' =>[
+        //管理员使用的
+        'admin_conf' => [
             'url' => 'ws://192.168.2.200:9090',
             'admin_uid' => 999999999,
-            'md5'=>'70d8d42d4307e63702b25ddef0129f72',
+            'md5' => '70d8d42d4307e63702b25ddef0129f72',
             'admin_token' => 'aaminaeyJhb34G6i6JIU6I1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJib3JuIiwiaWF0IjoxNTU4NTk1MjgxLCJleHAiOjE1NTg2MDI0ODEsIm5iZiI6MTU1ODU5NTM0MSwic3ViIjo3NiwianRpIjoiNWIwYjlkNjMtYmQ5My1kNTBkLTA1NzgtZGU0NDEyYjFmZjBlIn0.jaYz1IcJJxNCaEF-ELCcE6JjbFSjKPl0p-whJ76dV1w',
         ],
     ],