Переглянути джерело

变更retry表的rollback为insert

Candy 6 роки тому
батько
коміт
0c6b6834a5

+ 9 - 4
thinkphp/TCPserver/config.php

@@ -18,15 +18,20 @@ define('DB_PORT', 3306);
 define('DB_USERNAME', 'root');
 define('DB_PASSWORD', 'abc123');*/
 
-define('DB_NAME', 'mt4r111');
-define('DB_HOST', '192.168.5.110');
+/*define('DB_NAME', 'mt4r111');
+define('DB_HOST', '192.168.5.110');*/
 //define('DB_HOST', '192.168.5.104');
-define('DB_PORT', 3306);
+/*define('DB_PORT', 3306);
 define('DB_USERNAME', 'elmo');
-define('DB_PASSWORD', 'Elmo@666');
+define('DB_PASSWORD', 'Elmo@666');*/
 
 /*define('DB_NAME', 'view');
 define('DB_HOST', '127.0.0.1');
 define('DB_PORT', 3306);
 define('DB_USERNAME', 'root');
 define('DB_PASSWORD', 'root');    */
+define('DB_NAME', 'gendan');
+define('DB_HOST', '47.106.182.13');
+define('DB_PORT', 3306);
+define('DB_USERNAME', 'root');
+define('DB_PASSWORD', 'Elmo@666');

+ 24 - 21
thinkphp/TCPserver/tcpServer.php

