diff --git a/server/tp_core/core/main.cpp b/server/tp_core/core/main.cpp
index 77b532e..beb28e1 100644
--- a/server/tp_core/core/main.cpp
+++ b/server/tp_core/core/main.cpp
@@ -19,174 +19,175 @@ ExLogger g_ex_logger;
 bool g_is_debug = false;
 extern bool g_exit_flag;
 
-#define RUN_UNKNOWN			0
-#define RUN_CORE			1
-#define RUN_INSTALL_SRV		2
-#define RUN_UNINST_SRV		3
-#define RUN_STOP			4
+#define RUN_UNKNOWN            0
+#define RUN_CORE            1
+#define RUN_INSTALL_SRV        2
+#define RUN_UNINST_SRV        3
+#define RUN_STOP            4
 static ex_u8 g_run_type = RUN_UNKNOWN;
 
-#define EOM_CORE_SERVICE_NAME	L"Teleport Core Service"
+#define EOM_CORE_SERVICE_NAME    L"Teleport Core Service"
 
 static bool run_daemon_();
 
 #ifdef EX_OS_WIN32
 static int service_install()
 {
-	ex_wstr exec_file(g_env.m_exec_file);
-	exec_file += L" start";
+    ex_wstr exec_file(g_env.m_exec_file);
+    exec_file += L" start";
 
-	if (EXRV_OK == ex_winsrv_install(EOM_CORE_SERVICE_NAME, EOM_CORE_SERVICE_NAME, exec_file))
-		return 0;
-	else
-		return 1;
+    if (EXRV_OK == ex_winsrv_install(EOM_CORE_SERVICE_NAME, EOM_CORE_SERVICE_NAME, exec_file))
+        return 0;
+    else
+        return 1;
 }
 
 static int service_uninstall()
 {
-	if (EXRV_OK != ex_winsrv_stop(EOM_CORE_SERVICE_NAME))
-		return 1;
+    if (EXRV_OK != ex_winsrv_stop(EOM_CORE_SERVICE_NAME))
+        return 1;
 
-	if (EXRV_OK != ex_winsrv_uninstall(EOM_CORE_SERVICE_NAME))
-		return 2;
+    if (EXRV_OK != ex_winsrv_uninstall(EOM_CORE_SERVICE_NAME))
+        return 2;
 
-	return 0;
+    return 0;
 }
 #endif
 
 static bool process_cmd_line_(int argc, wchar_t** argv)
 {
-	if (argc <= 1)
-	{
-		EXLOGE("nothing to do.\n\n");
-		return false;
-	}
+    if (argc <= 1)
+    {
+        EXLOGE("nothing to do.\n\n");
+        return false;
+    }
 
-	g_run_type = RUN_UNKNOWN;
+    g_run_type = RUN_UNKNOWN;
 
-	if (0 == wcscmp(argv[1], L"--version"))
-	{
-		EXLOGI("\nTeleport Server, version %ls.\n\n", TP_SERVER_VER);
-		return false;
-	}
-	else if (0 == wcscmp(argv[1], L"-i"))
-	{
-		g_run_type = RUN_INSTALL_SRV;
-	}
-	else if (0 == wcscmp(argv[1], L"-u"))
-	{
-		g_run_type = RUN_UNINST_SRV;
-	}
-	else
-	{
-		for (int i = 1; i < argc; ++i)
-		{
-			if (0 == wcscmp(argv[i], L"start"))
-			{
-				g_run_type = RUN_CORE;
-				continue;
-			}
-			else if (0 == wcscmp(argv[i], L"stop")) {
-				g_run_type = RUN_STOP;
-				continue;
-			}
+    if (0 == wcscmp(argv[1], L"--version"))
+    {
+        EXLOGI("\nTeleport Server, version %ls.\n\n", TP_SERVER_VER);
+        return false;
+    }
+    else if (0 == wcscmp(argv[1], L"-i"))
+    {
+        g_run_type = RUN_INSTALL_SRV;
+    }
+    else if (0 == wcscmp(argv[1], L"-u"))
+    {
+        g_run_type = RUN_UNINST_SRV;
+    }
+    else
+    {
+        for (int i = 1; i < argc; ++i)
+        {
+            if (0 == wcscmp(argv[i], L"start"))
+            {
+                g_run_type = RUN_CORE;
+                continue;
+            }
+            else if (0 == wcscmp(argv[i], L"stop"))
+            {
+                g_run_type = RUN_STOP;
+                continue;
+            }
 
-			if (0 == wcscmp(argv[i], L"-d"))
-			{
-				g_is_debug = true;
-				continue;
-			}
+            if (0 == wcscmp(argv[i], L"-d"))
+            {
+                g_is_debug = true;
+                continue;
+            }
 
-			EXLOGE(L"unknown option: %ls\n", argv[i]);
-			return false;
-		}
-	}
+            EXLOGE(L"unknown option: %ls\n", argv[i]);
+            return false;
+        }
+    }
 
-	if (g_run_type == RUN_UNKNOWN)
-	{
-		EXLOGE("nothing to do.\n\n");
-		return false;
-	}
+    if (g_run_type == RUN_UNKNOWN)
+    {
+        EXLOGE("nothing to do.\n\n");
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 
 static int main_loop_()
 {
-	if (g_run_type == RUN_CORE)
-		return ts_main();
-	else
-		return 1;
+    if (g_run_type == RUN_CORE)
+        return ts_main();
+    else
+        return 1;
 }
 
 int app_main_(int argc, wchar_t** argv)
 {
-	EXLOG_USE_LOGGER(&g_ex_logger);
+    EXLOG_USE_LOGGER(&g_ex_logger);
 
-	if (!process_cmd_line_(argc, argv))
-		return 1;
+    if (!process_cmd_line_(argc, argv))
+        return 1;
 
 #ifdef EX_DEBUG
-	EXLOG_LEVEL(EX_LOG_LEVEL_DEBUG);
+    EXLOG_LEVEL(EX_LOG_LEVEL_DEBUG);
 #endif
 
 #ifdef EX_OS_WIN32
-	if (g_run_type == RUN_INSTALL_SRV)
-	{
-		if (!g_env.init(false))
-		{
-			EXLOGE("[core] env init failed.\n");
-			return 1;
-		}
+    if (g_run_type == RUN_INSTALL_SRV)
+    {
+        if (!g_env.init(false))
+        {
+            EXLOGE("[core] env init failed.\n");
+            return 1;
+        }
 
-		return service_install();
-	}
-	else if (g_run_type == RUN_UNINST_SRV)
-	{
-		if (!g_env.init(false))
-		{
-			EXLOGE("[core] env init failed.\n");
-			return 1;
-		}
+        return service_install();
+    }
+    else if (g_run_type == RUN_UNINST_SRV)
+    {
+        if (!g_env.init(false))
+        {
+            EXLOGE("[core] env init failed.\n");
+            return 1;
+        }
 
-		return service_uninstall();
-	}
+        return service_uninstall();
+    }
 #endif
 
-	if (!g_env.init(true))
-	{
-		EXLOGE("[core] env init failed.\n");
-		return 1;
-	}
+    if (!g_env.init(true))
+    {
+        EXLOGE("[core] env init failed.\n");
+        return 1;
+    }
 
-	if (g_run_type == RUN_STOP) {
-		char url[1024] = {0};
-		ex_strformat(url, 1023, R"(http://%s:%d/rpc?{"method":"exit"})", g_env.rpc_bind_ip.c_str(), g_env.rpc_bind_port);
-		ex_astr body;
-		ts_http_get(url, body);
-		ex_printf("%s\n", body.c_str());
-		return 0;
-	}
+    if (g_run_type == RUN_STOP)
+    {
+        char url[1024] = {0};
+        ex_strformat(url, 1023, R"(http://%s:%d/rpc?{"method":"exit"})", g_env.rpc_bind_ip.c_str(), g_env.rpc_bind_port);
+        ex_astr body;
+        ts_http_get(url, body);
+        ex_printf("%s\n", body.c_str());
+        return 0;
+    }
 
-	if (!g_is_debug)
-	{
-		if (!run_daemon_())
-		{
-			EXLOGE("[core] can not run in daemon mode.\n");
-			return 1;
-		}
+    if (!g_is_debug)
+    {
+        if (!run_daemon_())
+        {
+            EXLOGE("[core] can not run in daemon mode.\n");
+            return 1;
+        }
 
 #ifdef EX_OS_WIN32
-		return 0;
+        return 0;
 #endif
-	}
+    }
 
-	return main_loop_();
+    return main_loop_();
 }
 
 
-
 #ifdef EX_OS_WIN32
 
 #ifdef EX_DEBUG
@@ -204,131 +205,131 @@ static DWORD WINAPI service_thread_func(LPVOID lpParam);
 
 int main()
 {
-	int ret = 0;
-	LPWSTR szCmdLine = (LPWSTR)::GetCommandLineW(); //获取命令行参数；
+    int ret = 0;
+    LPWSTR szCmdLine = (LPWSTR)::GetCommandLineW(); //获取命令行参数；
 
-	int _argc = 0;
-	wchar_t** _argv = ::CommandLineToArgvW(szCmdLine, &_argc); //拆分命令行参数字符串；
+    int _argc = 0;
+    wchar_t** _argv = ::CommandLineToArgvW(szCmdLine, &_argc); //拆分命令行参数字符串；
 
-	ret = app_main_(_argc, _argv);
+    ret = app_main_(_argc, _argv);
 
-	LocalFree(_argv);
-	_argv = nullptr;
+    LocalFree(_argv);
+    _argv = nullptr;
 
-	return ret;
+    return ret;
 }
 
 static bool run_daemon_(void)
 {
-	SERVICE_TABLE_ENTRY DispatchTable[2];
-	DispatchTable[0].lpServiceName = EOM_CORE_SERVICE_NAME;
-	DispatchTable[0].lpServiceProc = service_main;
-	DispatchTable[1].lpServiceName = nullptr;
-	DispatchTable[1].lpServiceProc = nullptr;
+    SERVICE_TABLE_ENTRY DispatchTable[2];
+    DispatchTable[0].lpServiceName = EOM_CORE_SERVICE_NAME;
+    DispatchTable[0].lpServiceProc = service_main;
+    DispatchTable[1].lpServiceName = nullptr;
+    DispatchTable[1].lpServiceProc = nullptr;
 
-	if (!StartServiceCtrlDispatcher(DispatchTable))
-	{
-		EXLOGE_WIN("StartServiceCtrlDispatcher()");
-		return false;
-	}
+    if (!StartServiceCtrlDispatcher(DispatchTable))
+    {
+        EXLOGE_WIN("StartServiceCtrlDispatcher()");
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 
 static DWORD WINAPI service_thread_func(LPVOID lpParam)
 {
-	int ret = main_loop_();
+    int ret = main_loop_();
 
-	// 更新服务状态（如果服务还在运行，将其设置为停止状态）
-	g_ServiceStatus.dwWin32ExitCode = 0;
-	g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
-	g_ServiceStatus.dwCheckPoint = 0;
-	g_ServiceStatus.dwWaitHint = 0;
-	if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
-		EXLOGE_WIN("SetServiceStatus()");
+    // 更新服务状态（如果服务还在运行，将其设置为停止状态）
+    g_ServiceStatus.dwWin32ExitCode = 0;
+    g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+    g_ServiceStatus.dwCheckPoint = 0;
+    g_ServiceStatus.dwWaitHint = 0;
+    if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
+        EXLOGE_WIN("SetServiceStatus()");
 
-	return ret;
+    return ret;
 }
 
 static void WINAPI service_handler(DWORD fdwControl)
 {
-	switch (fdwControl)
-	{
-	case SERVICE_CONTROL_STOP:
-	case SERVICE_CONTROL_SHUTDOWN:
-	{
-		if (g_hWorkerThread)
-		{
-			// TerminateThread(g_hWorkerThread, 1);
-			// g_hWorkerThread = nullptr;
-			g_exit_flag = true;
+    switch (fdwControl)
+    {
+    case SERVICE_CONTROL_STOP:
+    case SERVICE_CONTROL_SHUTDOWN:
+    {
+        if (g_hWorkerThread)
+        {
+            // TerminateThread(g_hWorkerThread, 1);
+            // g_hWorkerThread = nullptr;
+            g_exit_flag = true;
 
-			g_ServiceStatus.dwWin32ExitCode = 0;
-			g_ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
-			g_ServiceStatus.dwCheckPoint = 0;
-			g_ServiceStatus.dwWaitHint = 0;
-		}
-		else {
-			g_ServiceStatus.dwWin32ExitCode = 0;
-			g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
-			g_ServiceStatus.dwCheckPoint = 0;
-			g_ServiceStatus.dwWaitHint = 0;
-		}
+            g_ServiceStatus.dwWin32ExitCode = 0;
+            g_ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+            g_ServiceStatus.dwCheckPoint = 0;
+            g_ServiceStatus.dwWaitHint = 0;
+        }
+        else {
+            g_ServiceStatus.dwWin32ExitCode = 0;
+            g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+            g_ServiceStatus.dwCheckPoint = 0;
+            g_ServiceStatus.dwWaitHint = 0;
+        }
 
-	}break;
+    }break;
 
-	default:
-		return;
-	};
+    default:
+        return;
+    };
 
-	if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
-	{
-		EXLOGE_WIN("SetServiceStatus(STOP)");
-		return;
-	}
+    if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
+    {
+        EXLOGE_WIN("SetServiceStatus(STOP)");
+        return;
+    }
 }
 
 VOID WINAPI service_main(DWORD argc, wchar_t** argv)
 {
-	g_ServiceStatus.dwServiceType = SERVICE_WIN32;
-	g_ServiceStatus.dwCurrentState = SERVICE_START_PENDING;
-	g_ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
-	g_ServiceStatus.dwWin32ExitCode = 0;
-	g_ServiceStatus.dwServiceSpecificExitCode = 0;
-	g_ServiceStatus.dwCheckPoint = 0;
-	g_ServiceStatus.dwWaitHint = 0;
-	g_hServiceStatusHandle = RegisterServiceCtrlHandler(EOM_CORE_SERVICE_NAME, service_handler);
-	if (g_hServiceStatusHandle == 0)
-	{
-		EXLOGE_WIN("RegisterServiceCtrlHandler()");
-		return;
-	}
+    g_ServiceStatus.dwServiceType = SERVICE_WIN32;
+    g_ServiceStatus.dwCurrentState = SERVICE_START_PENDING;
+    g_ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+    g_ServiceStatus.dwWin32ExitCode = 0;
+    g_ServiceStatus.dwServiceSpecificExitCode = 0;
+    g_ServiceStatus.dwCheckPoint = 0;
+    g_ServiceStatus.dwWaitHint = 0;
+    g_hServiceStatusHandle = RegisterServiceCtrlHandler(EOM_CORE_SERVICE_NAME, service_handler);
+    if (g_hServiceStatusHandle == 0)
+    {
+        EXLOGE_WIN("RegisterServiceCtrlHandler()");
+        return;
+    }
 
-	DWORD tid = 0;
-	g_hWorkerThread = CreateThread(nullptr, 0, service_thread_func, nullptr, 0, &tid);
-	if (nullptr == g_hWorkerThread)
-	{
-		EXLOGE_WIN("CreateThread()");
+    DWORD tid = 0;
+    g_hWorkerThread = CreateThread(nullptr, 0, service_thread_func, nullptr, 0, &tid);
+    if (nullptr == g_hWorkerThread)
+    {
+        EXLOGE_WIN("CreateThread()");
 
-		g_ServiceStatus.dwWin32ExitCode = 0;
-		g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
-		g_ServiceStatus.dwCheckPoint = 0;
-		g_ServiceStatus.dwWaitHint = 0;
-		if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
-			EXLOGE_WIN("SetServiceStatus()");
+        g_ServiceStatus.dwWin32ExitCode = 0;
+        g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+        g_ServiceStatus.dwCheckPoint = 0;
+        g_ServiceStatus.dwWaitHint = 0;
+        if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
+            EXLOGE_WIN("SetServiceStatus()");
 
-		return;
-	}
+        return;
+    }
 
-	g_ServiceStatus.dwCurrentState = SERVICE_RUNNING;
-	g_ServiceStatus.dwCheckPoint = 0;
-	g_ServiceStatus.dwWaitHint = 9000;
-	if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
-	{
-		EXLOGE_WIN("SetServiceStatus()");
-		return;
-	}
+    g_ServiceStatus.dwCurrentState = SERVICE_RUNNING;
+    g_ServiceStatus.dwCheckPoint = 0;
+    g_ServiceStatus.dwWaitHint = 9000;
+    if (!SetServiceStatus(g_hServiceStatusHandle, &g_ServiceStatus))
+    {
+        EXLOGE_WIN("SetServiceStatus()");
+        return;
+    }
 }
 
 #else
@@ -340,74 +341,74 @@ static void sig_handler_(int signum, siginfo_t* info, void* ptr);
 
 int main(int argc, char** argv)
 {
-	struct sigaction act{};
-	memset(&act, 0, sizeof(act));
-	act.sa_sigaction = sig_handler_;
-	act.sa_flags = SA_SIGINFO;
-	sigaction(SIGINT, &act, nullptr);
+    struct sigaction act{};
+    memset(&act, 0, sizeof(act));
+    act.sa_sigaction = sig_handler_;
+    act.sa_flags = SA_SIGINFO;
+    sigaction(SIGINT, &act, nullptr);
 
-	wchar_t** wargv = ex_make_wargv(argc, argv);
-	int ret = app_main_(argc, wargv);
+    wchar_t** wargv = ex_make_wargv(argc, argv);
+    int ret = app_main_(argc, wargv);
 
-	ex_free_wargv(argc, wargv);
+    ex_free_wargv(argc, wargv);
 
-	return ret;
+    return ret;
 }
 
 void sig_handler_(int signum, siginfo_t* info, void* ptr)
 {
-	if (signum == SIGINT || signum == SIGTERM)
-	{
-		EXLOGW("[core] received signal SIGINT, exit now.\n");
-		g_exit_flag = true;
-	}
+    if (signum == SIGINT || signum == SIGTERM)
+    {
+        EXLOGW("[core] received signal SIGINT, exit now.\n");
+        g_exit_flag = true;
+    }
 }
 
 static bool run_daemon_()
 {
-	pid_t pid = fork();
-	if (pid < 0)
-	{
-		EXLOGE("[core] can not fork daemon.\n");
-		exit(EXIT_FAILURE);
-	}
-	else if (pid > 0)
-	{
-		exit(EXIT_SUCCESS);	// parent exit.
-	}
+    pid_t pid = fork();
+    if (pid < 0)
+    {
+        EXLOGE("[core] can not fork daemon.\n");
+        exit(EXIT_FAILURE);
+    }
+    else if (pid > 0)
+    {
+        exit(EXIT_SUCCESS);    // parent exit.
+    }
 
-	// now I'm first children.
-	if (setsid() == -1)
-	{
-		EXLOGE("[core] setsid() failed.\n");
-		assert(0);
-		// exit(EXIT_FAILURE);
-	}
+    // now I'm first children.
+    if (setsid() == -1)
+    {
+        EXLOGE("[core] setsid() failed.\n");
+        assert(0);
+        // exit(EXIT_FAILURE);
+    }
 
-	umask(0);
+    umask(0);
 
-	pid = fork();
-	if (pid < 0)
-	{
-		EXLOGE("[core] can not fork daemon.\n");
-		exit(EXIT_FAILURE);
-	}
-	else if (pid > 0)
-	{
-		exit(0);	// first children exit.
-	}
+    pid = fork();
+    if (pid < 0)
+    {
+        EXLOGE("[core] can not fork daemon.\n");
+        exit(EXIT_FAILURE);
+    }
+    else if (pid > 0)
+    {
+        exit(0);    // first children exit.
+    }
 
-	// now I'm second children.
-	chdir("/");
-	close(STDIN_FILENO);
+    // now I'm second children.
+    chdir("/");
+    close(STDIN_FILENO);
 
-	int std_fd = open("/dev/null", O_RDWR);
-	close(STDOUT_FILENO);
-	close(STDERR_FILENO);
-	dup2(std_fd, STDOUT_FILENO);
-	dup2(std_fd, STDERR_FILENO);
+    int std_fd = open("/dev/null", O_RDWR);
+    close(STDOUT_FILENO);
+    close(STDERR_FILENO);
+    dup2(std_fd, STDOUT_FILENO);
+    dup2(std_fd, STDERR_FILENO);
 
-	return true;
+    return true;
 }
 
 #endif
diff --git a/server/tp_core/core/tp_tpp_mgr.cpp b/server/tp_core/core/tp_tpp_mgr.cpp
index 6908d10..4926b07 100644
--- a/server/tp_core/core/tp_tpp_mgr.cpp
+++ b/server/tp_core/core/tp_tpp_mgr.cpp
@@ -6,7 +6,8 @@ TppManager g_tpp_mgr;
 
 extern ExLogger g_ex_logger;
 
-bool TppManager::load_tpp(const ex_wstr& libname) {
+bool TppManager::load_tpp(const ex_wstr& libname)
+{
     ex_wstr filename;
 #ifdef EX_OS_WIN32
     filename = libname + L".dll";
@@ -27,7 +28,8 @@ bool TppManager::load_tpp(const ex_wstr& libname) {
     auto lib = new TPP_LIB;
 
     lib->dylib = ex_dlopen(lib_file.c_str());
-    if (nullptr == lib->dylib) {
+    if (nullptr == lib->dylib)
+    {
         EXLOGE(L"[core] load dylib `%ls` failed.\n", lib_file.c_str());
         delete lib;
         return false;
@@ -40,11 +42,11 @@ bool TppManager::load_tpp(const ex_wstr& libname) {
     lib->timer = (TPP_TIMER_FUNC)GetProcAddress(lib->dylib, "tpp_timer");
     lib->command = (TPP_COMMAND_FUNC)GetProcAddress(lib->dylib, "tpp_command");
 #else
-    lib->init = (TPP_INIT_FUNC) dlsym(lib->dylib, "tpp_init");
-    lib->start = (TPP_START_FUNC) dlsym(lib->dylib, "tpp_start");
-    lib->stop = (TPP_STOP_FUNC) dlsym(lib->dylib, "tpp_stop");
-    lib->timer = (TPP_TIMER_FUNC) dlsym(lib->dylib, "tpp_timer");
-    lib->command = (TPP_COMMAND_FUNC) dlsym(lib->dylib, "tpp_command");
+    lib->init = (TPP_INIT_FUNC)dlsym(lib->dylib, "tpp_init");
+    lib->start = (TPP_START_FUNC)dlsym(lib->dylib, "tpp_start");
+    lib->stop = (TPP_STOP_FUNC)dlsym(lib->dylib, "tpp_stop");
+    lib->timer = (TPP_TIMER_FUNC)dlsym(lib->dylib, "tpp_timer");
+    lib->command = (TPP_COMMAND_FUNC)dlsym(lib->dylib, "tpp_command");
 #endif
 
     if (
@@ -53,7 +55,8 @@ bool TppManager::load_tpp(const ex_wstr& libname) {
             || lib->stop == nullptr
             || lib->timer == nullptr
             || lib->command == nullptr
-            ) {
+            )
+    {
         EXLOGE(L"[core] load dylib `%ls` failed, can not locate all functions.\n", lib_file.c_str());
         delete lib;
         return false;
@@ -71,12 +74,14 @@ bool TppManager::load_tpp(const ex_wstr& libname) {
     init_args.func_session_update = tpp_session_update;
     init_args.func_session_end = tpp_session_end;
 
-    if (EXRV_OK != lib->init(&init_args)) {
+    if (EXRV_OK != lib->init(&init_args))
+    {
         EXLOGE(L"[core] failed to init protocol `%ls`.\n", libname.c_str());
         delete lib;
         return false;
     }
-    if (EXRV_OK != lib->start()) {
+    if (EXRV_OK != lib->start())
+    {
         EXLOGE(L"[core] failed to start protocol `%ls`.\n", libname.c_str());
         delete lib;
         return false;
@@ -86,14 +91,18 @@ bool TppManager::load_tpp(const ex_wstr& libname) {
     return true;
 }
 
-void TppManager::stop_all() {
-    for (auto& lib : m_libs) {
+void TppManager::stop_all()
+{
+    for (auto& lib: m_libs)
+    {
         lib->stop();
     }
 }
 
-void TppManager::timer() {
-    for (auto& lib : m_libs) {
+void TppManager::timer()
+{
+    for (auto& lib: m_libs)
+    {
         lib->timer();
     }
 }
@@ -110,14 +119,18 @@ void TppManager::timer() {
 // 	}
 // }
 
-void TppManager::set_runtime_config(const ex_astr& sp) {
-    for (auto& lib : m_libs) {
+void TppManager::set_runtime_config(const ex_astr& sp)
+{
+    for (auto& lib: m_libs)
+    {
         lib->command(TPP_CMD_SET_RUNTIME_CFG, sp.c_str());
     }
 }
 
-void TppManager::kill_sessions(const ex_astr& sp) {
-    for (auto& lib : m_libs) {
+void TppManager::kill_sessions(const ex_astr& sp)
+{
+    for (auto& lib: m_libs)
+    {
         lib->command(TPP_CMD_KILL_SESSIONS, sp.c_str());
     }
 }
diff --git a/server/tp_core/core/tp_tpp_mgr.h b/server/tp_core/core/tp_tpp_mgr.h
index e741e2b..0147645 100644
--- a/server/tp_core/core/tp_tpp_mgr.h
+++ b/server/tp_core/core/tp_tpp_mgr.h
@@ -5,17 +5,20 @@
 
 #include <ex.h>
 
-typedef struct TPP_LIB {
+typedef struct TPP_LIB
+{
     TPP_LIB() :
             dylib(nullptr),
             init(nullptr),
             start(nullptr),
             stop(nullptr),
             timer(nullptr),
-            command(nullptr) {
+            command(nullptr)
+    {
     }
 
-    ~TPP_LIB() {
+    ~TPP_LIB()
+    {
         if (nullptr != dylib)
             ex_dlclose(dylib);
         dylib = nullptr;
@@ -31,12 +34,15 @@ typedef struct TPP_LIB {
 
 typedef std::list<TPP_LIB*> tpp_libs;
 
-class TppManager {
+class TppManager
+{
 public:
     TppManager() = default;
 
-    ~TppManager() {
-        for (auto lib : m_libs) {
+    ~TppManager()
+    {
+        for (auto lib: m_libs)
+        {
             delete lib;
         }
         m_libs.clear();
@@ -48,7 +54,8 @@ public:
 
     void timer(); // ��Լ1�����һ��
 
-    int count() {
+    size_t count()
+    {
         return m_libs.size();
     }
 
diff --git a/server/tp_core/core/ts_crypto.cpp b/server/tp_core/core/ts_crypto.cpp
index 3fe7f87..1cbd63f 100644
--- a/server/tp_core/core/ts_crypto.cpp
+++ b/server/tp_core/core/ts_crypto.cpp
@@ -9,172 +9,172 @@
 */
 
 static ex_u8 g_db_field_aes_key[32] = {
-	0xd6, 0xb6, 0x6e, 0x3b, 0x41, 0xc4, 0x33, 0x13, 0xaa, 0x61, 0xc9, 0x47, 0x82, 0xfc, 0x84, 0x50,
-	0x85, 0x53, 0x3a, 0x01, 0x97, 0x2d, 0xca, 0xba, 0x87, 0xbc, 0x27, 0x20, 0x29, 0xde, 0x87, 0x67,
+        0xd6, 0xb6, 0x6e, 0x3b, 0x41, 0xc4, 0x33, 0x13, 0xaa, 0x61, 0xc9, 0x47, 0x82, 0xfc, 0x84, 0x50,
+        0x85, 0x53, 0x3a, 0x01, 0x97, 0x2d, 0xca, 0xba, 0x87, 0xbc, 0x27, 0x20, 0x29, 0xde, 0x87, 0x67,
 };
 
 bool ts_db_field_encrypt(const ex_astr& str_dec, ex_astr& str_enc)
 {
-	ex_bin bin_dec;
-	bin_dec.resize(str_dec.length());
-	memset(&bin_dec[0], 0, bin_dec.size());
-	memcpy(&bin_dec[0], str_dec.c_str(), bin_dec.size());
+    ex_bin bin_dec;
+    bin_dec.resize(str_dec.length());
+    memset(&bin_dec[0], 0, bin_dec.size());
+    memcpy(&bin_dec[0], str_dec.c_str(), bin_dec.size());
 
-	return ts_db_field_encrypt(bin_dec, str_enc);
+    return ts_db_field_encrypt(bin_dec, str_enc);
 }
 
 bool ts_db_field_decrypt(const ex_astr& str_enc, ex_astr& str_dec)
 {
-	ex_bin bin_dec;
-	if (!ts_db_field_decrypt(str_enc, bin_dec))
-		return false;
-	if (bin_dec[bin_dec.size() - 1] != 0)
-	{
-		bin_dec.resize(bin_dec.size() + 1);
-		bin_dec[bin_dec.size() - 1] = 0;
-	}
+    ex_bin bin_dec;
+    if (!ts_db_field_decrypt(str_enc, bin_dec))
+        return false;
+    if (bin_dec[bin_dec.size() - 1] != 0)
+    {
+        bin_dec.resize(bin_dec.size() + 1);
+        bin_dec[bin_dec.size() - 1] = 0;
+    }
 
-	str_dec = (char*)&bin_dec[0];
-	return true;
+    str_dec = (char*)&bin_dec[0];
+    return true;
 }
 
 
 bool ts_db_field_encrypt(const ex_bin& bin_dec, ex_astr& str_enc)
 {
-	int i = 0;
-	int offset = 0;
+    int i = 0;
+    int offset = 0;
 
-	// ��������ӷ�������ע����̵߳����⣩
-	ex_u64 _tick = ex_get_tick_count();
-	ex_u64 _seed_tmp = ex_get_thread_id() + _tick;
-	ex_u32 _seed = ((ex_u32*)&_seed_tmp)[0] + ((ex_u32*)&_seed_tmp)[1];
-	srand(_seed);
+    // ��������ӷ�������ע����̵߳����⣩
+    ex_u64 _tick = ex_get_tick_count();
+    ex_u64 _seed_tmp = ex_get_thread_id() + _tick;
+    ex_u32 _seed = ((ex_u32*)&_seed_tmp)[0] + ((ex_u32*)&_seed_tmp)[1];
+    srand(_seed);
 
-	// �������Ĵ�С
-	int pad = 16 - bin_dec.size() % 16;
-	int enc_size = bin_dec.size() + pad + 16;	// ׷��16�ֽ���Ϊ�˶������������
+    // �������Ĵ�С
+    int pad = 16 - bin_dec.size() % 16;
+    int enc_size = bin_dec.size() + pad + 16;    // ׷��16�ֽ���Ϊ�˶������������
 
-	// ׼�����������ݣ�16�ֽ������+����+������䣩
-	ex_bin bin_be_enc;
-	bin_be_enc.resize(enc_size);
-	memset(&bin_be_enc[0], 0, bin_be_enc.size());
-	offset = 0;
-	for (i = 0; i < 16; ++i)
-	{
-		bin_be_enc[offset] = (unsigned char)(rand() % 0xFF);
-		offset++;
-	}
-	memcpy(&bin_be_enc[offset], &bin_dec[0], bin_dec.size());
-	offset += bin_dec.size();
-	for (i = 0; i < pad; ++i)
-	{
-		bin_be_enc[offset] = (unsigned char)pad;
-		offset++;
-	}
+    // ׼�����������ݣ�16�ֽ������+����+������䣩
+    ex_bin bin_be_enc;
+    bin_be_enc.resize(enc_size);
+    memset(&bin_be_enc[0], 0, bin_be_enc.size());
+    offset = 0;
+    for (i = 0; i < 16; ++i)
+    {
+        bin_be_enc[offset] = (unsigned char)(rand() % 0xFF);
+        offset++;
+    }
+    memcpy(&bin_be_enc[offset], &bin_dec[0], bin_dec.size());
+    offset += bin_dec.size();
+    for (i = 0; i < pad; ++i)
+    {
+        bin_be_enc[offset] = (unsigned char)pad;
+        offset++;
+    }
 
-	// ׼�����Ļ�����
-	ex_bin bin_enc;
-	bin_enc.resize(enc_size);
-	memset(&bin_enc[0], 0, bin_enc.size());
+    // ׼�����Ļ�����
+    ex_bin bin_enc;
+    bin_enc.resize(enc_size);
+    memset(&bin_enc[0], 0, bin_enc.size());
 
-	// ׼�������㷨
-	mbedtls_aes_context ctx;
-	mbedtls_aes_init(&ctx);
-	if (0 != mbedtls_aes_setkey_enc(&ctx, g_db_field_aes_key, 256))
-	{
-		EXLOGE("[core] invalid AES key.\n");
-		return false;
-	}
+    // ׼�������㷨
+    mbedtls_aes_context ctx;
+    mbedtls_aes_init(&ctx);
+    if (0 != mbedtls_aes_setkey_enc(&ctx, g_db_field_aes_key, 256))
+    {
+        EXLOGE("[core] invalid AES key.\n");
+        return false;
+    }
 
-	// ����
-	unsigned char iv[16] = { 0 };
-	memset(iv, 0, 16);
-	if (0 != mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, enc_size, iv, &bin_be_enc[0], &bin_enc[0]))
-	{
-		EXLOGE("[core] AES-CBC encrypt failed.\n");
-		mbedtls_aes_free(&ctx);
-		return false;
-	}
-	mbedtls_aes_free(&ctx);
+    // ����
+    unsigned char iv[16] = {0};
+    memset(iv, 0, 16);
+    if (0 != mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, enc_size, iv, &bin_be_enc[0], &bin_enc[0]))
+    {
+        EXLOGE("[core] AES-CBC encrypt failed.\n");
+        mbedtls_aes_free(&ctx);
+        return false;
+    }
+    mbedtls_aes_free(&ctx);
 
-	// �����ܽ������base64����
-	ex_bin enc_b64;
-	enc_b64.resize(enc_size * 2);
-	memset(&enc_b64[0], 0, enc_size * 2);
-	size_t olen = 0;
-	if (0 != mbedtls_base64_encode(&enc_b64[0], enc_size * 2, &olen, &bin_enc[0], enc_size))
-	{
-		EXLOGE("[core] BASE64 encode failed.\n");
-		return false;
-	}
-	enc_b64[olen] = 0;
-	str_enc = (char*)&enc_b64[0];
+    // �����ܽ������base64����
+    ex_bin enc_b64;
+    enc_b64.resize(enc_size * 2);
+    memset(&enc_b64[0], 0, enc_size * 2);
+    size_t olen = 0;
+    if (0 != mbedtls_base64_encode(&enc_b64[0], enc_size * 2, &olen, &bin_enc[0], enc_size))
+    {
+        EXLOGE("[core] BASE64 encode failed.\n");
+        return false;
+    }
+    enc_b64[olen] = 0;
+    str_enc = (char*)&enc_b64[0];
 
-	return true;
+    return true;
 }
 
 bool ts_db_field_decrypt(const ex_astr& str_enc, ex_bin& bin_dec)
 {
-	ex_bin bin_enc;
-	bin_enc.resize(str_enc.length());
-	memset(&bin_enc[0], 0, bin_enc.size());
+    ex_bin bin_enc;
+    bin_enc.resize(str_enc.length());
+    memset(&bin_enc[0], 0, bin_enc.size());
 
-	// base64����
-	size_t enc_size = 0;
-	if (0 != mbedtls_base64_decode(&bin_enc[0], bin_enc.size(), &enc_size, (const unsigned char*)str_enc.c_str(), str_enc.length()))
-	{
-		EXLOGE("[core] BASE64 decode failed.\n");
-		return false;
-	}
-	bin_enc.resize(enc_size);
-	if (bin_enc.size() % 16 != 0)
-	{
-		EXLOGE("[core] invalid cipher-data.\n");
-		return false;
-	}
+    // base64����
+    size_t enc_size = 0;
+    if (0 != mbedtls_base64_decode(&bin_enc[0], bin_enc.size(), &enc_size, (const unsigned char*)str_enc.c_str(), str_enc.length()))
+    {
+        EXLOGE("[core] BASE64 decode failed.\n");
+        return false;
+    }
+    bin_enc.resize(enc_size);
+    if (bin_enc.size() % 16 != 0)
+    {
+        EXLOGE("[core] invalid cipher-data.\n");
+        return false;
+    }
 
-	// ׼�����Ļ�����
-	ex_bin bin_tmp;
-	bin_tmp.resize(enc_size);
-	memset(&bin_tmp[0], 0, bin_tmp.size());
+    // ׼�����Ļ�����
+    ex_bin bin_tmp;
+    bin_tmp.resize(enc_size);
+    memset(&bin_tmp[0], 0, bin_tmp.size());
 
-	// ׼�������㷨
-	mbedtls_aes_context ctx;
-	mbedtls_aes_init(&ctx);
-	if (0 != mbedtls_aes_setkey_dec(&ctx, g_db_field_aes_key, 256))
-	{
-		EXLOGE("[core] invalid AES key.\n");
-		return false;
-	}
+    // ׼�������㷨
+    mbedtls_aes_context ctx;
+    mbedtls_aes_init(&ctx);
+    if (0 != mbedtls_aes_setkey_dec(&ctx, g_db_field_aes_key, 256))
+    {
+        EXLOGE("[core] invalid AES key.\n");
+        return false;
+    }
 
-	// ����
-	unsigned char iv[16] = { 0 };
-	memset(iv, 0, 16);
-	if (0 != mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, enc_size, iv, &bin_enc[0], &bin_tmp[0]))
-	{
-		EXLOGE("[core] AES-CBC decrypt failed.\n");
-		mbedtls_aes_free(&ctx);
-		return false;
-	}
-	mbedtls_aes_free(&ctx);
+    // ����
+    unsigned char iv[16] = {0};
+    memset(iv, 0, 16);
+    if (0 != mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, enc_size, iv, &bin_enc[0], &bin_tmp[0]))
+    {
+        EXLOGE("[core] AES-CBC decrypt failed.\n");
+        mbedtls_aes_free(&ctx);
+        return false;
+    }
+    mbedtls_aes_free(&ctx);
 
-	// ȥ��padding
-	unsigned char pad = bin_tmp[bin_tmp.size() - 1];
-	if (pad == 0 || pad > 16)
-	{
-		EXLOGE("[core] invalid padding.\n");
-		return false;
-	}
-	bin_tmp.resize(bin_tmp.size() - pad);
-	if (bin_tmp.size() < 16)
-	{
-		EXLOGE("[core] invalid decrypted data.\n");
-		return false;
-	}
+    // ȥ��padding
+    unsigned char pad = bin_tmp[bin_tmp.size() - 1];
+    if (pad == 0 || pad > 16)
+    {
+        EXLOGE("[core] invalid padding.\n");
+        return false;
+    }
+    bin_tmp.resize(bin_tmp.size() - pad);
+    if (bin_tmp.size() < 16)
+    {
+        EXLOGE("[core] invalid decrypted data.\n");
+        return false;
+    }
 
-	// �����ս�����Ƶ����ػ���������Ҫ����ǰ���16�ֽ��������
-	bin_dec.resize(bin_tmp.size() - 16);
-	memcpy(&bin_dec[0], &bin_tmp[16], bin_dec.size());
+    // �����ս�����Ƶ����ػ���������Ҫ����ǰ���16�ֽ��������
+    bin_dec.resize(bin_tmp.size() - 16);
+    memcpy(&bin_dec[0], &bin_tmp[16], bin_dec.size());
 
-	return true;
+    return true;
 }
diff --git a/server/tp_core/core/ts_crypto.h b/server/tp_core/core/ts_crypto.h
index 5d499b8..6da0f11 100644
--- a/server/tp_core/core/ts_crypto.h
+++ b/server/tp_core/core/ts_crypto.h
@@ -5,9 +5,11 @@
 
 // �������ݿ��ֶεļ���/���ܣ�ʹ��������Կ�����ܽ��Ϊbase64������ַ���
 bool ts_db_field_encrypt(const ex_bin& bin_dec, ex_astr& str_enc);
+
 bool ts_db_field_decrypt(const ex_astr& str_enc, ex_bin& bin_dec);
 
 bool ts_db_field_encrypt(const ex_astr& str_dec, ex_astr& str_enc);
+
 bool ts_db_field_decrypt(const ex_astr& str_enc, ex_astr& str_dec);
 
 
diff --git a/server/tp_core/core/ts_env.cpp b/server/tp_core/core/ts_env.cpp
index 82c834f..e0833f5 100644
--- a/server/tp_core/core/ts_env.cpp
+++ b/server/tp_core/core/ts_env.cpp
@@ -3,145 +3,144 @@
 
 TsEnv g_env;
 
-TsEnv::TsEnv()
-{}
+TsEnv::TsEnv() {}
 
-TsEnv::~TsEnv()
-{}
+TsEnv::~TsEnv() {}
 
 bool TsEnv::init(bool load_config)
 {
-	EXLOG_LEVEL(EX_LOG_LEVEL_INFO);
+    EXLOG_LEVEL(EX_LOG_LEVEL_INFO);
 
-	ex_exec_file(m_exec_file);
+    ex_exec_file(m_exec_file);
 
-	m_exec_path = m_exec_file;
-	ex_dirname(m_exec_path);
+    m_exec_path = m_exec_file;
+    ex_dirname(m_exec_path);
 
-	if(!load_config)
-		return true;
+    if (!load_config)
+        return true;
 
-	// check development flag file, if exists, run in development mode for trace and debug.
-	ex_wstr dev_flag_file = m_exec_path;
-	ex_path_join(dev_flag_file, false, L"dev_mode", NULL);
+    // check development flag file, if exists, run in development mode for trace and debug.
+    ex_wstr dev_flag_file = m_exec_path;
+    ex_path_join(dev_flag_file, false, L"dev_mode", NULL);
 
-	ex_wstr base_path = m_exec_path;
-	ex_wstr log_path;
-	ex_wstr conf_file;
+    ex_wstr base_path = m_exec_path;
+    ex_wstr log_path;
+    ex_wstr conf_file;
 
-	if (ex_is_file_exists(dev_flag_file.c_str()))
-	{
-		EXLOGW("===== DEVELOPMENT MODE =====\n");
+    if (ex_is_file_exists(dev_flag_file.c_str()))
+    {
+        EXLOGW("===== DEVELOPMENT MODE =====\n");
 
-		ex_path_join(base_path, true, L"..", L"..", L"..", L"..", L"server", NULL);
+        ex_path_join(base_path, true, L"..", L"..", L"..", L"..", L"server", NULL);
 
-		m_etc_path = base_path;
-		ex_path_join(m_etc_path, false, L"share", L"etc", NULL);
+        m_etc_path = base_path;
+        ex_path_join(m_etc_path, false, L"share", L"etc", NULL);
 
-		conf_file = m_etc_path;
-		ex_path_join(conf_file, false, L"core.ini", NULL);
+        conf_file = m_etc_path;
+        ex_path_join(conf_file, false, L"core.ini", NULL);
 
-		m_replay_path = base_path;
-		ex_path_join(m_replay_path, false, L"share", L"replay", NULL);
+        m_replay_path = base_path;
+        ex_path_join(m_replay_path, false, L"share", L"replay", NULL);
 
-		log_path = base_path;
-		ex_path_join(log_path, false, L"share", L"log", NULL);
-	}
-	else	// not in development mode
-	{
-		base_path = m_exec_path;
-		ex_path_join(base_path, true, L"..", L"data", NULL);
-		m_etc_path = base_path;
-		ex_path_join(m_etc_path, false, L"etc", NULL);
-		conf_file = m_etc_path;
-		ex_path_join(conf_file, false, L"core.ini", NULL);
-		m_replay_path = base_path;
-		ex_path_join(m_replay_path, false, L"replay", NULL);
-		log_path = base_path;
-		ex_path_join(log_path, false, L"log", NULL);
-	}
+        log_path = base_path;
+        ex_path_join(log_path, false, L"share", L"log", NULL);
+    }
+    else    // not in development mode
+    {
+        base_path = m_exec_path;
+        ex_path_join(base_path, true, L"..", L"data", NULL);
+        m_etc_path = base_path;
+        ex_path_join(m_etc_path, false, L"etc", NULL);
+        conf_file = m_etc_path;
+        ex_path_join(conf_file, false, L"core.ini", NULL);
+        m_replay_path = base_path;
+        ex_path_join(m_replay_path, false, L"replay", NULL);
+        log_path = base_path;
+        ex_path_join(log_path, false, L"log", NULL);
+    }
 
-	if (!m_ini.LoadFromFile(conf_file))
-	{
-		EXLOGE(L"[core] can not load %ls.\n", conf_file.c_str());
-		return false;
-	}
+    if (!m_ini.LoadFromFile(conf_file))
+    {
+        EXLOGE(L"[core] can not load %ls.\n", conf_file.c_str());
+        return false;
+    }
 
-	ExIniSection* ps = m_ini.GetSection(L"common");
-	if(NULL == ps)
-		ps = m_ini.GetDumySection();
+    ExIniSection* ps = m_ini.GetSection(L"common");
+    if (NULL == ps)
+        ps = m_ini.GetDumySection();
 
-	ex_wstr replay_path;
-	if (ps->GetStr(L"replay-path", replay_path))
-	{
-		m_replay_path = replay_path;
-	}
+    ex_wstr replay_path;
+    if (ps->GetStr(L"replay-path", replay_path))
+    {
+        m_replay_path = replay_path;
+    }
     ex_mkdirs(m_replay_path);
 
 
     ex_wstr log_file;
-	if (!ps->GetStr(L"log-file", log_file))
-	{
-		EXLOG_FILE(L"tpcore.log", log_path.c_str());
-	}
-	else
-	{
-		ex_remove_white_space(log_file);
-		if (log_file[0] == L'"' || log_file[0] == L'\'')
-			log_file.erase(0, 1);
-		if (log_file[ log_file.length() - 1 ] == L'"' || log_file[log_file.length() - 1] == L'\'')
-			log_file.erase(log_file.length() - 1, 1);
+    if (!ps->GetStr(L"log-file", log_file))
+    {
+        EXLOG_FILE(L"tpcore.log", log_path.c_str());
+    }
+    else
+    {
+        ex_remove_white_space(log_file);
+        if (log_file[0] == L'"' || log_file[0] == L'\'')
+            log_file.erase(0, 1);
+        if (log_file[log_file.length() - 1] == L'"' || log_file[log_file.length() - 1] == L'\'')
+            log_file.erase(log_file.length() - 1, 1);
 
-		log_path = log_file;
-		ex_dirname(log_path);
-		ex_wstr file_name;
-		file_name.assign(log_file, log_path.length() + 1, log_file.length());
+        log_path = log_file;
+        ex_dirname(log_path);
+        ex_wstr file_name;
+        file_name.assign(log_file, log_path.length() + 1, log_file.length());
 
-		EXLOG_FILE(file_name.c_str(), log_path.c_str());
-	}
+        EXLOG_FILE(file_name.c_str(), log_path.c_str());
+    }
 
-	int log_level = EX_LOG_LEVEL_INFO;
-	ps->GetInt(L"log-level", log_level, EX_LOG_LEVEL_INFO);
-	EXLOG_LEVEL(log_level);
+    int log_level = EX_LOG_LEVEL_INFO;
+    ps->GetInt(L"log-level", log_level, EX_LOG_LEVEL_INFO);
+    EXLOG_LEVEL(log_level);
 
-	int debug_mode = 0;
-	ps->GetInt(L"debug-mode", debug_mode, 0);
-	if (debug_mode == 1) {
-		EXLOG_LEVEL(EX_LOG_LEVEL_DEBUG);
-		EXLOG_DEBUG(true);
-	}
+    int debug_mode = 0;
+    ps->GetInt(L"debug-mode", debug_mode, 0);
+    if (debug_mode == 1)
+    {
+        EXLOG_LEVEL(EX_LOG_LEVEL_DEBUG);
+        EXLOG_DEBUG(true);
+    }
 
-	ex_wstr tmp;
+    ex_wstr tmp;
 
-	if (!ps->GetStr(L"web-server-rpc", tmp))
-	{
-		web_server_rpc = "http://localhost:7190/rpc";
-	}
-	else
-	{
-		ex_wstr2astr(tmp, web_server_rpc);
-	}
+    if (!ps->GetStr(L"web-server-rpc", tmp))
+    {
+        web_server_rpc = "http://localhost:7190/rpc";
+    }
+    else
+    {
+        ex_wstr2astr(tmp, web_server_rpc);
+    }
 
-	ps = m_ini.GetSection(L"rpc");
-	if (!ps->GetStr(L"bind-ip", tmp))
-	{
-		rpc_bind_ip = TS_HTTP_RPC_HOST;
-	}
-	else
-	{
-		ex_wstr2astr(tmp, rpc_bind_ip);
-		//if (rpc_bind_ip == "localhost")
-		//	rpc_bind_ip = "127.0.0.1";
-	}
+    ps = m_ini.GetSection(L"rpc");
+    if (!ps->GetStr(L"bind-ip", tmp))
+    {
+        rpc_bind_ip = TS_HTTP_RPC_HOST;
+    }
+    else
+    {
+        ex_wstr2astr(tmp, rpc_bind_ip);
+        //if (rpc_bind_ip == "localhost")
+        //	rpc_bind_ip = "127.0.0.1";
+    }
 
-	if (!ps->GetInt(L"bind-port", rpc_bind_port))
-	{
-		rpc_bind_port = TS_HTTP_RPC_PORT;
-	}
+    if (!ps->GetInt(L"bind-port", rpc_bind_port))
+    {
+        rpc_bind_port = TS_HTTP_RPC_PORT;
+    }
 
-	char port_str[20] = { 0 };
-	ex_strformat(port_str, 20, "%d", rpc_bind_port);
-	core_server_rpc = "http://" + rpc_bind_ip + ":" + port_str + "/rpc";
+    char port_str[20] = {0};
+    ex_strformat(port_str, 20, "%d", rpc_bind_port);
+    core_server_rpc = "http://" + rpc_bind_ip + ":" + port_str + "/rpc";
 
-	return true;
+    return true;
 }
diff --git a/server/tp_core/core/ts_env.h b/server/tp_core/core/ts_env.h
index 2936dcc..6f543cd 100644
--- a/server/tp_core/core/ts_env.h
+++ b/server/tp_core/core/ts_env.h
@@ -6,27 +6,28 @@
 class TsEnv
 {
 public:
-	TsEnv();
-	~TsEnv();
+    TsEnv();
 
-	bool init(bool load_config);
+    ~TsEnv();
 
-	ExIniFile& get_ini() { return m_ini; }
+    bool init(bool load_config);
+
+    ExIniFile& get_ini() { return m_ini; }
 
 public:
-	ex_wstr m_exec_file;
-	ex_wstr m_exec_path;
-	ex_wstr m_etc_path;
-	ex_wstr m_replay_path;
+    ex_wstr m_exec_file;
+    ex_wstr m_exec_path;
+    ex_wstr m_etc_path;
+    ex_wstr m_replay_path;
 
-	ex_astr rpc_bind_ip;
-	int rpc_bind_port;
+    ex_astr rpc_bind_ip;
+    int rpc_bind_port;
 
-	ex_astr web_server_rpc;
-	ex_astr core_server_rpc;
+    ex_astr web_server_rpc;
+    ex_astr core_server_rpc;
 
 private:
-	ExIniFile m_ini;
+    ExIniFile m_ini;
 };
 
 extern TsEnv g_env;
diff --git a/server/tp_core/core/ts_http_client.cpp b/server/tp_core/core/ts_http_client.cpp
index bfdaf74..0ad11e9 100644
--- a/server/tp_core/core/ts_http_client.cpp
+++ b/server/tp_core/core/ts_http_client.cpp
@@ -3,69 +3,73 @@
 
 #include <ex/ex_str.h>
 
-void ts_url_encode(const char *src, ex_astr& out)
+void ts_url_encode(const char* src, ex_astr& out)
 {
-	static const char *dont_escape = "._-$,;~()/";
-	static const char *hex = "0123456789abcdef";
+    static const char* dont_escape = "._-$,;~()/";
+    static const char* hex = "0123456789abcdef";
 
-	size_t s_len = strlen(src);
-	size_t dst_len = s_len * 3 + 1;
-	char* dst = new char[dst_len];
-	memset(dst, 0, dst_len);
+    size_t s_len = strlen(src);
+    size_t dst_len = s_len * 3 + 1;
+    char* dst = new char[dst_len];
+    memset(dst, 0, dst_len);
 
-	size_t i = 0, j = 0;
+    size_t i = 0, j = 0;
 
-	for (i = j = 0; dst_len > 0 && i < s_len && j + 2 < dst_len - 1; i++, j++) {
-		if (isalnum(*(const unsigned char *)(src + i)) ||
-			strchr(dont_escape, *(const unsigned char *)(src + i)) != NULL) {
-			dst[j] = src[i];
-		}
-		else if (j + 3 < dst_len) {
-			dst[j] = '%';
-			dst[j + 1] = hex[(*(const unsigned char *)(src + i)) >> 4];
-			dst[j + 2] = hex[(*(const unsigned char *)(src + i)) & 0xf];
-			j += 2;
-		}
-	}
+    for (i = j = 0; dst_len > 0 && i < s_len && j + 2 < dst_len - 1; i++, j++)
+    {
+        if (isalnum(*(const unsigned char*)(src + i)) ||
+            strchr(dont_escape, *(const unsigned char*)(src + i)) != nullptr)
+        {
+            dst[j] = src[i];
+        }
+        else if (j + 3 < dst_len)
+        {
+            dst[j] = '%';
+            dst[j + 1] = hex[(*(const unsigned char*)(src + i)) >> 4];
+            dst[j + 2] = hex[(*(const unsigned char*)(src + i)) & 0xf];
+            j += 2;
+        }
+    }
 
-	dst[j] = '\0';
-	out = dst;
-	delete []dst;
+    dst[j] = '\0';
+    out = dst;
+    delete[]dst;
 }
 
-typedef struct HTTP_DATA {
-	bool exit_flag;
-	bool have_error;
-	ex_astr body;
-}HTTP_DATA;
-
-static void ev_handler(struct mg_connection *nc, int ev, void *ev_data)
+typedef struct HTTP_DATA
 {
-	HTTP_DATA* hdata = (HTTP_DATA*)nc->user_data;
-	struct http_message *hm = (struct http_message *) ev_data;
+    bool exit_flag;
+    bool have_error;
+    ex_astr body;
+} HTTP_DATA;
 
-	switch (ev) {
-	case MG_EV_CONNECT:
-		if (*(int *)ev_data != 0) {
-			hdata->exit_flag = true;
-			hdata->have_error = true;
-		}
-		break;
-	case MG_EV_HTTP_REPLY:
-		nc->flags |= MG_F_CLOSE_IMMEDIATELY;
-		//hdata->exit_flag = true;
-		hdata->body.assign(hm->body.p, hm->body.len);
-		break;
-	case MG_EV_CLOSE:
-// 		if (s_exit_flag == 0) {
-// 			printf("Server closed connection\n");
-// 			s_exit_flag = 1;
-// 		}
-		hdata->exit_flag = true;
-		break;
-	default:
-		break;
-	}
+static void ev_handler(struct mg_connection* nc, int ev, void* ev_data)
+{
+    auto* p_http_data = (HTTP_DATA*)nc->user_data;
+    auto* hm = (struct http_message*)ev_data;
+
+    switch (ev)
+    {
+    case MG_EV_CONNECT:
+        if (*(int*)ev_data != 0)
+        {
+            p_http_data->exit_flag = true;
+            p_http_data->have_error = true;
+        }
+        break;
+    case MG_EV_HTTP_REPLY: nc->flags |= MG_F_CLOSE_IMMEDIATELY;
+        //p_http_data->exit_flag = true;
+        p_http_data->body.assign(hm->body.p, hm->body.len);
+        break;
+    case MG_EV_CLOSE:
+        // 		if (s_exit_flag == 0) {
+        // 			printf("Server closed connection\n");
+        // 			s_exit_flag = 1;
+        // 		}
+        p_http_data->exit_flag = true;
+        break;
+    default: break;
+    }
 }
 
 //static struct mg_mgr g_mg_mgr;
@@ -107,62 +111,63 @@ bool ts_http_get(const ex_astr& url, ex_astr& body)
 //         is_mg_mgr_initialized = true;
 //     }
 
-	mg_connection* nc = mg_connect_http(g_mg_mgr.get_mg_mgr(), ev_handler, url.c_str(), NULL, NULL);
-	if (NULL == nc)
-		return false;
+    mg_connection* nc = mg_connect_http(g_mg_mgr.get_mg_mgr(), ev_handler, url.c_str(), NULL, NULL);
+    if (NULL == nc)
+        return false;
 
-	//HTTP_DATA* hdata = new HTTP_DATA;
-	HTTP_DATA hdata;
-	hdata.exit_flag = false;
-	hdata.have_error = false;
+    //HTTP_DATA* hdata = new HTTP_DATA;
+    HTTP_DATA hdata;
+    hdata.exit_flag = false;
+    hdata.have_error = false;
 
-	nc->user_data = &hdata;
+    nc->user_data = &hdata;
 
 //	int count = 0;
-	while (!hdata.exit_flag)
-	{
-		mg_mgr_poll(g_mg_mgr.get_mg_mgr(), 100);
+    while (!hdata.exit_flag)
+    {
+        mg_mgr_poll(g_mg_mgr.get_mg_mgr(), 100);
 // 		count++;
 // 		if (count > 2)
 // 			break;
-	}
+    }
 
-	bool ret = !hdata.have_error;
-	if (ret)
-		body = hdata.body;
+    bool ret = !hdata.have_error;
+    if (ret)
+        body = hdata.body;
 
 //	mg_mgr_free(&mgr);
 //	delete hdata;
-	return ret;
+    return ret;
 }
 #endif // if 0
 
 bool ts_http_get(const ex_astr& url, ex_astr& body)
 {
-    struct mg_mgr _mgr;
-    mg_mgr_init(&_mgr, NULL);
+    struct mg_mgr _mgr{};
+    mg_mgr_init(&_mgr, nullptr);
 
-	mg_connection* nc = mg_connect_http(&_mgr, ev_handler, url.c_str(), NULL, NULL);
-	if (nc == nullptr) {
+    mg_connection* nc = mg_connect_http(&_mgr, ev_handler, url.c_str(), nullptr, nullptr);
+    if (nc == nullptr)
+    {
         mg_mgr_free(&_mgr);
         return false;
     }
 
-	HTTP_DATA hdata;
-	hdata.exit_flag = false;
-	hdata.have_error = false;
+    HTTP_DATA http_data;
+    http_data.exit_flag = false;
+    http_data.have_error = false;
 
-	nc->user_data = (void*)&hdata;
+    nc->user_data = (void*)&http_data;
 
-	while (!hdata.exit_flag)
-	{
-		mg_mgr_poll(&_mgr, 100);
-	}
+    while (!http_data.exit_flag)
+    {
+        mg_mgr_poll(&_mgr, 100);
+    }
 
-	bool ret = !hdata.have_error;
-	if (ret)
-		body = hdata.body;
+    bool ret = !http_data.have_error;
+    if (ret)
+        body = http_data.body;
 
     mg_mgr_free(&_mgr);
-	return ret;
+    return ret;
 }
diff --git a/server/tp_core/core/ts_http_client.h b/server/tp_core/core/ts_http_client.h
index 0afa701..fb17906 100644
--- a/server/tp_core/core/ts_http_client.h
+++ b/server/tp_core/core/ts_http_client.h
@@ -3,7 +3,8 @@
 
 #include <ex.h>
 
-void ts_url_encode(const char *src, ex_astr& out);
+void ts_url_encode(const char* src, ex_astr& out);
+
 bool ts_http_get(const ex_astr& url, ex_astr& body);
 
 #endif // __TS_HTTP_CLIENT_H__
diff --git a/server/tp_core/core/ts_http_rpc.cpp b/server/tp_core/core/ts_http_rpc.cpp
index cdfc157..8a89e58 100644
--- a/server/tp_core/core/ts_http_rpc.cpp
+++ b/server/tp_core/core/ts_http_rpc.cpp
@@ -9,53 +9,9 @@
 #include <teleport_const.h>
 #include <sstream>
 
-#if 0
-#define HEXTOI(x) (isdigit(x) ? (x) - '0' : (x) - 'W')
-
-int ts_url_decode(const char* src, int src_len, char* dst, int dst_len, int is_form_url_encoded)
+TsHttpRpc::TsHttpRpc() : ExThreadBase("http-rpc-thread")
 {
-    int i, j, a, b;
-
-    if(src_len == 0 || dst == nullptr || dst_len == 0)
-        return 0;
-
-    for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++)
-    {
-        if (src[i] == '%')
-        {
-            if (i < src_len - 2 && isxdigit(*(const unsigned char*)(src + i + 1)) &&
-                isxdigit(*(const unsigned char*)(src + i + 2)))
-            {
-                a = tolower(*(const unsigned char*)(src + i + 1));
-                b = tolower(*(const unsigned char*)(src + i + 2));
-                dst[j] = (char)((HEXTOI(a) << 4) | HEXTOI(b));
-                i += 2;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-        else if (is_form_url_encoded && src[i] == '+')
-        {
-            dst[j] = ' ';
-        }
-        else
-        {
-            dst[j] = src[i];
-        }
-    }
-
-    dst[j] = '\0'; /* Null-terminate the destination */
-
-    return i >= src_len ? j : -1;
-}
-#endif
-
-TsHttpRpc::TsHttpRpc() :
-        ExThreadBase("http-rpc-thread")
-{
-    mg_mgr_init(&m_mg_mgr, NULL);
+    mg_mgr_init(&m_mg_mgr, nullptr);
 }
 
 TsHttpRpc::~TsHttpRpc()
@@ -63,7 +19,7 @@ TsHttpRpc::~TsHttpRpc()
     mg_mgr_free(&m_mg_mgr);
 }
 
-void TsHttpRpc::_thread_loop(void)
+void TsHttpRpc::_thread_loop()
 {
     EXLOGI("[core] TeleportServer-RPC ready on %s:%d\n", m_host_ip.c_str(), m_host_port);
 
@@ -76,25 +32,19 @@ void TsHttpRpc::_thread_loop(void)
 }
 
 
-bool TsHttpRpc::init(void)
+bool TsHttpRpc::init()
 {
-    struct mg_connection* nc = NULL;
-
     m_host_ip = g_env.rpc_bind_ip;
     m_host_port = g_env.rpc_bind_port;
 
     char addr[128] = {0};
-    // 	if (0 == strcmp(m_host_ip.c_str(), "127.0.0.1") || 0 == strcmp(m_host_ip.c_str(), "localhost"))
-    // 		ex_strformat(addr, 128, ":%d", m_host_port);
-    // 	else
-    // 		ex_strformat(addr, 128, "%s:%d", m_host_ip.c_str(), m_host_port);
     if (0 == strcmp(m_host_ip.c_str(), "0.0.0.0"))
         ex_strformat(addr, 128, ":%d", m_host_port);
     else
         ex_strformat(addr, 128, "%s:%d", m_host_ip.c_str(), m_host_port);
 
-    nc = mg_bind(&m_mg_mgr, addr, _mg_event_handler);
-    if (NULL == nc)
+    auto* nc = mg_bind(&m_mg_mgr, addr, _mg_event_handler);
+    if (nc == nullptr)
     {
         EXLOGE("[core] rpc listener failed to bind at %s.\n", addr);
         return false;
@@ -115,10 +65,10 @@ bool TsHttpRpc::init(void)
 
 void TsHttpRpc::_mg_event_handler(struct mg_connection* nc, int ev, void* ev_data)
 {
-    struct http_message* hm = (struct http_message*)ev_data;
+    auto* hm = (struct http_message*)ev_data;
 
-    TsHttpRpc* _this = (TsHttpRpc*)nc->user_data;
-    if (NULL == _this)
+    auto* _this = (TsHttpRpc*)nc->user_data;
+    if (_this == nullptr)
     {
         EXLOGE("[core] rpc invalid http request.\n");
         return;
@@ -168,7 +118,7 @@ void TsHttpRpc::_mg_event_handler(struct mg_connection* nc, int ev, void* ev_dat
 
 ex_rv TsHttpRpc::_parse_request(struct http_message* req, ex_astr& func_cmd, Json::Value& json_param)
 {
-    if (NULL == req)
+    if (req == nullptr)
         return TPE_PARAM;
 
     bool is_get = true;
@@ -203,14 +153,14 @@ ex_rv TsHttpRpc::_parse_request(struct http_message* req, ex_astr& func_cmd, Jso
 
         ex_chars sztmp;
         sztmp.resize(len);
-        memset(&sztmp[0], 0, len);
-        if (-1 == ex_url_decode(json_str.c_str(), json_str.length(), &sztmp[0], len, 0))
+        memset(sztmp.data(), 0, len);
+        if (-1 == ex_url_decode(json_str.c_str(), json_str.length(), sztmp.data(), len, 0))
             return TPE_HTTP_URL_ENCODE;
 
-        json_str = &sztmp[0];
+        json_str = sztmp.data();
     }
 
-    if (0 == json_str.length())
+    if (json_str.empty())
         return TPE_PARAM;
 
     //Json::Reader jreader;
@@ -339,8 +289,7 @@ void TsHttpRpc::_rpc_func_get_config(const Json::Value& json_param, ex_astr& buf
 
     ExIniFile& ini = g_env.get_ini();
     ex_ini_sections& secs = ini.GetAllSections();
-    ex_ini_sections::iterator it = secs.begin();
-    for (; it != secs.end(); ++it)
+    for (auto it = secs.begin(); it != secs.end(); ++it)
     {
         if (it->first.length() > 9 && 0 == wcsncmp(it->first.c_str(), L"protocol-", 9))
         {
@@ -374,7 +323,6 @@ void TsHttpRpc::_rpc_func_request_session(const Json::Value& json_param, ex_astr
 {
     // https://github.com/tp4a/teleport/wiki/TELEPORT-CORE-JSON-RPC#request_session
 
-    int conn_id = 0;
     ex_rv rv = TPE_OK;
 
     if (json_param["conn_id"].isNull())
@@ -388,14 +336,14 @@ void TsHttpRpc::_rpc_func_request_session(const Json::Value& json_param, ex_astr
         return;
     }
 
-    conn_id = json_param["conn_id"].asInt();
+    int conn_id = json_param["conn_id"].asInt();
     if (0 == conn_id)
     {
         _create_json_ret(buf, TPE_PARAM);
         return;
     }
 
-    TS_CONNECT_INFO* info = new TS_CONNECT_INFO;
+    auto* info = new TS_CONNECT_INFO;
     if ((rv = ts_web_rpc_get_conn_info(conn_id, *info)) != TPE_OK)
     {
         _create_json_ret(buf, rv);
@@ -444,7 +392,7 @@ void TsHttpRpc::_rpc_func_kill_sessions(const Json::Value& json_param, ex_astr&
     }
 
     Json::Value s = json_param["sessions"];
-    int cnt = s.size();
+    int cnt = (int)s.size();
     for (int i = 0; i < cnt; ++i)
     {
         if (!s[i].isString())
@@ -452,7 +400,7 @@ void TsHttpRpc::_rpc_func_kill_sessions(const Json::Value& json_param, ex_astr&
             _create_json_ret(buf, TPE_PARAM);
             return;
         }
-    }
+    };
 
     EXLOGV("[core] try to kill %d sessions.\n", cnt);
     ex_astr sp = s.toStyledString();
@@ -542,7 +490,7 @@ void TsHttpRpc::_rpc_func_set_config(const Json::Value& json_param, ex_astr& buf
         return;
     }
 
-    int noop_timeout = json_param["noop_timeout"].asUInt();
+    int noop_timeout = json_param["noop_timeout"].asInt();
     EXLOGV("[core] set run-time config:\n");
     EXLOGV("[core]   noop_timeout = %dm\n", noop_timeout);
 
diff --git a/server/tp_core/core/ts_http_rpc.h b/server/tp_core/core/ts_http_rpc.h
index 76178b5..e71a71f 100644
--- a/server/tp_core/core/ts_http_rpc.h
+++ b/server/tp_core/core/ts_http_rpc.h
@@ -12,43 +12,51 @@
 class TsHttpRpc : public ExThreadBase
 {
 public:
-	TsHttpRpc();
-	~TsHttpRpc();
+    TsHttpRpc();
 
-	bool init(void);
+    ~TsHttpRpc();
+
+    bool init();
 
 protected:
-	void _thread_loop(void);
+    void _thread_loop();
 
 private:
-	ex_rv _parse_request(struct http_message* req, ex_astr& func_cmd, Json::Value& json_param);
-	void _process_request(const ex_astr& func_cmd, const Json::Value& json_param, ex_astr& buf);
+    ex_rv _parse_request(struct http_message* req, ex_astr& func_cmd, Json::Value& json_param);
 
-	//void _create_json_ret(ex_astr& buf, Json::Value& jr_root);
-	void _create_json_ret(ex_astr& buf, int errcode, const Json::Value& jr_data);
-	void _create_json_ret(ex_astr& buf, int errcode);
-	void _create_json_ret(ex_astr& buf, int errcode, const char* message);
+    void _process_request(const ex_astr& func_cmd, const Json::Value& json_param, ex_astr& buf);
 
-	// ��ȡcore�����������Ϣ����Ҫ��֧�ֵĸ���Э���Ƿ����ã��Լ���˿ںŵȣ�
-	void _rpc_func_get_config(const Json::Value& json_param, ex_astr& buf);
-	// set run-time configuration, like no-op-timeout.
-	void _rpc_func_set_config(const Json::Value& json_param, ex_astr& buf);
-	// ����һ���ỰID
-	void _rpc_func_request_session(const Json::Value& json_param, ex_astr& buf);
-	// ǿ����ֹ�Ự
-	void _rpc_func_kill_sessions(const Json::Value& json_param, ex_astr& buf);
-	// ����һ���ַ��������ص������ĵ�BASE64���룩
-	void _rpc_func_enc(const Json::Value& json_param, ex_astr& buf);
-	// Ҫ���������ķ����˳�
-	void _rpc_func_exit(const Json::Value& json_param, ex_astr& buf);
+    void _create_json_ret(ex_astr& buf, int errcode, const Json::Value& jr_data);
 
-	static void _mg_event_handler(struct mg_connection *nc, int ev, void *ev_data);
+    static void _create_json_ret(ex_astr& buf, int errcode);
+
+    void _create_json_ret(ex_astr& buf, int errcode, const char* message);
+
+    // ��ȡcore�����������Ϣ����Ҫ��֧�ֵĸ���Э���Ƿ����ã��Լ���˿ںŵȣ�
+    void _rpc_func_get_config(const Json::Value& json_param, ex_astr& buf);
+
+    // set run-time configuration, like no-op-timeout.
+    void _rpc_func_set_config(const Json::Value& json_param, ex_astr& buf);
+
+    // ����һ���ỰID
+    void _rpc_func_request_session(const Json::Value& json_param, ex_astr& buf);
+
+    // ǿ����ֹ�Ự
+    void _rpc_func_kill_sessions(const Json::Value& json_param, ex_astr& buf);
+
+    // ����һ���ַ��������ص������ĵ�BASE64���룩
+    void _rpc_func_enc(const Json::Value& json_param, ex_astr& buf);
+
+    // Ҫ���������ķ����˳�
+    void _rpc_func_exit(const Json::Value& json_param, ex_astr& buf);
+
+    static void _mg_event_handler(struct mg_connection* nc, int ev, void* ev_data);
 
 private:
-	ex_astr m_host_ip;
-	int m_host_port;
+    ex_astr m_host_ip;
+    int m_host_port;
 
-	struct mg_mgr m_mg_mgr;
+    struct mg_mgr m_mg_mgr;
 };
 
 #endif // __TS_HTTP_RPC_H__
diff --git a/server/tp_core/core/ts_main.cpp b/server/tp_core/core/ts_main.cpp
index 3b71f97..8a7b9b2 100644
--- a/server/tp_core/core/ts_main.cpp
+++ b/server/tp_core/core/ts_main.cpp
@@ -3,6 +3,7 @@
 #include "ts_http_rpc.h"
 #include "ts_web_rpc.h"
 #include "ts_env.h"
+#include "ts_ver.h"
 #include "tp_tpp_mgr.h"
 
 #include <mbedtls/platform.h>
@@ -103,10 +104,10 @@ bool tpp_session_end(const char* sid, int db_id, int ret) {
 int ts_main() {
     ExIniFile& ini = g_env.get_ini();
 
-    EXLOGI("\n");
-    EXLOGI("###############################################################\n");
-    EXLOGI(L"Load config file: %ls.\n", ini.get_filename().c_str());
-    EXLOGI("Teleport Core Server starting ...\n");
+    EXLOGW("\n");
+    EXLOGW("###############################################################\n");
+    EXLOGW(L"Teleport Core Server v%ls starting ...\n", TP_SERVER_VER);
+    EXLOGW(L"Load config file: %ls.\n", ini.get_filename().c_str());
 
     ex_ini_sections& secs = ini.GetAllSections();
     TsHttpRpc rpc;
diff --git a/server/tp_core/core/ts_session.cpp b/server/tp_core/core/ts_session.cpp
index ccc125d..f23d1df 100644
--- a/server/tp_core/core/ts_session.cpp
+++ b/server/tp_core/core/ts_session.cpp
@@ -7,20 +7,25 @@
 TsSessionManager g_session_mgr;
 
 TsSessionManager::TsSessionManager() :
-        ExThreadBase("sid-mgr-thread") {
+        ExThreadBase("sid-mgr-thread")
+{
 }
 
-TsSessionManager::~TsSessionManager() {
+TsSessionManager::~TsSessionManager()
+{
     auto it_conn = m_connections.begin();
-    for (; it_conn != m_connections.end(); ++it_conn) {
+    for (; it_conn != m_connections.end(); ++it_conn)
+    {
         EXLOGD("[core] m_connections not clean: %s, %s\n", it_conn->first.c_str(), it_conn->second->acc_username.c_str());
         delete it_conn->second;
     }
     m_connections.clear();
 }
 
-void TsSessionManager::_thread_loop() {
-    for (;;) {
+void TsSessionManager::_thread_loop()
+{
+    for (;;)
+    {
         ex_sleep_ms(1000);
         if (m_need_stop)
             return;
@@ -28,28 +33,33 @@ void TsSessionManager::_thread_loop() {
     }
 }
 
-void TsSessionManager::_remove_expired_connect_info() {
+void TsSessionManager::_remove_expired_connect_info()
+{
     // 超过15秒未进行连接的connect-info会被移除
 
     ExThreadSmartLock locker(m_lock);
 
     ex_u64 _now = ex_get_tick_count();
     auto it = m_connections.begin();
-    for (; it != m_connections.end();) {
+    for (; it != m_connections.end();)
+    {
         //EXLOGD("[core] check expired connect info: [%s] %d, %d %d %d\n", it->first.c_str(), it->second->ref_count, int(_now), int(it->second->ticket_start), int(_now - it->second->ticket_start));
-        if (it->second->ref_count == 0 && _now - 15000 > it->second->ticket_start) {
+        if (it->second->ref_count == 0 && _now - 15000 > it->second->ticket_start)
+        {
             EXLOGD("[core] remove connection info, because timeout: %s\n", it->first.c_str());
             delete it->second;
             m_connections.erase(it++);
             EXLOGD("[core] there are %d connection info exists.\n", m_connections.size());
         }
-        else {
+        else
+        {
             ++it;
         }
     }
 }
 
-bool TsSessionManager::get_connect_info(const ex_astr& sid, TS_CONNECT_INFO& info) {
+bool TsSessionManager::get_connect_info(const ex_astr& sid, TS_CONNECT_INFO& info)
+{
     ExThreadSmartLock locker(m_lock);
 
     auto it = m_connections.find(sid);
@@ -80,7 +90,8 @@ bool TsSessionManager::get_connect_info(const ex_astr& sid, TS_CONNECT_INFO& inf
     return true;
 }
 
-bool TsSessionManager::free_connect_info(const ex_astr& sid) {
+bool TsSessionManager::free_connect_info(const ex_astr& sid)
+{
     ExThreadSmartLock locker(m_lock);
 
     auto it = m_connections.find(sid);
@@ -91,15 +102,18 @@ bool TsSessionManager::free_connect_info(const ex_astr& sid) {
 
     // 对于RDP来说，此时不要移除连接信息，系统自带RDP客户端在第一次连接时进行协议协商，然后马上会断开，之后立即重新连接一次（第二次连接之前可能会提示证书信息，如果用户长时间不操作，可能会导致超时）。
     // 因此，我们将其引用计数减低，并更新一下最后访问时间，让定时器来移除它。
-    if (it->second->protocol_type != TP_PROTOCOL_TYPE_RDP) {
-        if (it->second->ref_count <= 0) {
+    if (it->second->protocol_type != TP_PROTOCOL_TYPE_RDP)
+    {
+        if (it->second->ref_count <= 0)
+        {
             EXLOGD("[core] remove connection info, because all connections closed: %s\n", it->first.c_str());
             delete it->second;
             m_connections.erase(it);
             EXLOGD("[core] there are %d connection info exists.\n", m_connections.size());
         }
     }
-    else {
+    else
+    {
         if (it->second->ref_count == 1)
             it->second->ref_count = 0;
         it->second->ticket_start = ex_get_tick_count() + 45000; // 我们将时间向后移动45秒，这样如果没有发生RDP的第二次连接，这个连接信息就会在一分钟后被清除。
@@ -109,7 +123,8 @@ bool TsSessionManager::free_connect_info(const ex_astr& sid) {
     return true;
 }
 
-bool TsSessionManager::request_session(ex_astr& sid, TS_CONNECT_INFO* info) {
+bool TsSessionManager::request_session(ex_astr& sid, TS_CONNECT_INFO* info)
+{
     ExThreadSmartLock locker(m_lock);
 
     EXLOGD(
@@ -121,7 +136,8 @@ bool TsSessionManager::request_session(ex_astr& sid, TS_CONNECT_INFO* info) {
     ex_astr _sid;
     int retried = 0;
     ts_connections::iterator it;
-    for (;;) {
+    for (;;)
+    {
         _gen_session_id(_sid, info, 6);
         it = m_connections.find(_sid);
         if (it == m_connections.end())
@@ -138,17 +154,19 @@ bool TsSessionManager::request_session(ex_astr& sid, TS_CONNECT_INFO* info) {
     m_connections.insert(std::make_pair(_sid, info));
 
     sid = _sid;
-    if (info->protocol_type == TP_PROTOCOL_TYPE_RDP) {
+    if (info->protocol_type == TP_PROTOCOL_TYPE_RDP)
+    {
         info->ref_count = 1; // 因为RDP连接之前可能会有很长时间用于确认是否连接、是否信任证书，所以很容易超时，我们认为将引用计数+1，防止因超时被清除。
         char szTmp[8] = {0};
-        snprintf(szTmp, 8, "%02X", (unsigned char) (info->acc_username.length() + info->acc_secret.length()));
+        snprintf(szTmp, 8, "%02X", (unsigned char)(info->acc_username.length() + info->acc_secret.length()));
         sid += szTmp;
     }
 
     return true;
 }
 
-void TsSessionManager::_gen_session_id(ex_astr& sid, const TS_CONNECT_INFO* info, int len) {
+void TsSessionManager::_gen_session_id(ex_astr& sid, const TS_CONNECT_INFO* info, int len)
+{
     mbedtls_sha1_context sha;
     ex_u8 sha_digist[20] = {0};
 
@@ -157,11 +175,11 @@ void TsSessionManager::_gen_session_id(ex_astr& sid, const TS_CONNECT_INFO* info
 
     mbedtls_sha1_init(&sha);
     mbedtls_sha1_starts(&sha);
-    mbedtls_sha1_update(&sha, (const unsigned char*) &_tick, sizeof(ex_u64));
-    mbedtls_sha1_update(&sha, (const unsigned char*) &_tid, sizeof(ex_u64));
-    mbedtls_sha1_update(&sha, (const unsigned char*) info->conn_ip.c_str(), info->conn_ip.length());
-    mbedtls_sha1_update(&sha, (const unsigned char*) info->client_ip.c_str(), info->client_ip.length());
-    mbedtls_sha1_update(&sha, (const unsigned char*) info->acc_username.c_str(), info->acc_username.length());
+    mbedtls_sha1_update(&sha, (const unsigned char*)&_tick, sizeof(ex_u64));
+    mbedtls_sha1_update(&sha, (const unsigned char*)&_tid, sizeof(ex_u64));
+    mbedtls_sha1_update(&sha, (const unsigned char*)info->conn_ip.c_str(), info->conn_ip.length());
+    mbedtls_sha1_update(&sha, (const unsigned char*)info->client_ip.c_str(), info->client_ip.length());
+    mbedtls_sha1_update(&sha, (const unsigned char*)info->acc_username.c_str(), info->acc_username.length());
     mbedtls_sha1_finish(&sha, sha_digist);
     mbedtls_sha1_free(&sha);
 
@@ -169,7 +187,8 @@ void TsSessionManager::_gen_session_id(ex_astr& sid, const TS_CONNECT_INFO* info
     int _len = len / 2 + 1;
     int i = 0;
     int offset = 0;
-    for (i = 0; i < _len; ++i) {
+    for (i = 0; i < _len; ++i)
+    {
         snprintf(szTmp + offset, 64 - offset, "%02X", sha_digist[i]);
         offset += 2;
     }
diff --git a/server/tp_core/core/ts_web_rpc.cpp b/server/tp_core/core/ts_web_rpc.cpp
index ce330cd..8785290 100644
--- a/server/tp_core/core/ts_web_rpc.cpp
+++ b/server/tp_core/core/ts_web_rpc.cpp
@@ -3,8 +3,6 @@
 #include "ts_crypto.h"
 #include "ts_http_client.h"
 
-#include "../common/ts_const.h"
-
 #include <ex/ex_str.h>
 #include <teleport_const.h>
 
diff --git a/server/tp_core/protocol/ssh/ssh_proxy.cpp b/server/tp_core/protocol/ssh/ssh_proxy.cpp
index 91d3f50..925370a 100644
--- a/server/tp_core/protocol/ssh/ssh_proxy.cpp
+++ b/server/tp_core/protocol/ssh/ssh_proxy.cpp
@@ -162,7 +162,7 @@ void SshProxy::_thread_loop() {
 
         uint32_t dbg_id = m_dbg_id++;
         auto session = new SshSession(this, rs_tp2cli, dbg_id, ip, addr->sin_port);
-        EXLOGW("[ssh] ------ NEW SSH SESSION [%s from %s:%d] ------\n", session->dbg_name().c_str(), ip, addr->sin_port);
+        EXLOGW("[ssh] ------ NEW SSH SESSION [%s from %s] ------\n", session->dbg_name().c_str(), session->dbg_client().c_str());
 
         {
             ExThreadSmartLock locker(m_lock);
diff --git a/server/tp_core/protocol/ssh/ssh_session.cpp b/server/tp_core/protocol/ssh/ssh_session.cpp
index 9235c5a..73d5bc2 100644
--- a/server/tp_core/protocol/ssh/ssh_session.cpp
+++ b/server/tp_core/protocol/ssh/ssh_session.cpp
@@ -604,6 +604,13 @@ int SshSession::_do_auth(const char* user, const char* secret)
     }
     else
     {
+        // 如果第一次认证时没有确定目标远程主机IP和端口（例如session-id无效），则不再继续后面的操作
+        if(m_conn_ip.empty() || m_conn_port == 0)
+        {
+            EXLOGE("[%s] second auth, user: %s, no remote host info, can not connect.\n", m_dbg_name.c_str(), user);
+            return SSH_AUTH_DENIED;
+        }
+
         // 允许用户自行输入密码的情况下，第二次认证，参数secret就是用户自己输入的密码了。
         m_acc_secret = secret;
     }