diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py
index 977aefd..cff6913 100644
--- a/build/builder/core/ver.py
+++ b/build/builder/core/ver.py
@@ -1,3 +1,3 @@
# -*- coding: utf8 -*-
-VER_TP_SERVER = "3.0.0.4"
-VER_TP_ASSIST = "3.0.0.4"
+VER_TP_SERVER = "3.0.0.5"
+VER_TP_ASSIST = "3.0.0.5"
diff --git a/client/tp_assist_macos/src/csrc/ts_ver.h b/client/tp_assist_macos/src/csrc/ts_ver.h
index b744658..f89ff5d 100644
--- a/client/tp_assist_macos/src/csrc/ts_ver.h
+++ b/client/tp_assist_macos/src/csrc/ts_ver.h
@@ -1,6 +1,6 @@
#ifndef __TS_ASSIST_VER_H__
#define __TS_ASSIST_VER_H__
-#define TP_ASSIST_VER L"3.0.0.4"
+#define TP_ASSIST_VER L"3.0.0.5"
#endif // __TS_ASSIST_VER_H__
diff --git a/client/tp_assist_macos/src/tp_assist-Info.plist b/client/tp_assist_macos/src/tp_assist-Info.plist
index a26e510..2ae39e5 100644
--- a/client/tp_assist_macos/src/tp_assist-Info.plist
+++ b/client/tp_assist_macos/src/tp_assist-Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 3.0.0.4
+ 3.0.0.5
CFBundleSignature
????
CFBundleVersion
- 3.0.0.4
+ 3.0.0.5
LSApplicationCategoryType
public.app-category.productivity
LSMinimumSystemVersion
diff --git a/client/tp_assist_win/tp_assist.rc b/client/tp_assist_win/tp_assist.rc
index 6508547..470c996 100644
Binary files a/client/tp_assist_win/tp_assist.rc and b/client/tp_assist_win/tp_assist.rc differ
diff --git a/client/tp_assist_win/ts_ver.h b/client/tp_assist_win/ts_ver.h
index b744658..f89ff5d 100644
--- a/client/tp_assist_win/ts_ver.h
+++ b/client/tp_assist_win/ts_ver.h
@@ -1,6 +1,6 @@
#ifndef __TS_ASSIST_VER_H__
#define __TS_ASSIST_VER_H__
-#define TP_ASSIST_VER L"3.0.0.4"
+#define TP_ASSIST_VER L"3.0.0.5"
#endif // __TS_ASSIST_VER_H__
diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi
index 37bbef2..6b398e4 100644
Binary files a/dist/client/windows/assist/installer.nsi and b/dist/client/windows/assist/installer.nsi differ
diff --git a/server/.idea/codeStyles/Project.xml b/server/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/server/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/.idea/encodings.xml b/server/.idea/encodings.xml
index 6c3eb7c..585231a 100644
--- a/server/.idea/encodings.xml
+++ b/server/.idea/encodings.xml
@@ -38,6 +38,7 @@
+
diff --git a/server/tp_core/core/tp_core.rc b/server/tp_core/core/tp_core.rc
index e387997..6171694 100644
Binary files a/server/tp_core/core/tp_core.rc and b/server/tp_core/core/tp_core.rc differ
diff --git a/server/tp_core/core/ts_ver.h b/server/tp_core/core/ts_ver.h
index af2050c..537f8e5 100644
--- a/server/tp_core/core/ts_ver.h
+++ b/server/tp_core/core/ts_ver.h
@@ -1,6 +1,6 @@
#ifndef __TS_SERVER_VER_H__
#define __TS_SERVER_VER_H__
-#define TP_SERVER_VER L"3.0.0.4"
+#define TP_SERVER_VER L"3.0.0.5"
#endif // __TS_SERVER_VER_H__
diff --git a/server/tp_core/protocol/telnet/telnet_conn.cpp b/server/tp_core/protocol/telnet/telnet_conn.cpp
index 73cea71..0d08d78 100644
--- a/server/tp_core/protocol/telnet/telnet_conn.cpp
+++ b/server/tp_core/protocol/telnet/telnet_conn.cpp
@@ -10,7 +10,7 @@ ex_astr _uv_str_error(int retcode)
err = uv_err_name(retcode);
err += ":";
err += uv_strerror(retcode);
- return std::move(err);
+ return err;
}
TelnetConn::TelnetConn(TelnetSession *sess, bool is_server_side) : m_session(sess), m_is_server(is_server_side) {
diff --git a/server/www/teleport/webroot/app/app_ver.py b/server/www/teleport/webroot/app/app_ver.py
index 97b38e6..6743e18 100644
--- a/server/www/teleport/webroot/app/app_ver.py
+++ b/server/www/teleport/webroot/app/app_ver.py
@@ -1,2 +1,2 @@
# -*- coding: utf8 -*-
-TP_SERVER_VER = "3.0.0.4"
+TP_SERVER_VER = "3.0.0.5"
diff --git a/version.in b/version.in
index 9a7fe5f..176f5af 100644
--- a/version.in
+++ b/version.in
@@ -13,7 +13,7 @@ Revision ： 修订号。主版本号和次版本号都相同但修订号不同
Build ： 构建号。构建号用于表明此版本发布之前进行了多少次构建及测试。某些情况下此版本号可以省略。
-TP_SERVER 3.0.0.4 # 整个服务端打包的版本
-TP_TPCORE 3.0.0.4 # 核心服务 tp_core 的版本
+TP_SERVER 3.0.0.5 # 整个服务端打包的版本
+TP_TPCORE 3.0.0.5 # 核心服务 tp_core 的版本
TP_TPWEB 3.0.0.1 # web服务 tp_web 的版本（一般除非升级Python，否则不会变化）
-TP_ASSIST 3.0.0.4 # 助手版本
+TP_ASSIST 3.0.0.5 # 助手版本