From 9b2d472b92665ab6afac8dcca9683c759b3fbb8a Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 30 六月 2020 17:41:41 +0800
Subject: [PATCH] update
---
data/config.txt | 8 ++++----
service/test_client | 0
service/netdisk_service | 0
device/hcnetdisk.c | 4 ++--
service/netdisk_service.c | 19 +++----------------
service/test_client.c | 2 +-
6 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/data/config.txt b/data/config.txt
index 67a95b4..02aeaf9 100644
--- a/data/config.txt
+++ b/data/config.txt
@@ -1,9 +1,9 @@
# nng鏈湴鏈嶅姟鍦板潃
-# server_url=tcp://192.168.20.104:8801
-server_url=tcp://192.168.20.104:7701
+server_url=tcp://192.168.20.104:8801
+#server_url=tcp://192.168.20.104:7701
# nng杩滅▼璋冪敤鍦板潃鍦板潃
-client_url=tcp://192.168.20.104:7702
-# client_url=tcp://192.168.20.10:8802
+#client_url=tcp://192.168.20.104:7702
+client_url=tcp://192.168.20.10:8802
# 蹇冭烦鏈嶅姟鍣�
heart_server=tcp://192.168.20.10:5006
diff --git a/device/hcnetdisk.c b/device/hcnetdisk.c
index dfc0e4c..b6061a1 100644
--- a/device/hcnetdisk.c
+++ b/device/hcnetdisk.c
@@ -247,7 +247,7 @@
printf("Be downloading...%d %%\n", nPos);
sleep(1);
}
- printf("have got %d\n", nPos);
+ // printf("have got %d\n", nPos);
//鍋滄涓嬭浇
if (!NET_DVR_StopGetFile(hPlayback))
{
@@ -255,7 +255,7 @@
bRes = -1;
return bRes;
}
- printf("%s\n", srcfile);
+ // printf("%s\n", srcfile);
if (nPos < 0 || nPos > 100)
{
printf("download err [%d]\n", NET_DVR_GetLastError());
diff --git a/service/netdisk_service b/service/netdisk_service
index 2bcdf1d..f7f8b76 100755
--- a/service/netdisk_service
+++ b/service/netdisk_service
Binary files differ
diff --git a/service/netdisk_service.c b/service/netdisk_service.c
index 8daa2b8..d6a0b19 100644
--- a/service/netdisk_service.c
+++ b/service/netdisk_service.c
@@ -97,18 +97,6 @@
}
- // Json::Value response;
- // Json::Value payload;
- // response["code"] = rv;
- // response["msg"] = rmsg;
-
- // Json::Value filelist;
- // for(std::string f : files) {
- // filelist.append(f);
- // }
- // payload["filelist"] = filelist;
- // response["payload"] = payload;
-
Json::Value request;
request["method"] = "downloadByTimeCallBack";
Json::Value arguments;
@@ -122,8 +110,7 @@
request["arguments"] = arguments;
std::string str = request.toStyledString();
- std::cout << "download finished, call back" << std::endl;
- std::cout << str << std::endl;
+ std::cout << "SENDING download finished\n" << str << std::endl;
connectAndSend(remoteUrl.c_str(), strdup(str.c_str()) );
return 0;
@@ -214,11 +201,11 @@
char *buf = NULL;
size_t sz;
if ((rv = nng_recv(sock, &buf, &sz, NNG_FLAG_ALLOC)) == 0) {
-printf("CLIENT (%s): RECEIVED \"%s\" SURVEY REQUEST\n", name, buf);
+//printf("CLIENT (%s): RECEIVED \"%s\" SURVEY REQUEST\n", name, buf);
nng_free(buf, sz);
char response[1024];
sprintf(response, "%s-%d", name, getpid());
-printf("CLIENT (%s): SENDING SURVEY RESPONSE:%s\n", name, response);
+//printf("CLIENT (%s): SENDING SURVEY RESPONSE:%s\n", name, response);
if ((rv = nng_send(sock, response, strlen(response) + 1, 0)) != 0) {
fatal("nng_send", rv);
}
diff --git a/service/test_client b/service/test_client
index 3777195..4eb6871 100755
--- a/service/test_client
+++ b/service/test_client
Binary files differ
diff --git a/service/test_client.c b/service/test_client.c
index 0a90fb3..953be38 100644
--- a/service/test_client.c
+++ b/service/test_client.c
@@ -113,7 +113,7 @@
end["mon"] = 4;
end["day"] = 10;
end["hour"] = 14;
- end["min"] = 30;
+ end["min"] = 40;
end["sec"] = 0;
arguments["end"] = end;
--
Gitblit v1.8.0