Z991239-5719 #comment 适配器版本文件不存在时创建

Framework/spbase/SpEntityPrivilege.cpp

@@ -406,12 +406,12 @@ bool SpEntityPrivilege::RecursiveCopyDir(const char *pszSourceDir, const char *p
 
 ErrorCodeEnum SpEntityPrivilege::UpdateVerTxt(const char* strActiveFilePath, const char* toWriteVersionStr, bool toCheck)
 {
-	HANDLE hFile = ::CreateFileA(strActiveFilePath, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE hFile = ::CreateFileA(strActiveFilePath, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 	BOOL bSetSucc = FALSE;
 	if (hFile == INVALID_HANDLE_VALUE)
 	{
-		LogError(Severity_Low, Error_Unexpect, 0, "open active.txt fail");
-		return Error_Unexpect;
+		LogError(Severity_Low, Error_Unexpect, 0, CSimpleStringA::Format("open %s failed! err=%u", strActiveFilePath, GetLastError()));
+		return Error_IO;
 	}
 	DWORD dwWrittenLen(0);
 	bSetSucc = WriteFile(hFile, toWriteVersionStr, strlen(toWriteVersionStr), &dwWrittenLen, NULL);
@@ -1005,9 +1005,11 @@ ErrorCodeEnum SpEntityPrivilege::RewriteDepVersion(const CSimpleStringA& strVers
 
 	rc = UpdateVerTxt(path, strVersion, true);
 	if (rc == Error_Succeed && bRefresh) {
+		//TODO: 调试专用，后移除  [Gifur@20241015]
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("to refresh...");
 		rc = (ErrorCodeEnum)sp_dir_refresh_dep_path(dir);
 		if (rc == Error_Succeed) {
+			//TODO: 调试专用，后移除  [Gifur@20241015]
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("to send fresh post");
 			iobuffer_t* pkt = iobuffer_create(-1, -1);
 			rc = PostInfoShell(SHELL_CMD_INFO_REFRESH_ENV, &pkt);

Framework/spshell/svc.cpp

@@ -592,7 +592,7 @@ void on_start_update_token(sp_rpc_server_t* server, int epid, int svc_id, int ca
 	t_cfg->channelId = shm_strdup(channelId);
 	t_cfg->token = shm_strdup(token);
 
-	toolkit_free(channelId);
+	toolkit_free(channelId);	
 	toolkit_free(token);
 }
 
@@ -617,12 +617,14 @@ void on_fresh_env(sp_rpc_server_t* server, int epid, int svc_id, int call_type,
 		if (!values[i].IsStartWith(strPrefix)) {
 			if (!strNewPath.IsNullOrEmpty()) strNewPath += ENV_SEP_STR;
 			strNewPath += values[i];
+			//TODO: 测试代码，后续移除  [Gifur@20241015]
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("toadd:%s", values[i].GetData());
 		}
 	}
 	if (env->dir->dep_ver_path != NULL) {
 		if (!strNewPath.IsNullOrEmpty()) strNewPath += ENV_SEP_STR;
 		strNewPath += env->dir->dep_ver_path;
+		//TODO: 测试代码，后续移除  [Gifur@20241015]
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("toadd1:%s", env->dir->dep_ver_path);
 	}
 	char vendorName[128];
@@ -633,11 +635,13 @@ void on_fresh_env(sp_rpc_server_t* server, int epid, int svc_id, int call_type,
 		CSimpleStringA strSubDep(env->dir->dep_ver_path);
 		strSubDep += SPLIT_SLASH_STR;
 		strSubDep += vendorName;
+		//TODO: 测试代码，后续移除  [Gifur@20241015]
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("toadd1:%s", strSubDep.GetData());
 		if (!strNewPath.IsNullOrEmpty()) strNewPath += ENV_SEP_STR;
 		strNewPath += strSubDep;
 	}
 	toolkit_setenv(name, strNewPath.GetData());
+	//TODO: 测试代码，后续移除  [Gifur@20241015]
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("renew env:%s", strNewPath.GetData());
 }