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/locate/ApplicationFolder.cpp |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/library/locate/ApplicationFolder.cpp b/src/library/locate/ApplicationFolder.cpp
index 9ba99ee..8bc7f5a 100644
--- a/src/library/locate/ApplicationFolder.cpp
+++ b/src/library/locate/ApplicationFolder.cpp
@@ -7,48 +7,39 @@
 #include <fstream>
 #include <sstream>
 #include <string>
+#include <iostream>
 
-#include <build_properties.h>
+#include <licensecc/datatypes.h>
+#include <licensecc_properties.h>
 
 #include "../base/logger.h"
-#include "../api/datatypes.h"
 #include "../base/base.h"
 #include "../base/EventRegistry.h"
-#include "../base/FileUtils.hpp"
 #include "../os/os.h"
 #include "ApplicationFolder.hpp"
-#include <iostream>
+#include "../base/file_utils.hpp"
 
 namespace license {
 namespace locate {
 using namespace std;
 
+ApplicationFolder::ApplicationFolder() : LocatorStrategy("ApplicationFolder") {}
 
+ApplicationFolder::~ApplicationFolder() {}
 
-ApplicationFolder::ApplicationFolder() :
-		LocatorStrategy("ApplicationFolder") {
-
-}
-
-ApplicationFolder::~ApplicationFolder() {
-}
-
-const vector<string> ApplicationFolder::licenseLocations(
-		EventRegistry &eventRegistry) const {
+const vector<string> ApplicationFolder::license_locations(EventRegistry &eventRegistry) {
 	vector<string> diskFiles;
-	char fname[MAX_PATH] = { 0 };
+	char fname[MAX_PATH] = {0};
 	const FUNCTION_RETURN fret = getModuleName(fname);
 	if (fret == FUNC_RET_OK) {
 		const string module_name = remove_extension(fname);
-		const string temptativeLicense = string(module_name) + ".lic";
+		const string temptativeLicense = string(module_name) + LCC_LICENSE_FILE_EXTENSION;
 		ifstream f(temptativeLicense.c_str());
 		if (f.good()) {
 			diskFiles.push_back(temptativeLicense);
-			eventRegistry.addEvent((EVENT_TYPE) LICENSE_FILE_FOUND,
-					(SEVERITY) SVRT_INFO, temptativeLicense);
+			eventRegistry.addEvent(LICENSE_FOUND, temptativeLicense.c_str());
 		} else {
-			eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
-					temptativeLicense);
+			eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, temptativeLicense.c_str());
 		}
 		f.close();
 	} else {
@@ -57,5 +48,5 @@
 	return diskFiles;
 }
 
-}
+}  // namespace locate
 } /* namespace license */

--
Gitblit v1.9.1