From ef90de7ebeeb836d240f2d8592e56999b6e7e289 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Sun, 25 Nov 2018 02:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=88=B0v3.2.0-beta.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/.idea/build.iml                      |  20 ++++++++++----------
 build/builder/build-version.py             |   2 +-
 build/builder/core/ver.py                  |   4 ++--
 client/tp_assist_win/tp_assist.rc          | Bin 8822 -> 8822 bytes
 client/tp_assist_win/ts_ver.h              |   2 +-
 dist/client/windows/assist/installer.nsi   | Bin 2828 -> 2828 bytes
 server/tp_core/core/tp_core.rc             | Bin 5176 -> 5176 bytes
 server/tp_core/core/ts_ver.h               |   2 +-
 server/www/teleport/webroot/app/app_ver.py |   2 +-
 version.in                                 |   6 +++---
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/build/.idea/build.iml b/build/.idea/build.iml
index 02c8122..6711606 100644
--- a/build/.idea/build.iml
+++ b/build/.idea/build.iml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/builder" />
-    <orderEntry type="jdk" jdkName="py37" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/build/builder/build-version.py b/build/builder/build-version.py
index fbcb419..c0de736 100644
--- a/build/builder/build-version.py
+++ b/build/builder/build-version.py
@@ -141,7 +141,7 @@ class Builder:
         self._update_ver_nsi(nsi_file, self.VER_TP_ASSIST)
 
     def make_assist_macos_ver(self):
-        plist_file = os.path.join(env.root_path, 'client', 'tp_assist_macos', 'src', 'tp_assist-Info.plist')
+        plist_file = os.path.join(env.root_path, 'client', 'tp_assist_macos', 'src', 'TP-Assist-Info.plist')
         self._update_ver_plist(plist_file, self.VER_TP_ASSIST)
 
         ver_file = os.path.join(env.root_path, 'client', 'tp_assist_macos', 'src', 'csrc', 'ts_ver.h')
diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py
index 5b022cc..4bc5945 100644
--- a/build/builder/core/ver.py
+++ b/build/builder/core/ver.py
@@ -1,3 +1,3 @@
 # -*- coding: utf8 -*-
-VER_TP_SERVER = "3.1.0"
-VER_TP_ASSIST = "3.1.0"
+VER_TP_SERVER = "3.2.0"
+VER_TP_ASSIST = "3.2.0"
diff --git a/client/tp_assist_win/tp_assist.rc b/client/tp_assist_win/tp_assist.rc
index 05aae117fc1703bb24938ca47d9e85549209baf3..fabec216f659dcaed88f371eec6afe2acf5d8ce9 100644
GIT binary patch
delta 38
rcmez7^37!fmn5UnWNt})Mx)Kvl2@64l%R|*keVzgqqsRiPK*Tr<Z}uW

delta 38
rcmez7^37!fmn5U%WNt})M#Ih4l2@64l%R|*keVzgqqsRiPK*Tr<RS_W

diff --git a/client/tp_assist_win/ts_ver.h b/client/tp_assist_win/ts_ver.h
index b2b4e76..a296cc3 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.1.0"
+#define TP_ASSIST_VER	L"3.2.0"
 
 #endif // __TS_ASSIST_VER_H__
diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi
index a4cb5cf706c4cf608c2538b5626613b4d88bd586..c12f4beb7b31c4ccb6b480f05070f649d8e89281 100644
GIT binary patch
delta 24
fcmeAX>k-?K#mZ<jS&&(Das#UjqtWKMtof_}RaFLq

delta 24
fcmeAX>k-?K#mZ<nS&&(Das#Ujqv7Vctof_}RX+xS

diff --git a/server/tp_core/core/tp_core.rc b/server/tp_core/core/tp_core.rc
index 3c6f666e1644c6b466b1ba8c1162f4f2f1d2b952..3503ea993b2b60ff0ddaa56b986bdfb4e9d79367 100644
GIT binary patch
delta 42
wcmdm?u|s3S91cdK$#XgM8I3ld<+#rTq}Fn40;$PsxfLgK@d<6_;?rXT05Pr%ZvX%Q

delta 42
wcmdm?u|s3S91cdq$#XgM84Wj|<+#rTq}Fn40;$PsxfLgK@d<6_;?rXT05MGrYXATM

diff --git a/server/tp_core/core/ts_ver.h b/server/tp_core/core/ts_ver.h
index 20daa59..aca4ca9 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.1.0"
+#define TP_SERVER_VER	L"3.2.0"
 
 #endif // __TS_SERVER_VER_H__
diff --git a/server/www/teleport/webroot/app/app_ver.py b/server/www/teleport/webroot/app/app_ver.py
index 2a85131..c8cc557 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.1.0"
+TP_SERVER_VER = "3.2.0"
diff --git a/version.in b/version.in
index 070de37..8ad7beb 100644
--- a/version.in
+++ b/version.in
@@ -10,8 +10,8 @@ Minor: 次版本号。如果两个程序集的名称和主版本号相同，而
 Revision: 修订号。主版本号和次版本号都相同但修订号不同的程序集应是完全可互换的。
           这适用于修复以前发布的程序集中的错误或安全漏洞。
 
-TP_SERVER 3.1.0           # 整个服务端打包的版本
-TP_TPCORE 3.1.0           # 核心服务 tp_core 的版本
+TP_SERVER 3.2.0           # 整个服务端打包的版本
+TP_TPCORE 3.2.0           # 核心服务 tp_core 的版本
 TP_TPWEB 3.1.0            # web服务 tp_web 的版本（一般除非升级Python，否则不会变化）
-TP_ASSIST 3.1.0           # 助手版本
+TP_ASSIST 3.2.0           # 助手版本