From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 29 5月 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
src/library/LicenseReader.cpp | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 5d071c3..bc45adb 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -80,13 +80,14 @@
* sw_version_to = (optional int)
* from_date = YYYY-MM-DD (optional)
* to_date = YYYY-MM-DD (optional)
- * client_signature = XXXX-XXXX-XXXX-XXXX (optional string 16)
+ * client_signature = XXXX-XXXX-XXXX (optional string 16)
* sig = XXXXXXXXXX (mandatory, 1024)
* application_data = xxxxxxxxx (optional string 16)
*/
const char *license_signature = ini.GetValue(productNamePtr, LICENSE_SIGNATURE, nullptr);
- long license_version = ini.GetLongValue(productNamePtr, LICENSE_VERSION, -1);
- if (license_signature != nullptr && license_version == 200) {
+ //娌℃湁鐢ㄨ繖涓猯icense_version浜� 涓嶉渶瑕佽
+ // long license_version = ini.GetLongValue(productNamePtr, LICENSE_VERSION, -1);
+ if (license_signature != nullptr /*&& license_version == 200*/) {
CSimpleIniA::TNamesDepend keys;
ini.GetAllKeys(productNamePtr, keys);
FullLicenseInfo licInfo(*it, product, license_signature);
@@ -112,14 +113,11 @@
ostringstream oss;
oss << toupper_copy(trim_copy(m_project));
for (auto &it : m_limits) {
- if (it.first != LICENSE_VERSION && it.first != LICENSE_SIGNATURE) {
+ if (it.first != LICENSE_SIGNATURE) {
oss << trim_copy(it.first) << trim_copy(it.second);
}
}
-#ifdef _DEBUG
- cout << "license to sign [" << oss.str() << "]" << endl;
-#endif
return oss.str();
}
--
Gitblit v1.9.1