Merge branch 'jola' of https://github.com/scu-covariant/cids-servers into jola

Author: Guo-Shiyu

CMakeLists.txt

@@ -14,7 +14,7 @@ if(NOT TARGET nanodbc)
 endif()
 
     #find- rapidjson
-find_package(RapidJson REQUIRED)
+find_package(RapidJSON REQUIRED)
 
     #already put muduo in the project
 

Src/Common/ServerBase.cpp

@@ -49,6 +49,10 @@ scu_time scu_time::toScutime(const muduo::Timestamp &timestamp){
     int seconds = allSeconds % 86400;
     size_t hour = seconds / 3600;
     size_t minute = (seconds - hour * 3600) / 60;
+    if(hour >= 16)
+        hour -= 16;
+    else
+        hour += 8;
     return scu_time(hour, minute);
 }