修改服务器混合监听方法为listen

littlemag · May 7, 2018 · 9e80925 · 9e80925
1 parent 2697686
commit 9e80925
Show file tree

Hide file tree

Showing 43 changed files with 556 additions and 10 deletions.
diff --git a/README.md b/README.md
diff --git a/bin/poker b/bin/poker
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 function startgame()
 {
 	printf "staring GameServer...\r\n"
-    /usr/bin/php run.php >> ../log/server.log 2>&1
+    /usr/local/bin/php run.php >> ../log/server.log 2>&1
 	printf $?
     if [ $? == 0 ]; then
         printf "GameServer start OK\r\n"

diff --git a/bin/run.php b/bin/run.php
@@ -6,4 +6,4 @@
 
 require __DIR__ .'/../vendor/autoload.php';
 
-GameServer::getInstance()->initServer()->start();
+GameServer::getInstance()->initServer()->start();
diff --git a/client/Const.js b/client/Const.js
diff --git a/client/Init.js b/client/Init.js
diff --git a/client/Packet.js b/client/Packet.js
diff --git a/client/Req.js b/client/Req.js
diff --git a/client/Resp.js b/client/Resp.js
diff --git a/client/index.html b/client/index.html
diff --git a/client/msgpack.js b/client/msgpack.js
diff --git a/composer.json b/composer.json
diff --git a/core/AStrategy.php b/core/AStrategy.php
@@ -32,4 +32,4 @@ protected function Broadcast($serv, $data) {
         	$serv->push($fd, $data, WEBSOCKET_OPCODE_BINARY);
         } 
     }
-}
+}
diff --git a/core/BaseServer.php b/core/BaseServer.php
@@ -68,7 +68,7 @@ abstract class BaseServer {
 		'max_request' => 0, //必须设置为0，否则会导致并发任务超时,don't change this number
 		'task_max_request' => 2000,
 
-		'daemonize'=>1, 
+//		'daemonize'=>1, 
 //		'log_level' => 2, //swoole 日志级别 Info
 		'backlog' => 3000,
 		'log_file' => '../log/sw_server.log',//swoole 系统日志，任何代码内echo都会在这里输出
@@ -117,7 +117,7 @@ public function initServer() {
 		//如果tcp端口有设置， 将开启tcp协议
 		if(!empty($this->tcpserver_port)) {			
 			//tcp server
-			$this->tcpserver = $this->server->addListener($this->server_ip, $this->tcpserver_port, SWOOLE_SOCK_TCP);
+			$this->tcpserver = $this->server->listen($this->server_ip, $this->tcpserver_port, SWOOLE_SOCK_TCP);
 			//tcp只使用这几个个事件
 			$this->tcpserver->on('Connect', array($this, 'onConnect'));
 			$this->tcpserver->on('Receive', array($this, 'onReceive'));

diff --git a/core/Config.php b/core/Config.php
diff --git a/core/Const.php b/core/Const.php
diff --git a/core/Dispatch.php b/core/Dispatch.php
diff --git a/core/GameServer.php b/core/GameServer.php
@@ -74,4 +74,4 @@ public function doWork($serv, $task_id, $src_worker_id, $data) {
 			return 'http protocol';
 		}			
 	}
-}
+}
diff --git a/core/JokerPoker.php b/core/JokerPoker.php
@@ -610,4 +610,4 @@ public static function setRate($rate = array()) {
 
 var_dump($key, $card, $obj->getCardType($key),$obj->getIsDoubleCard());
 
-*/
+*/
diff --git a/core/Packet.php b/core/Packet.php
diff --git a/core/PdoDB.php b/core/PdoDB.php
diff --git a/images/demo1.jpg b/images/demo1.jpg
diff --git a/images/demo2.jpg b/images/demo2.jpg
diff --git a/images/demo3.png b/images/demo3.png
diff --git a/images/demo4.jpg b/images/demo4.jpg
diff --git a/images/demo5.png b/images/demo5.png
diff --git a/lib/CancelCard.php b/lib/CancelCard.php
diff --git a/lib/ChatMsg.php b/lib/ChatMsg.php
@@ -15,4 +15,4 @@ public function exec() {
 		$data = \Game\Core\Packet::packEncode($data, \Game\Core\MainCmd::CMD_SYS, \Game\Core\SubCmdSys::CHAT_MSG_RESP);
 		return $data; 
 	}
-}
+}
diff --git a/lib/GetCard.php b/lib/GetCard.php
diff --git a/lib/GetSingerCard.php b/lib/GetSingerCard.php
diff --git a/lib/IsDouble.php b/lib/IsDouble.php
diff --git a/lib/SendCard.php b/lib/SendCard.php
@@ -15,4 +15,4 @@ public function exec() {
 		$data = \Game\Core\Packet::packEncode($data, \Game\Core\MainCmd::CMD_SYS, \Game\Core\SubCmdSys::SEND_CARD_RESP);
 		return $data;    
 	}
-}
+}
diff --git a/lib/TurnCard.php b/lib/TurnCard.php
diff --git a/log/server.log b/log/server.log
diff --git a/log/sw_server.log b/log/sw_server.log
diff --git a/vendor/autoload.php b/vendor/autoload.php
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@

		require __DIR__ .'/../vendor/autoload.php';

		GameServer::getInstance()->initServer()->start();
		GameServer::getInstance()->initServer()->start();
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,4 +32,4 @@ protected function Broadcast($serv, $data) { @@
             	$serv->push($fd, $data, WEBSOCKET_OPCODE_BINARY);
             }
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -610,4 +610,4 @@ public static function setRate($rate = array()) {

		var_dump($key, $card, $obj->getCardType($key),$obj->getIsDoubleCard());

		*/
		*/