@@ -72,6 +72,7 @@ $workerTcp->onWorkerStart = function ($workerTcp) {
         global $send_data;
         global $connection_count;
         $msg = json_decode($data, true);
+     
         if ($msg['type'] == "heartbeat") {
             $connection_count = $msg["connection_count"];
         }
@@ -134,9 +135,9 @@ $workerTcp->onWorkerStart = function ($workerTcp) {
 
 
     // 向远处的服务器发送信息===========================================================
-    //$connection_to_tcp = new AsyncTcpConnection('tcp://47.254.202.24:10009');
+    $connection_to_tcp = new AsyncTcpConnection('tcp://119.23.51.113:10008');
     //$connection_to_tcp = new AsyncTcpConnection('tcp://127.0.0.1:1235');
-    $connection_to_tcp = new AsyncTcpConnection('tcp://192.168.5.111:10009');
+    //$connection_to_tcp = new AsyncTcpConnection('tcp://192.168.5.111:10009');
 
     $connection_to_tcp->onConnect = function ($connection_to_tcp) {
         // 发送心跳信息
@@ -308,37 +309,37 @@ function tcpMessHandle($data)
         var_dump($msg);
         if ($msg['type'] == "get_order_record") {      //查询订单状态
             $recv_buffer = "";
-            if (!isset($msg['seqnum'])) {
+           /* if (!isset($msg['seqnum'])) {
                 return false;
             }
             ack($msg['seqnum']);
-            $seqnum++;
+            $seqnum++;*/
         }
         if ($msg['type'] == "set_current_order") {     //设置当前跟单订单
             $recv_buffer = "";
-            if (!isset($msg['seqnum'])) {
+            /*if (!isset($msg['seqnum'])) {
                 return false;
-            }
+            }*/
             sendToWebServer($msg);
-            ack($msg['seqnum']);
-            $seqnum++;
+           /* ack($msg['seqnum']);
+            $seqnum++;*/
 
         }
 
         if ($msg['type'] == "insert") {                //Insert请求 (有数据库操作,插入)
             $recv_buffer = "";
-            if (!isset($msg['seqnum'])) {
+           /* if (!isset($msg['seqnum'])) {
                 return false;
             }
             if ($seqnum != $msg["seqnum"]) {
                 return false;
-            }
+            }*/
 
             $index++;  //将数据加一
             $total       = count($send_data);  //总数据的长度
             $insert_data = $msg['dest'];
-            ack($msg['seqnum']);
-            $seqnum++;
+          /*  ack($msg['seqnum']);
+            $seqnum++;*/
             if ($index < $total) {
                 send_insert($send_data, $index, $send_order);
             } else {
@@ -376,17 +377,17 @@ function tcpMessHandle($data)
         }
         if ($msg['type'] == "rollback") {              //Rollback请求 (有数据库操作,插入并看看是否需要直接返回给前端)
             $recv_buffer = "";
-            if (!isset($msg['seqnum'])) {
+          /*  if (!isset($msg['seqnum'])) {
                 return false;
             }
             if ($seqnum != $msg['seqnum']) {
                 return false;
-            }
+            }*/
             $rollback_index++;  //将数据加一
             $total        = count($rollback_data);  //总数据的长度
             $rollbackdata = $msg['desc'];
-            ack($msg["seqnum"]);
-            $seqnum++;
+         /*   ack($msg["seqnum"]);
+            $seqnum++;*/
             if ($rollback_index < $total) {
                 send_rollback($rollback_data, $rollback_index);
 
@@ -446,8 +447,8 @@ function tcpMessHandle($data)
             if ($seqnum != $msg['seqnum']) {
                 return false;
             }
-            ack($msg["seqnum"]);
-            $seqnum++;
+         /*   ack($msg["seqnum"]);
+            $seqnum++;*/
             $retry_rollback_index++;       //将数据加一
             $total = count($retry_rollback_data);  //总数据的长度
             if ($retry_rollback_index < $total) {
@@ -503,8 +504,8 @@ function tcpMessHandle($data)
             if ($seqnum != $msg['seqnum']) {
                 return false;
             }
-            ack($msg["seqnum"]);
-            $seqnum++;
+           /* ack($msg["seqnum"]);
+            $seqnum++;*/
             $retry_index++;                           //将数据加一
             $total = count($retry_data);              //总数据的长度
             if ($retry_index < $total) {
@@ -596,7 +597,9 @@ function send_insert($data,$index=0,$order){
         $send_child['percentage'] = $value['ladder'];          //梯度
         array_push($send['dest'],$send_child);
     }
-
+    echo "发送的数据";
+    var_dump($send);
+    return false;
     sendTo_tcp_Server($send); 
 }
 

+ 1 - 0
thinkphp/TCPserver/webserver.php

@@ -198,6 +198,7 @@ function sendToWeb($msg)
     global $workerWs;
     foreach ($workerWs->connections as $connection) {
         if (!isset($connection->uid)) {
+
             $connection->send(json_encode($msg) . "\n");
         }
     }

+ 145 - 0
thinkphp/TCPserver/workerman.log

@@ -1678,3 +1678,148 @@ Stack trace:
 #9 D:\view1\thinkphp\TCPserver\tcpServer.php(1054): Workerman\Worker::runAll()
 #10 {main}
 2019-06-14 15:19:45 pid:1 Worker process terminated
+2019-07-02 18:46:30 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(375): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(203): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#12 {main}
+2019-07-02 18:46:30 pid:1 Worker process terminated
+2019-07-02 18:47:35 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(375): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(203): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#12 {main}
+2019-07-02 18:47:35 pid:1 Worker process terminated
+2019-07-03 09:38:56 pid:1 PDOException: SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1755
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1755): PDO->prepare('INSERT INTO ord...')
+#1 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(375): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#3 D:\view1\thinkphp\TCPserver\tcpServer.php(203): tcpMessHandle('{"dest":[],"ori...')
+#4 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#6 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#7 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#11 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#12 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#13 {main}
+2019-07-03 09:38:56 pid:1 Worker process terminated
+2019-07-03 09:39:41 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(375): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(203): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#12 {main}
+2019-07-03 09:39:41 pid:1 Worker process terminated
+2019-07-03 09:43:34 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(375): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(203): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#12 {main}
+2019-07-03 09:43:34 pid:1 Worker process terminated
+2019-07-03 09:44:44 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(375): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(203): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#12 {main}
+2019-07-03 09:44:44 pid:1 Worker process terminated
+2019-07-03 09:47:43 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(376): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(204): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(755): Workerman\Worker::runAll()
+#12 {main}
+2019-07-03 09:47:43 pid:1 Worker process terminated
+2019-07-03 09:52:17 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(374): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(202): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#12 {main}
+2019-07-03 09:52:17 pid:1 Worker process terminated
+2019-07-03 10:04:17 pid:1 PDOException: SQL:INSERT INTO order_progress(type,orig_order,orig_login,dest_login,dest_order,percentage,profit,error_code,addtime) VALUES SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 in D:\view1\thinkphp\vendor\mysql\src\Connection.php:1772
+Stack trace:
+#0 D:\view1\thinkphp\vendor\mysql\src\Connection.php(1830): Workerman\MySQL\Connection->execute('INSERT INTO ord...', NULL)
+#1 D:\view1\thinkphp\TCPserver\tcpServer.php(374): Workerman\MySQL\Connection->query('INSERT INTO ord...')
+#2 D:\view1\thinkphp\TCPserver\tcpServer.php(202): tcpMessHandle('{"dest":[],"ori...')
+#3 [internal function]: {closure}(Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#4 D:\view1\thinkphp\vendor\workerman\Connection\TcpConnection.php(673): call_user_func(Object(Closure), Object(Workerman\Connection\AsyncTcpConnection), '{"dest":[],"ori...')
+#5 [internal function]: Workerman\Connection\TcpConnection->baseRead(Resource id #35)
+#6 D:\view1\thinkphp\vendor\workerman\Events\Select.php(289): call_user_func_array(Array, Array)
+#7 D:\view1\thinkphp\vendor\workerman\Worker.php(2235): Workerman\Events\Select->loop()
+#8 D:\view1\thinkphp\vendor\workerman\Worker.php(1225): Workerman\Worker->run()
+#9 D:\view1\thinkphp\vendor\workerman\Worker.php(1168): Workerman\Worker::forkWorkersForWindows()
+#10 D:\view1\thinkphp\vendor\workerman\Worker.php(478): Workerman\Worker::forkWorkers()
+#11 D:\view1\thinkphp\TCPserver\tcpServer.php(754): Workerman\Worker::runAll()
+#12 {main}
+2019-07-03 10:04:17 pid:1 Worker process terminated

+ 4 - 3
thinkphp/application/database.php

@@ -15,16 +15,17 @@ return [
     // 服务器地址
    //'hostname'        => 'st.titanera.com',
     //'hostname'        => '192.168.5.104',
-    'hostname'        => '192.168.5.110',
+    //'hostname'        => '192.168.5.110',
+    'hostname'        => '47.106.182.13',
    // 'hostname'        => '',
     // 数据库名
     //'database'        => 'monk_live',
-    'database'        => 'mt4r111',
+    'database'        => 'gendan',
     //'database'        => 'view',
 
     // 用户名
     //'username'        => 'root',
-    'username'        => 'elmo',
+    'username'        => 'root',
     //'username'        => 'root',
     // 密码
     //'password'        => 'abc123',

+ 1 - 1
vue-admin-master/config/index.js

@@ -30,7 +30,7 @@ module.exports = {
     proxyTable: {
       '/api': {
         target:'http://www.yytp.com/', //接口地址
-        // secure: false, // 如果是https接口,需要配置这个参数
+        // secure: false, // 如果是https接口,需要配置这个参数          
         changeOrigin:true, //是否允许跨域
         pathRewrite:{
           '^/api': '' //需要rewrite 重写的

+ 79 - 5
vue-admin-master/src/views/nav1/Table.vue

@@ -194,8 +194,8 @@
 		<el-col :span="10" class="toolbar" v-if="lock_order" style="width:100%;">
 			<el-button type="danger"  @click="Retry"              :disabled="this.retry_sels.length===0"  :loading="loading_retry" >Retry</el-button>
 			<el-button type="danger"  @click="Retry_all"                                                  :loading="loading_retry" >Retry执行全部</el-button>
-			<el-button type="success" @click="Rollback_retry"     :disabled="this.retry_sels.length===0"  :loading="loading_retry" >Rollback</el-button>
-			<el-button type="success" @click="Rollback_retry_all"                                         :loading="loading_retry" >Rollback执行全部</el-button>
+			<el-button type="success" @click="ErrorInsert"     :disabled="this.retry_sels.length===0"  :loading="loading_retry" >Insert</el-button>
+			<el-button type="success" @click="ErrorInsert_all"                                         :loading="loading_retry" >Insert执行全部</el-button>
 			<el-button type="warning" @click="retry_query">刷新</el-button>
 			<el-pagination layout="total,sizes,prev, pager, next,jumper" @current-change="retryCurrentChange"  @size-change="retrySizeChange"   :page-sizes="[100, 200, 300, 500,1000,2000,retry_total]"  :page-size="retry_page_size" :total="retry_total" style="float:right;"></el-pagination>
 		</el-col>
@@ -207,8 +207,11 @@
 
 <!-- 遮罩框的显示 -->
     <el-dialog  title="进度提示"   width="30%" :visible.sync="dialogVisible"  :before-close="handleClose" :show-close='false' >
-		 <el-progress type="circle" :percentage="child_num" ></el-progress>
-    </el-dialog>
+		
+		 <el-progress type="line" :percentage="child_num" ></el-progress>
+		 
+  </el-dialog>
+	
 <!-- 遮罩框的显示 -->	
 
 
@@ -563,6 +566,7 @@
 									data_insert.type = 'vue_insert';
 									data_insert.orderid = _this.filters.orderid;
 									data_insert.data = _this.sels;      //数组的格式(多个数据发送过去)
+									
 									//发送socket
 									_this.socket.send(JSON.stringify(data_insert));
 
@@ -595,6 +599,74 @@
 
 			},
 
+			ErrorInsert_all(){
+				 this.retry_sels = this.retrydata;
+				 this.ErrorInsert();
+			},
+			//失败订单insert
+			ErrorInsert:function() {
+				
+				var _this = this;
+				this.$confirm('确认操作吗?', '提示', {
+					//type: 'warning'
+				}).then(() => {
+					console.log('rollback函数');
+                    // 二次确认密码
+					this.$prompt('请输入密码', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+					}).then(({ value }) => {
+						var loginParams = { password: value,nickname:JSON.parse(sessionStorage.getItem('user'))};
+						// 向后台请求密码的正确性
+						_this.$api.post('/api/index/index/querypassword',loginParams, response => {
+							if (response.status == 200 && response.status < 300) {
+								let { msg, code } = response.data;
+								if(code=="00"){
+								    console.log('retry_insert');
+									// 验证成功开始执行rollback操作    retry_sels
+								
+									if(_this.retry_sels.length==0){
+										_this.$message.error("没有任何选择");
+										return false;
+									}
+									_this.rollback_index = 0;
+									_this.loading_rollback = true;
+									_this.dialogVisible = true;
+									let data_insert={};
+									data_insert.type = 'vue_insert'; 
+									
+									
+									for( var i in _this.retry_sels){
+										
+										_this.retry_sels[i].LOGIN = _this.retry_sels[i].dest_login;
+										_this.retry_sels[i].ladder = _this.retry_sels[i].percentage;
+									}
+									data_insert.orderid = _this.retry_sels[i].orig_order;
+									data_insert.data = _this.retry_sels;								
+									// 发送socket
+									_this.socket.send(JSON.stringify(data_insert));
+
+								}else{
+									this.logining = false;
+									this.$message.error(msg);
+								}
+							} else {
+								this.logining = false;
+								console.log(response.message);
+							}
+						});
+					}).catch(() => {
+						this.$message({
+							type: 'info',
+							message: '取消输入'
+						});       
+					});
+
+				}).catch(() => {
+
+                    console.log("取消了");
+				});
+			},
             //rollback函数
 			Rollback:function() {
 				var _this = this;
@@ -833,8 +905,8 @@
             // socket连接函数
 			connect: function () {
 				    var _that_ = this;
+					//this.socket = new WebSocket('ws://47.106.182.13:12380');
 					this.socket = new WebSocket('ws://127.0.0.1:12380');
-					
 					//连接成功后的回调函数
                     this.socket.onopen = function () {
                         clearInterval(this.reConnect);
@@ -861,7 +933,9 @@
 									console.log("insert执行了");
 									var arraylog=[_that_.insert_index,_that_.sels.length];
 									_that_.bugout.log(arraylog);
+									
 									_that_.child_num = (Math.round(_that_.insert_index / _that_.sels.length * 10000) / 100.00);
+									console.log(_that_.child_num);
                                     if(_that_.sels.length == _that_.insert_index){
 										// 全部执行完成后,对所有不是失败的数据,进行成功操作
 										_that_.sels.forEach((element1,index) => {