通话结束时添加close消息

AsrService/AsrService.cpp

@@ -8,6 +8,58 @@
 #include "CRedis.h"
 #include "Util.h"
 #include <fstream>
+#include "dump.h"
+
+void writeLog(std::string strContent) {
+	std::ofstream of;
+	of.open("./logs/bp.txt", std::ios_base::app);
+	if (of.is_open()) {
+		of << strContent << std::endl;
+		of.flush();
+		of.close();
+	}
+}
+
+bool Ctrlhandler(DWORD fdwctrltype)
+{
+	LOG_ERROR("关闭代码[%d]", fdwctrltype);
+	//Sleep(1000);
+	switch (fdwctrltype)
+	{
+		// handle the ctrl-c signal.
+	case CTRL_C_EVENT:
+		LOG_ERROR("ctrl-c event\n\n");
+		Sleep(200);
+		return(true);
+		// ctrl-close: confirm that the user wants to exit.
+	case CTRL_CLOSE_EVENT:
+		//Close_Exit = true;
+		LOG_ERROR("ctrl-close event\n\n");
+		writeLog("ctrl-close event\n\n");
+		Sleep(2000);
+		return(true);
+		// pass other signals to the next handler.
+	case CTRL_BREAK_EVENT:
+		//Close_Exit = true;
+		LOG_ERROR("ctrl-break event\n\n");
+		Sleep(200);
+		return false;
+	case CTRL_LOGOFF_EVENT:
+		//Close_Exit = true;
+		LOG_ERROR("ctrl-logoff event\n\n");
+		Sleep(200);
+		return false;
+	case CTRL_SHUTDOWN_EVENT:
+	//	Close_Exit = true;
+		LOG_ERROR("ctrl-shutdown event\n\n");
+		Sleep(200);
+		return false;
+	default:
+		LOG_ERROR("未知");
+		Sleep(200);
+		return false;
+	}
+}
 
 // IsAlreadyRunning - 是否已经运行
 BOOL IsAlreadyRunning()
@@ -41,6 +93,8 @@ int main()
 		system("pause");
 		return 0;
 	}
+	// 加入崩溃dump文件功能
+	SetUnhandledExceptionFilter(ExceptionFilter);
 
 	if (MYLog::instance()->Init() != 0)
 	{
@@ -56,7 +110,7 @@ int main()
 		return 0;
 	}
 	LOG_INFO("FS配置文件加载成功");
