From 7ba5854ad1bc770a03d620cea78bafdc62dfdf24 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 19 六月 2020 18:16:31 +0800
Subject: [PATCH] update
---
service/netdisk_service.c | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/service/netdisk_service.c b/service/netdisk_service.c
index 3612b21..1f55786 100644
--- a/service/netdisk_service.c
+++ b/service/netdisk_service.c
@@ -17,7 +17,6 @@
int WORKERS ;
-std::string localUrl;
std::string remoteUrl;
PropertiesConfig config("../data/config.txt");
@@ -96,18 +95,30 @@
}
- Json::Value response;
- Json::Value payload;
- response["code"] = rv;
- response["msg"] = rmsg;
+ // 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;
Json::Value filelist;
for(std::string f : files) {
filelist.append(f);
}
- payload["filelist"] = filelist;
- response["payload"] = payload;
- std::string str = response.toStyledString();
+ arguments["fileList"] = filelist;
+ arguments["loginUUID"] = drequest.loginUUID;
+
+ request["arguments"] = arguments;
+ std::string str = request.toStyledString();
std::cout << "download finished, call back" << std::endl;
std::cout << str << std::endl;
@@ -123,6 +134,7 @@
{
Netdisk_DownloadRequest request;
task_queue.pop(request);
+ err_msg(0, "====take a task");
work(request);
}
}
@@ -188,12 +200,11 @@
{
//鐜鍙橀噺鍒濆鍖�
WORKERS = config.getInt("workers");
- localUrl = config.get("local_url");
- remoteUrl = config.get("remote_url");
+ remoteUrl = config.get("client_url");
//娴峰悍璁惧鐜鍒濆鍖�
Netdisk_EnvConfig hcEnvConfig;
- hcEnvConfig.libpath = config.get("hclib");
+ hcEnvConfig.libpath = "../lib/hc";
HCNetdisk::netdisk_init(&hcEnvConfig);
@@ -202,7 +213,7 @@
initThreadPool();
- startServer(localUrl.c_str());
+ startServer(config.get("server_url").c_str());
HCNetdisk::netdisk_deinit();
--
Gitblit v1.8.0