From 0be124f18aa8fba6207cbbd4d9913cc1396914f9 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 12 六月 2020 13:28:27 +0800
Subject: [PATCH] finished

---
 service/netdisk_service.c |   65 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/service/netdisk_service.c b/service/netdisk_service.c
index c71a014..4c1eec2 100644
--- a/service/netdisk_service.c
+++ b/service/netdisk_service.c
@@ -4,14 +4,13 @@
 #include "login_store.h"
 #include "request_handler.h"
 #include "properties_config.h"
+#include "netdisk_factory.h"
 #include <jsoncpp/json/json.h>
 #include <nng/nng.h>
 #include <nng/protocol/reqrep0/rep.h>
 #include <nng/protocol/reqrep0/req.h>
 
 using namespace std;
-
-
 
 static int work(Netdisk_DownloadRequest drequest);
 static int connectAndSend(const char *url, char * str);
@@ -23,7 +22,7 @@
 
 PropertiesConfig config("../data/config.txt");
 
-SafeQueue<Netdisk_DownloadRequest> task_queue(10);
+SafeQueue<Netdisk_DownloadRequest> task_queue(100);
 
 std::map<std::string, Netdisk *> userDeviceMap;
 
@@ -70,37 +69,37 @@
 
 int work(Netdisk_DownloadRequest drequest) {
   Netdisk *netdisk = NULL;
+  std::vector<std::string> files;
   int rv;
+  char rmsg[MAXLINE];
+  strcpy(rmsg, "success");
+  Netdisk_LoginInfo loginInfo = loginStore.getLoginInfo(drequest.loginUUID);
   std::map<std::string, Netdisk *>::iterator userDeviceIter = userDeviceMap.find( drequest.loginUUID);
   if( userDeviceIter != userDeviceMap.end() ) {
      netdisk = userDeviceIter->second;
   }
 
-  Netdisk_LoginInfo loginInfo = loginStore.getLoginInfo(drequest.loginUUID);
   if (netdisk == NULL) {
-   
-    if(loginInfo.deviceType == "HC") {
-      // std::cout << "new HCNetdisk" << std::endl;
-      netdisk = new HCNetdisk();
+
+    netdisk = NetdiskFacotory::create(loginInfo.deviceType);
+    if(netdisk != NULL) {
       userDeviceMap.insert({loginInfo.loginUUID, netdisk});
     } else {
-      err_msg(0, "鏃犳硶璇嗗埆鐨勮澶囩被鍨嬶細 %s", loginInfo.deviceType.c_str());
-
+      snprintf(rmsg, MAXLINE, "鏃犳硶璇嗗埆鐨勮澶囩被鍨嬶細 %s", loginInfo.deviceType.c_str());
     }
   }
 
   if ( (rv = netdisk->login(loginInfo)) != 0 ) {
-    printf("涓嬭浇鐧诲綍澶辫触\n");
+    snprintf(rmsg, MAXLINE, "璇烽噸鏂扮櫥褰�");
+  } else if ( (rv = netdisk->downloadByTime(drequest, &files) ) != 0) {
+    snprintf(rmsg, MAXLINE, "涓嬭浇澶辫触");
   }
-
-  std::vector<std::string> files;
-  if ( (rv = netdisk->downloadByTime(drequest, &files) ) != 0) {
-    printf("涓嬭浇澶辫触\n");
-  }
+ 
 
   Json::Value response;
   Json::Value payload;
-  response["rv"] = rv;
+  response["code"] = rv;
+  response["msg"] = rmsg;
 
   Json::Value filelist;
   for(std::string f : files) {
@@ -124,6 +123,7 @@
   {
     Netdisk_DownloadRequest  request;
     task_queue.pop(request);
+    err_msg(0, "====take a task");
     work(request);
   }
 }
@@ -153,6 +153,7 @@
     }
 
     jsonreader.parse(buf, request);
+    nng_free(buf, sz);
     std::string method = request["method"].asString();
 
     std::map<std::string, RequestHandleFun>::iterator handleFunIter = requestHandleFunMap.find(method);
@@ -162,23 +163,21 @@
     } else {
       std::cerr << "Don't support " << method << std::endl;
     }
-    // if (method == "login") {
-    //   handleLogin(sock, request);
-    // } else if (method == "downloadByTime") {
-    //   handleDownloadByTimeAsync(sock, request);
-    // } else {
-    //   std::cerr << "Don't support " << method << std::endl;
-    // }
-    // Unrecognized command, so toss the buffer.
-    nng_free(buf, sz);
+    
+    
   }
 }
 
-
+/**
+ * 娉ㄥ唽璇锋眰澶勭悊鐨勬柟娉�
+ */
 void registRequestHandleFun() {
   requestHandleFunMap.insert({"login", handleLogin});
+  requestHandleFunMap.insert({"logout", handleLogout});
   requestHandleFunMap.insert({"downloadByTime", handleDownloadByTimeAsync});
+  requestHandleFunMap.insert({"getDeviceInfo", handleGetDeviceInfo});
 }
+
 
 void initThreadPool() {
   pthread_t tid;
@@ -188,15 +187,17 @@
 
 int main()
 {
-
-  Netdisk_EnvConfig hcEnvConfig;
-  hcEnvConfig.libpath = config.get("hclib");
-  HCNetdisk::netdisk_init(&hcEnvConfig);
-
+  //鐜鍙橀噺鍒濆鍖�
   WORKERS = config.getInt("workers");
   localUrl = config.get("local_url");
   remoteUrl = config.get("remote_url");
 
+  //娴峰悍璁惧鐜鍒濆鍖�
+  Netdisk_EnvConfig hcEnvConfig;
+  hcEnvConfig.libpath = config.get("hclib");
+  HCNetdisk::netdisk_init(&hcEnvConfig);
+
+ 
 
   registRequestHandleFun();
 

--
Gitblit v1.8.0