-
+	SetConsoleCtrlHandler((PHANDLER_ROUTINE)Ctrlhandler, true);
 	if (!CRedis::GetInstance()->connect())
 	{
 		LOG_ERROR("Redis连接失败");

AsrService/AsrService.vcxproj

@@ -174,6 +174,7 @@
     <ClInclude Include="..\public\tinyxml\tinyxml.h" />
     <ClInclude Include="Config.h" />
     <ClInclude Include="CRedis.h" />
+    <ClInclude Include="dump.h" />
     <ClInclude Include="EslGateway.h" />
     <ClInclude Include="Log.h" />
     <ClInclude Include="pubdef.h" />

AsrService/AsrService.vcxproj.filters

@@ -34,6 +34,9 @@
     <Filter Include="tinyxml">
       <UniqueIdentifier>{73c07811-985c-494a-b8b0-b6ff9ae5a583}</UniqueIdentifier>
     </Filter>
+    <Filter Include="dump">
+      <UniqueIdentifier>{067043f8-d9af-48d6-a3cd-365f7fc9e54c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AsrService.cpp">
@@ -101,5 +104,8 @@
     <ClInclude Include="pubdef.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="dump.h">
+      <Filter>dump</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

AsrService/CRedis - 副本 (2).cpp

@@ -1,112 +0,0 @@
-#include "CRedis.h"
-#include <string.h>
-#include "Config.h"
-
-//#define LOG_ERROR         printf 
-//#define LOG_INFO          printf
-//#define LOG_DEBUG         printf
-
-#ifdef WIN32
-#define NO_QFORKIMPL //这一行必须加才能正常使用
-#include "hiredis\msvs\win32_interop\win32_fixes.h"
-#pragma comment(lib,"hiredis.lib")
-#pragma comment(lib,"win32_interop.lib")
-#pragma comment(lib,"redis++_static.lib")
-#endif // WIN32
-
-CRedis::CRedis()
-{
-	 m_pHost = nullptr;
-	 m_port = 6379;
-	 m_pPwd = nullptr;
-}
-
-CRedis::~CRedis()
-{
-	
-}
-
-bool CRedis::connect()
-{
-	auto cfg = CConfig::GetInstance();
-	return connect(cfg->redisIp().c_str(),cfg->redisPort(),cfg->redisPwd().c_str());
-}
-
-bool CRedis::connect(const char * host, int port, const char * password)
-{
-	try
-	{
-		auto cfg = CConfig::GetInstance();
-		LOG_INFO("Redis连接[%s][%d][%s]", cfg->redisIp().c_str(), cfg->redisPort(), cfg->redisPwd().c_str());
-		
-		// Set a master node's host & port.
-		ConnectionOptions connection_options;
-		connection_options.host = host;  // Required.
-		connection_options.port = port; // Optional. The default port is 6379.
-		connection_options.password = password; // Optional. No password by default.
-
-		ConnectionPoolOptions pool_options;
-		pool_options.size = 3;
-
-		// Automatically get other nodes' info,
-		// and connect to every master node with a single connection.
-		//RedisCluster cluster1(connection_options);
-		m_pRedisCluster = std::make_unique<RedisCluster>(connection_options, pool_options);
-	}
-	catch (const std::exception& e)
-	{
-		LOG_ERROR_S(e.what());
-	}
-
-	
-	return true;
-}
-
-bool CRedis::set(const char * key, const char * value)
-{
-	return false;
-}
-
-bool CRedis::set(const char * key, const char * value, int second)
-{
-	return false;
-}
-
-void CRedis::push(const char * key, const char * values)
-{
-	try
-	{
-		m_pRedisCluster->publish(key, values);
-		//LOG_WARN("推送 %ld", m_pRedisCluster->publish(key, values));
-	}
-	catch (const std::exception& e)
-	{
-		LOG_ERROR_S(e.what());
-	}
-}
-
-void CRedis::push(const char * key, std::list<const char*> &values)
-{
-	while (!values.empty())
-	{
-		
-		values.pop_front();
-	}
-	
-}
-
-void CRedis::pull(const char * key, std::list<const char*>& values)
-{
-	
-}
-
-const char * CRedis::get(const char * key)
-{
-	return nullptr;
-}
-
-void CRedis::__delKey(const char * key)
-{
-}
-
-std::shared_ptr<CRedis> CRedis::pInstance(new CRedis);

AsrService/CRedis - 副本 (2).h

@@ -1,46 +0,0 @@
-#pragma once
-
-
-#include <list>
-#include <mutex>
-#include <memory>
-#include "Log.h"
-#include <sw/redis++/redis++.h>
-#include <sw/redis++/sentinel.h>
-#include <sw/redis++/connection.h>
-#include <sw/redis++/connection_pool.h>
-using namespace sw::redis;
-using namespace std::chrono;
-
-class CRedis
-{
-private:
-	CRedis();
-	CRedis(const CRedis&) = default;
-	CRedis& operator=(const CRedis&) = default;
-public:
-	~CRedis();
-public:
-	bool connect();
-	bool connect(const char* host, int port, const char* password);
-	bool set(const char* key, const char* value);
-	bool set(const char* key, const char* value, int second);
-	void push(const char* key, const char* values);
-	void push(const char* key, std::list<const char*> &values);
-	void pull(const char* key, std::list<const char*> &values);
-	const char* get(const char* key);
-
-	static std::shared_ptr<CRedis> GetInstance() { return pInstance; }
-
-private:
-	void __delKey(const char* key);
-
-private:
-	std::unique_ptr<RedisCluster> m_pRedisCluster;
-	std::unique_ptr<char[]> m_pHost;
-	int32_t m_port;
-	std::unique_ptr<char[]> m_pPwd;
-
-	static std::shared_ptr<CRedis> pInstance;
-};
-

AsrService/CRedis.cpp

@@ -26,8 +26,8 @@ CRedis::CRedis()
 
 CRedis::~CRedis()
 {
-	if (this->_reply != nullptr)
-		freeReplyObject(this->_reply);
+	/*if (this->_reply != nullptr)
+		freeReplyObject(this->_reply);*/
 	if (this->_connect != nullptr)
 		redisFree(this->_connect);
 	this->_connect = nullptr;

AsrService/EslGateway.cpp

@@ -323,7 +323,6 @@ void CEslGateway::__detectSpeech(esl_event_t * pEvent)
 			{
 				LOG_ERROR("utf转ansi失败,失败信息:%s;Redis推送内容\n%s", e.what(), parseResult.c_str());
 			}
-			
 		}
 		else
 		{
@@ -334,8 +333,49 @@ void CEslGateway::__detectSpeech(esl_event_t * pEvent)
 	{
 		{
 			auto it = m_chanAsrInfo.find(ChanId);
-			if (it != m_chanAsrInfo.end())
+			if (it != m_chanAsrInfo.end()) {
+				// 组redis包
+				std::string chanAsrInfo;
+		
+				chanAsrInfo = it->second;
 				m_chanAsrInfo.erase(it);
+
+				AsrInfo asrInfo(chanAsrInfo);
+				
+				// 2023-08-14 停止识别时发送通话结束标识
+				asrInfo.state = "end";
+				asrInfo.transSentenceText = "";
+				asrInfo.sentenceBeginTime = 0;
+				asrInfo.transSentenceTime = 0;
+				asrInfo.createTime = timestamp; // GetUnixTime();   // 当前13位时间戳
+
+				auto it = m_CallIdSign.find(asrInfo.callId);
+				if (it != m_CallIdSign.end()) asrInfo.transSentenceIndex = it->second->getTansSentenceIndex(asrInfo.callId, ChanId);
+				else
+				{
+					std::shared_ptr<CallIdSign> pCallIdSign = std::make_shared<CallIdSign>();
+					asrInfo.transSentenceIndex = pCallIdSign->getTansSentenceIndex(asrInfo.callId, ChanId);
+					m_CallIdSign[asrInfo.callId] = pCallIdSign;
+				}
+				std::string parseResult = "";
+				asrInfo >> parseResult;
+
+				if (asrInfo.vocDirect == "Agent") {
+					__pushRedis(parseResult.c_str()); // 推送到redis
+
+					try
+					{
+						LOG_INFO("Redis推送内容\n%s", utf8_to_ansi(parseResult).c_str());
+					}
+					catch (const std::exception&e)
+					{
+						LOG_ERROR("utf转ansi失败,失败信息:%s;Redis推送内容\n%s", e.what(), parseResult.c_str());
+					}
+				}
+				else {
+					LOG_INFO("非坐席挂断不推送-end\n%s", parseResult.c_str());
+				}
+			}
 		}
 		{
 			auto it = m_beginTime.find(ChanId);

AsrService/Release/AsrService.log

@@ -1,8 +1,8 @@
   EslGateway.cpp
     正在创建库 G:\git\AsrService\Release\AsrService.lib 和对象 G:\git\AsrService\Release\AsrService.exp
   正在生成代码
-  33 of 3105 functions ( 1.1%) were compiled, the rest were copied from previous compilation.
+  1 of 3115 functions (<0.1%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    12 functions had inline decision re-evaluated but remain unchanged
+    1 functions had inline decision re-evaluated but remain unchanged
   已完成代码的生成
   AsrService.vcxproj -> G:\git\AsrService\Release\AsrService.exe

AsrService/dump.h

@@ -0,0 +1,68 @@
+#include "Windows.h"
+#include "DbgHelp.h"
+#include <cstdlib>
+#include <cstdio>
+
+int GenerateMiniDump(PEXCEPTION_POINTERS pExceptionPointers)
+{
+	// 定义函数指针
+	typedef BOOL(WINAPI * MiniDumpWriteDumpT)(
+		HANDLE,
+		DWORD,
+		HANDLE,
+		MINIDUMP_TYPE,
+		PMINIDUMP_EXCEPTION_INFORMATION,
+		PMINIDUMP_USER_STREAM_INFORMATION,
+		PMINIDUMP_CALLBACK_INFORMATION
+		);
+	// 从 "DbgHelp.dll" 库中获取 "MiniDumpWriteDump" 函数
+	MiniDumpWriteDumpT pfnMiniDumpWriteDump = NULL;
+	HMODULE hDbgHelp = LoadLibrary(("DbgHelp.dll"));
+	if (NULL == hDbgHelp)
+	{
+		return EXCEPTION_CONTINUE_EXECUTION;
+	}
+	pfnMiniDumpWriteDump = (MiniDumpWriteDumpT)GetProcAddress(hDbgHelp, "MiniDumpWriteDump");
+
+	if (NULL == pfnMiniDumpWriteDump)
+	{
+		FreeLibrary(hDbgHelp);
+		return EXCEPTION_CONTINUE_EXECUTION;
+	}
+	// 创建 dmp 文件件
+	CHAR szFileName[MAX_PATH] = { 0 };
+	const CHAR* szVersion = ("DumpDemo_v1.0");
+	SYSTEMTIME stLocalTime;
+	GetLocalTime(&stLocalTime);
+	sprintf_s(szFileName, "%s-%04d%02d%02d-%02d%02d%02d.dmp",
+		szVersion, stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay,
+		stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond);
+	HANDLE hDumpFile = CreateFile(szFileName, GENERIC_READ | GENERIC_WRITE,
+		FILE_SHARE_WRITE | FILE_SHARE_READ, 0, CREATE_ALWAYS, 0, 0);
+	if (INVALID_HANDLE_VALUE == hDumpFile)
+	{
+		FreeLibrary(hDbgHelp);
+		return EXCEPTION_CONTINUE_EXECUTION;
+	}
+	// 写入 dmp 文件
+	MINIDUMP_EXCEPTION_INFORMATION expParam;
+	expParam.ThreadId = GetCurrentThreadId();
+	expParam.ExceptionPointers = pExceptionPointers;
+	expParam.ClientPointers = FALSE;
+	pfnMiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(),
+		hDumpFile, MiniDumpWithDataSegs, (pExceptionPointers ? &expParam : NULL), NULL, NULL);
+	// 释放文件
+	CloseHandle(hDumpFile);
+	FreeLibrary(hDbgHelp);
+	return EXCEPTION_EXECUTE_HANDLER;
+}
+
+LONG WINAPI ExceptionFilter(LPEXCEPTION_POINTERS lpExceptionInfo)
+{
+	// 这里做一些异常的过滤或提示
+	if (IsDebuggerPresent())
+	{
+		return EXCEPTION_CONTINUE_SEARCH;
+	}
+	return GenerateMiniDump(lpExceptionInfo);
+}