修复乱码,修复时间疑惑

yutingzeng · yutingzeng · commit a486c3e13753 · 2020-05-14T16:47:01.000+08:00
diff --git a/src/tls_sig_api_v2.cpp b/src/tls_sig_api_v2.cpp
@@ -44,7 +44,7 @@ static std::string hmacsha256(uint32_t sdkappid,
         const std::string& identifier, uint64_t init_time, uint64_t expire,
         const std::string& key, const std::string& userbuf);
 
-//ȥ��ĳЩ base64 �����ɵ� \r\n space
+//去掉某些 base64 中生成的 \r\n space
 static std::string base64_strip(const void* data, size_t data_len)
 {
     const char* d = static_cast<const char*>(data);
@@ -171,7 +171,7 @@ 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,
+TLS_API std::string  gen_userbuf(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;
@@ -200,13 +200,13 @@ TLS_API std::string  getUserBuf(const std::string & account, uint32_t dwSdkappid
     userBuf[offset++] = ((dwAuthID & 0x00FF0000) >> 16);
     userBuf[offset++] = ((dwAuthID & 0x0000FF00) >> 8);
     userBuf[offset++] = (dwAuthID & 0x000000FF);
-        
-    //dwExpTime 
-    //uint32_t dwExpTime = now + 300;
-    userBuf[offset++] = ((dwExpTime & 0xFF000000) >> 24);
-    userBuf[offset++] = ((dwExpTime & 0x00FF0000) >> 16);
-    userBuf[offset++] = ((dwExpTime & 0x0000FF00) >> 8);
-    userBuf[offset++] = (dwExpTime & 0x000000FF);
+         
+    //uint32_t expire = now + dwExpTime;
+    uint32_t expire = time(NULL) + dwExpTime;
+    userBuf[offset++] = ((expire & 0xFF000000) >> 24);
+    userBuf[offset++] = ((expire & 0x00FF0000) >> 16);
+    userBuf[offset++] = ((expire & 0x0000FF00) >> 8);
+    userBuf[offset++] = (expire & 0x000000FF);
 
     //dwPrivilegeMap     
     userBuf[offset++] = ((dwPrivilegeMap & 0xFF000000) >> 24);
@@ -222,7 +222,7 @@ TLS_API std::string  getUserBuf(const std::string & account, uint32_t dwSdkappid
     return std::string(userBuf,length);
 
 }
-// ����ǩ��
+// 生成签名
 TLS_API int gen_sig(uint32_t sdkappid, const std::string& identifier,
         const std::string& key, int expire,
         std::string& sig, std::string& errmsg)
@@ -240,17 +240,19 @@ TLS_API int gen_sig(uint32_t sdkappid, const std::string& identifier,
     return json2sig(sig_doc, sig, errmsg);
 }
 
-// ���ɴ� userbuf ��ǩ��
+// 生成带 userbuf 的签名
 TLS_API int gen_sig_with_userbuf(
         uint32_t sdkappid,
         const std::string& identifier,
         const std::string& key,
+        int roomnum,
         int expire,
-        const std::string& userbuf,
+        int privilege,
         std::string& sig,
         std::string& errmsg)
 {
     uint64_t currTime = time(NULL);
+    std::string userbuf = getUserBuf(identifier,sdkappid,roomnum,expire,privilege,0);
     std::string base64UserBuf;
     base64_encode(userbuf.data(), userbuf.length(), base64UserBuf);
     std::string base64RawSig = hmacsha256(
@@ -309,7 +311,7 @@ static std::string __hmacsha256(uint32_t sdkappid,
 }
 
 
-// ʹ�� hmac sha256 ���� sig
+// 使用 hmac sha256 生成 sig
 static std::string hmacsha256(uint32_t sdkappid,
         const std::string& identifier, uint64_t init_time,
         uint64_t expire, const std::string& key)
@@ -319,7 +321,7 @@ static std::string hmacsha256(uint32_t sdkappid,
 }
 
 
-// ʹ�� hmac sha256 ���ɴ� userbuf �� sig
+// 使用 hmac sha256 生成带 userbuf 的 sig
 static std::string hmacsha256(uint32_t sdkappid,
         const std::string& identifier, uint64_t init_time,
         uint64_t expire, const std::string& key,
diff --git a/src/tls_sig_api_v2.h b/src/tls_sig_api_v2.h
@@ -42,7 +42,7 @@ enum {
  * @param dwAccountType �û�����,Ĭ��Ϊ0
  * @return byte[] userbuf
  */
-TLS_API std::string  getUserBuf(
+TLS_API std::string  gen_userbuf(
 	const std::string & account,
 	uint32_t dwSdkappid,
 	uint32_t dwAuthID,
@@ -75,8 +75,9 @@ TLS_API int gen_sig(
  * @param sdkappid Ӧ��ID
  * @param identifier �û��˺ţ�utf-8 ����
  * @param key ��Կ
+ * @param roomnum �����
  * @param expire ��Ч�ڣ���λ��
- * @param userbuf �û�����
+ * @param privilege �û�Ȩ�ޣ�255��ʾ����Ȩ��
  * @param sig ���ص� sig
  * @param errmsg ������Ϣ
  *
@@ -86,8 +87,9 @@ TLS_API int gen_sig_with_userbuf(
         uint32_t sdkappid,
         const std::string& identifier,
         const std::string& key,
+        int roomnum,
         int expire,
-        const std::string& userbuf,
+        int privilege,
         std::string& sig,
         std::string& errmsg);
 
diff --git a/src/tlssigapi_v2_tool.cpp b/src/tlssigapi_v2_tool.cpp
@@ -60,12 +60,12 @@ static int gen_sig(const std::string& key, const std::string& sig_file,
 }
 
 static int gen_sig_with_userbuf(const std::string& key, const std::string& sig_file,
-		uint32_t sdkappid, const std::string& identifier, const std::string& userbuf)
+		uint32_t sdkappid, const std::string& identifier)
 {
     std::string sig;
     std::string err_msg;
-	int ret = gen_sig_with_userbuf(sdkappid, identifier, key,
-            180*86400, userbuf, sig, err_msg);
+    int ret = gen_sig_with_userbuf(sdkappid, identifier, key,
+            1000,180*86400, 255, sig, err_msg);
 	if (0 != ret) {
         std::cout << "error msg: " << err_msg << " return " << ret << std::endl;
 		return -3;
@@ -108,7 +108,6 @@ int main(int argc, char * argv[])
     std::string sig_file;
     std::string sdkappid_str;
     std::string identifier;
-    std::string userbuf;
 
     int ret = 0;
     if (0 == strcmp(cmd, "gen") && 6 == argc) {
@@ -122,9 +121,8 @@ int main(int argc, char * argv[])
         std::string sig_file = argv[3];
         std::string sdkappid_str = argv[4];
         std::string identifier = argv[5];
-        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);
+                strtol(sdkappid_str.c_str(), NULL, 10), identifier);
     } else {
         usage(argv[0]);
         return -1;
