增加构造userbuf,支持gcc4.8

yutingzeng · yutingzeng · commit dd17b49c1e8a · 2019-12-17T11:22:22.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8)
 project(tls_sig_api)
 
+SET(CMAKE_CXX_FLAGS "-std=c++0x")
+
 if(UNIX)
     find_package(ZLIB REQUIRED)
     find_package(OpenSSL REQUIRED)
diff --git a/src/tls_sig_api_v2.cpp b/src/tls_sig_api_v2.cpp
@@ -171,7 +171,58 @@ static int json2sig(const rapidjson::Document &json, std::string &sig, std::stri
     }
     return 0;
 }
+TLS_API std::string  getUserBuf(const std::string & account, uint32_t dwSdkappid,uint32_t dwAuthID,
+                    uint32_t dwExpTime,uint32_t dwPrivilegeMap,uint32_t dwAccountType)
+{
+    int length = 1+2+account.length()+20;
+    int offset = 0;
+    char userBuf[length];
+    memset(userBuf,0,sizeof(userBuf));
+    
+    userBuf[offset++]= 0;
+
+    userBuf[offset++] = ((account.length() & 0xFF00) >> 8);
+    userBuf[offset++] = (account.length() & 0x00FF);
+        
+    for(;offset < account.length() + 3; ++offset)
+    {
+        userBuf[offset] = account[offset-3];
+    }
 
+    //dwSdkAppid
+    userBuf[offset++] = ((dwSdkappid & 0xFF000000) >> 24);
+    userBuf[offset++] = ((dwSdkappid & 0x00FF0000) >> 16);
+    userBuf[offset++] = ((dwSdkappid & 0x0000FF00) >> 8);
+    userBuf[offset++] = (dwSdkappid & 0x000000FF);
+    
+    //dwAuthId
+    userBuf[offset++] = ((dwAuthID & 0xFF000000) >> 24);
+    userBuf[offset++] = ((dwAuthID & 0x00FF0000) >> 16);
+    userBuf[offset++] = ((dwAuthID & 0x0000FF00) >> 8);
+    userBuf[offset++] = (dwAuthID & 0x000000FF);
+        
+    //dwExpTime 不确定是直接填还是当前s数加上超时时间
+    //time_t now = time(0);
+    //uint32_t expiredTime = now + dwExpTime;
+    userBuf[offset++] = ((dwExpTime & 0xFF000000) >> 24);
+    userBuf[offset++] = ((dwExpTime & 0x00FF0000) >> 16);
+    userBuf[offset++] = ((dwExpTime & 0x0000FF00) >> 8);
+    userBuf[offset++] = (dwExpTime & 0x000000FF);
+
+    //dwPrivilegeMap     
+    userBuf[offset++] = ((dwPrivilegeMap & 0xFF000000) >> 24);
+    userBuf[offset++] = ((dwPrivilegeMap & 0x00FF0000) >> 16);
+    userBuf[offset++] = ((dwPrivilegeMap & 0x0000FF00) >> 8);
+    userBuf[offset++] = (dwPrivilegeMap & 0x000000FF);
+        
+    //dwAccountType
+    userBuf[offset++] = ((dwAccountType & 0xFF000000) >> 24);
+    userBuf[offset++] = ((dwAccountType & 0x00FF0000) >> 16);
+    userBuf[offset++] = ((dwAccountType & 0x0000FF00) >> 8);
+    userBuf[offset++] = (dwAccountType & 0x000000FF);
+    return std::string(userBuf,length);
+
+}
 // ����ǩ��
 TLS_API int gen_sig(uint32_t sdkappid, const std::string& identifier,
         const std::string& key, int expire,
diff --git a/src/tls_sig_api_v2.h b/src/tls_sig_api_v2.h
@@ -32,7 +32,23 @@ enum {
     CHECK_ERR_MAX,
 };
 
-
+/**
+ * @brief gen userbuf
+ * @param account userid
+ * @param dwSdkappid sdkappid
+ * @param dwAuthID  roomNum
+ * @param dwExpTime time
+ * @param dwPrivilegeMap 用户权限
+ * @param dwAccountType 用户类型
+ * @return string userbuf
+ */
+TLS_API std::string  getUserBuf(
+	const std::string & account,
+	uint32_t dwSdkappid,
+	uint32_t dwAuthID,
+        uint32_t dwExpTime,
+	uint32_t dwPrivilegeMap,
+	uint32_t dwAccountType);
 /**
  * @brief ����ǩ������
  * @param sdkappid Ӧ��ID
diff --git a/src/tlssigapi_v2_tool.cpp b/src/tlssigapi_v2_tool.cpp
@@ -117,12 +117,12 @@ int main(int argc, char * argv[])
         std::string sdkappid_str = argv[4];
         std::string identifier = argv[5];
         ret = gen_sig(key, sig_file, strtol(sdkappid_str.c_str(), NULL, 10), identifier);
-    } else if (0 == strcmp(cmd, "genuser") && 7 == argc) {
+    } else if (0 == strcmp(cmd, "genuser") && 6 == argc) {
         std::string key = argv[2];
         std::string sig_file = argv[3];
         std::string sdkappid_str = argv[4];
         std::string identifier = argv[5];
-        std::string userbuf = argv[6];
+        std::string userbuf = getUserBuf(identifier,strtol(sdkappid_str.c_str(), NULL, 10),10000,180*86400,255,0);
         ret = gen_sig_with_userbuf(key, sig_file,
                 strtol(sdkappid_str.c_str(), NULL, 10), identifier, userbuf);
     } else {
