From f262e55698a0060f373a1d2bc93bf148ff9a2163 Mon Sep 17 00:00:00 2001
From: Yu Sun <suny226@mail2.sysu.edu.cn>
Date: Wed, 10 Aug 2022 16:04:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=97=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E5=8F=82=E6=95=B0=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EdgeManager.php                             | 14 +++++++-------
 EdgeManager/EDataCapture/EDataCapture.php   |  2 +-
 EdgeManager/EDataCapture/ENodeConfigure.php |  2 +-
 README.md                                   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/EdgeManager.php b/EdgeManager.php
index 1c4b4b9..b901a37 100644
--- a/EdgeManager.php
+++ b/EdgeManager.php
@@ -94,7 +94,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
                     // 执行异步连接
                     $task_connection->connect();
                 } else {
-                    $enode_configure = new ENodeConfigure($dbconn, post: $post);
+                    $enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, post: $post);
                     $res = $enode_configure -> $action();
                     
                     if ($res === true)
@@ -110,7 +110,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
                     }
                 }                
             } else if ($post -> action === 'set_node_data') {
-                $data_capture = new EDataCapture($dbconn, post: $post, no_dup_code: $options['no_dup_code'] ?? true);
+                $data_capture = new EDataCapture($dbconn, no_dup_code: $options['no_dup_code'] ?? true, post: $post);
                 if ($data_capture -> check_res === 'WRONG_WORKING_SUBCLASS') {
                     $response = new Response(200, [
                         'Content-Type' => 'application/json;charset=utf-8',
@@ -171,7 +171,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
     $get = $request -> get();
     if (isset($get['query'])) {
         if ($get['query'] == 'nodes') {
-            $enode_configure = new ENodeConfigure($dbconn, get: $get);
+            $enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
             $nodes = $enode_configure -> get_nodes();
             if (is_null($nodes))
                 $connection -> send(json_encode(array(
@@ -184,7 +184,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
                     'data'  => $nodes
                 )));
         } else if ($get['query'] == 'working_subclasses') {
-            $enode_configure = new ENodeConfigure($dbconn, get: $get);
+            $enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
             $working_subclasses = $enode_configure -> get_working_subclasses($dbconn);
             if (is_null($working_subclasses))
                 $connection -> send(json_encode(array(
@@ -197,7 +197,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
                     'data'  => $working_subclasses
                 )));
         } else if ($get['query'] == 'codes') {
-            $enode_configure = new ENodeConfigure($dbconn, get: $get);
+            $enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
             $codes = $enode_configure -> get_codes_by_working_subclasses();
             if (is_null($codes))
                 $connection -> send(json_encode(array(
@@ -210,7 +210,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
                     'data'  => $codes
                 )));
         } else if ($get['query'] == 'node_data') {
-            $data_capture = new EDataCapture($dbconn, get: $get);
+            $data_capture = new EDataCapture($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
             $data = $data_capture -> get_node_data();
             if (is_null($data))
                 $connection -> send(json_encode(array(
@@ -254,7 +254,7 @@ $consumer -> onMessage = function(TcpConnection $connection, $task_data) {
     $task_data = json_decode($task_data);
 
     if ($task_data -> action === 'add_node') {
-        $enode_configure = new ENodeConfigure($consumer_dbconn, post: $task_data -> data, no_dup_code: $options['no_dup_code'] ?? true);
+        $enode_configure = new ENodeConfigure($consumer_dbconn, no_dup_code: $options['no_dup_code'] ?? true, post: $task_data -> data);
         $res = $enode_configure -> add_node();
     
         if ($res === true)
diff --git a/EdgeManager/EDataCapture/EDataCapture.php b/EdgeManager/EDataCapture/EDataCapture.php
index 3916b47..9df0560 100644
--- a/EdgeManager/EDataCapture/EDataCapture.php
+++ b/EdgeManager/EDataCapture/EDataCapture.php
@@ -4,13 +4,13 @@ namespace EdgeManager\EDataCapture;
 class EDataCapture {
     function __construct(
         protected $dbconn,
+        protected $no_dup_code,
         protected $post = NULL,
         protected $get = NULL,
         public $check_res = NULL,
         protected $working_subclass = NULL,
         protected $code_type = [],
         protected $data = [],
-        protected $no_dup_code
     ) {
         if (!is_null($this -> post)) {
             if (!in_array(
diff --git a/EdgeManager/EDataCapture/ENodeConfigure.php b/EdgeManager/EDataCapture/ENodeConfigure.php
index ce3459a..7197aa3 100644
--- a/EdgeManager/EDataCapture/ENodeConfigure.php
+++ b/EdgeManager/EDataCapture/ENodeConfigure.php
@@ -4,9 +4,9 @@ namespace EdgeManager\EDataCapture;
 class ENodeConfigure {
     function __construct(
         protected $dbconn,
+        protected $no_dup_code,
         protected $post = NULL,
         protected $get = NULL,
-        protected $no_dup_code
     ) {}
 
     function add_node() {
diff --git a/README.md b/README.md
index 8ee3b6d..611112a 100644
--- a/README.md
+++ b/README.md
@@ -272,7 +272,7 @@ docker exec -it edge_manager bash
 
 ```bash
 # In container
-php EdgeManager.php --server_name=GPU-server-01 --user=postgres --password=big_dick start
+php EdgeManager.php --no_dup_code --server_name=GPU-server-01 --user=postgres --password=big_dick start
 ```
 
 前端调试：