From f80e12c2441a6962125cd65327b15d69d9300655 Mon Sep 17 00:00:00 2001 From: apexliu Date: Thu, 30 Mar 2017 04:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=8F=91=E5=B8=83=E7=89=88?= =?UTF-8?q?=E6=9C=ACv2.1.2.1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/builder/core/ver.py | 4 +- client/tp_assist/tp_assist.rc | Bin 9052 -> 9052 bytes client/tp_assist/ts_ver.h | 2 +- dist/client/windows/assist/installer.nsi | Bin 2840 -> 2840 bytes server/tp_core/core/tp_core.rc | Bin 5166 -> 5166 bytes server/tp_core/core/ts_http_rpc.cpp | 6 - server/tp_core/core/ts_ver.h | 2 +- server/tp_web/src/tp_web.rc | Bin 5168 -> 5168 bytes server/tp_web/src/ts_ver.h | 2 +- .../teleport/app/eom_app/controller/auth.py | 6 +- server/www/teleport/app/eom_ver.py | 4 +- .../www/teleport/static/js/ui/admin_host.js | 6 +- .../www/teleport/static/js/ui/auth/login.js | 75 +-- .../www/teleport/static/js/ui/common_host.js | 6 +- server/www/teleport/static/js/ui/teleport.js | 15 +- server/www/teleport/view/auth/login.mako | 2 +- server/www/teleport/view/auth/register.mako | 513 ------------------ server/www/teleport/view/auth/sucessful.mako | 77 --- .../view/common/_sidebar_nav_menu.mako | 5 +- version.in | 4 +- 20 files changed, 54 insertions(+), 675 deletions(-) delete mode 100644 server/www/teleport/view/auth/register.mako delete mode 100644 server/www/teleport/view/auth/sucessful.mako diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py index 257cc5a..3f9aceb 100644 --- a/build/builder/core/ver.py +++ b/build/builder/core/ver.py @@ -1,3 +1,3 @@ # -*- coding: utf8 -*- -VER_TELEPORT_SERVER = "2.1.0.1" -VER_TELEPORT_ASSIST = "2.1.0.1" +VER_TELEPORT_SERVER = "2.1.2.1" +VER_TELEPORT_ASSIST = "2.1.2.1" diff --git a/client/tp_assist/tp_assist.rc b/client/tp_assist/tp_assist.rc index 671c08a714e918dfab891991f6b8205b1055059f..015023aa6a8d667070a266f3cd3807f6db5fe39d 100644 GIT binary patch delta 42 wcmccPcE@eQKS@TT$^Rww8I3mUOI>9Gax~>-Co9N_ZMKm8zz7u8ls9Gp08}9jj{pDw delta 42 wcmccPcE@eQKS@S|$^Rww84Wh;OI>9Gax~>-Co9N_ZMKm8zz7u8ls9Gp08?)bhX4Qo diff --git a/client/tp_assist/ts_ver.h b/client/tp_assist/ts_ver.h index 4cfbea7..42fc7d4 100644 --- a/client/tp_assist/ts_ver.h +++ b/client/tp_assist/ts_ver.h @@ -1,6 +1,6 @@ #ifndef __TS_ASSIST_VER_H__ #define __TS_ASSIST_VER_H__ -#define TP_ASSIST_VER L"2.1.0.1" +#define TP_ASSIST_VER L"2.1.2.1" #endif // __TS_ASSIST_VER_H__ diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi index 23460883607457200ffb48335540fa6906fd2aa1..f6372e345eda86f1935b4da5d2d0de5f2df2f06e 100644 GIT binary patch delta 14 VcmbOsHbZPf7AvFC=4{rrtNuri.len + 1); -// memset(&_uri[0], 0, hm->uri.len + 1); -// memcpy(&_uri[0], hm->uri.p, hm->uri.len); -// ex_astr uri = &_uri[0]; ex_astr uri; uri.assign(hm->uri.p, hm->uri.len); diff --git a/server/tp_core/core/ts_ver.h b/server/tp_core/core/ts_ver.h index 3e91d8a..834c7c4 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"2.1.0.1" +#define TP_SERVER_VER L"2.1.2.1" #endif // __TS_SERVER_VER_H__ diff --git a/server/tp_web/src/tp_web.rc b/server/tp_web/src/tp_web.rc index 0b377360354de3c389a5741d4648719046503d0f..f11ae9dbcfef91fee1aae16578a6f4cd20354a5b 100644 GIT binary patch delta 42 wcmdm>u|Z?Q0uDx_$qPC38I3kyu|Z?Q0uDxl$qPC384WgH下载最新版本!'); + $('#tp-assist-current-version').html('当前助手版本太低（v' + ret.version + '），请下载最新版本!'); } else { $("#tp-assist-current-version").text('检测TP助手版本时发生错误！'); ywl.notify_error(error); diff --git a/server/www/teleport/static/js/ui/auth/login.js b/server/www/teleport/static/js/ui/auth/login.js index e720f81..09ea6c9 100644 --- a/server/www/teleport/static/js/ui/auth/login.js +++ b/server/www/teleport/static/js/ui/auth/login.js @@ -53,30 +53,34 @@ ywl.create_app = function () { var str_username = ''; var str_password = ''; var str_captcha = ''; + var is_remember = false; var dom_username = $('#username_account'); var dom_password = $('#password_account'); var dom_captcha = $('#captcha'); + var dom_remember = $('#remember-me'); str_username = dom_username.val(); str_password = dom_password.val(); str_captcha = dom_captcha.val(); + is_remember = dom_remember.is(':checked'); + console.log('xxxx', is_remember); - if (str_username.length == 0) { + if (str_username.length === 0) { show_op_box('error', '缺少账号！'); dom_username.attr('data-content', "请填写您的账号！").popover('show'); dom_username.focus(); return; } - if (str_password.length == 0) { + if (str_password.length === 0) { show_op_box('error', '缺少密码！'); dom_password.attr('data-content', "请填写密码！").popover('show'); dom_password.focus(); return; } - if (str_captcha.length != 4) { + if (str_captcha.length !== 4) { show_op_box('error', '验证码错误！'); dom_captcha.attr('data-content', "验证码为4位数字和字母的组合，请重新填写！").popover('show').focus(); return; @@ -86,13 +90,13 @@ ywl.create_app = function () { show_op_box('wait', ' 正在进行身份认证，请稍候...'); // 先判断一下captcha是否正确，如果不正确，拒绝登录 - ywl.ajax_post_json('/auth/verify-captcha', {captcha: str_captcha}, - function (ret) { - if (ret.code == 0) { + ywl.ajax_post_json('/auth/verify-captcha', {captcha: str_captcha}, + function (ret) { + if (ret.code === 0) { // 验证成功 hide_op_box(); show_op_box('wait', ' 正在登录TELEPORT，请稍候...'); - _app.do_account_login(str_username, str_password, str_captcha); + _app.do_account_login(str_username, str_password, str_captcha, is_remember); } else { hide_op_box(); @@ -102,68 +106,37 @@ ywl.create_app = function () { } $('#btn_login').removeAttr('disabled'); - }, - function () { + }, + function () { hide_op_box(); show_op_box('error', '很抱歉，无法连接服务器！请稍后再试一次！'); $('#btn_login').removeAttr('disabled'); - } - ); - -// $.ajax({ -// type: 'GET', -// url: '/auth/verify-captcha', -// jsonp: "callback", -// //jsonpCallback:"login_ret", -// data: {captcha: str_captcha}, -// dataType: 'jsonp', -// success: function (data) { -// if (data.code == 0) { -// // 验证成功 -// hide_op_box(); -// show_op_box('wait', ' 正在登录TELEPORT，请稍候...'); -// _app.do_account_login(str_username, str_password, str_captcha); -// } -// else { -// hide_op_box(); -// show_op_box('error', '验证码错误！'); -// // renew the captcha. -// //change_captcha(); -// $('#captcha_image').attr('src', '/auth/get-captcha?' + Math.random()); -// $('#captcha').focus().val(''); -// } -// -// $('#btn_login').removeAttr('disabled'); -// }, -// error: function () { -// hide_op_box(); -// show_op_box('error', '很抱歉，无法连接服务器！请稍后再试一次！'); -// $('#btn_login').removeAttr('disabled'); -// } -// }); + } + ); }; - _app.do_account_login = function (username, userpwd, captcha) { - ywl.ajax_post_json('/auth/verify-user', {username: username, userpwd: userpwd, captcha: captcha}, - function (ret) { + _app.do_account_login = function (username, userpwd, captcha, is_remember) { + console.log('remember', is_remember); + ywl.ajax_post_json('/auth/verify-user', {username: username, userpwd: userpwd, captcha: captcha, remember: is_remember}, + function (ret) { if (ret.code == 0) { // 验证成功 window.location.href = ywl.page_options.ref; } else { hide_op_box(); - show_op_box('error', '无法登录TELEPORT：'+ret.message); + show_op_box('error', '无法登录TELEPORT：' + ret.message); console.log(ret); } $('#btn_login').removeAttr('disabled'); - }, - function () { + }, + function () { hide_op_box(); show_op_box('error', '很抱歉，无法连接服务器！请稍后再试一次！'); $('#btn_login').removeAttr('disabled'); - } - ); + } + ); // $.ajax({ // type: 'GET', diff --git a/server/www/teleport/static/js/ui/common_host.js b/server/www/teleport/static/js/ui/common_host.js index 00480a0..ae52447 100644 --- a/server/www/teleport/static/js/ui/common_host.js +++ b/server/www/teleport/static/js/ui/common_host.js @@ -16,9 +16,9 @@ ywl.on_init = function (cb_stack, cb_args) { g_assist = ywl.create_assist(); var last_version = $("#tp-assist-version").text(); - var low_version = $("#tp-assist-version").attr("low-version"); + var req_version = $("#tp-assist-version").attr("req-version"); - teleport_init(last_version, low_version, + teleport_init(last_version, req_version, function (ret) { $("#tp-assist-current-version").text("当前助手版本：" + ret.version); }, @@ -29,7 +29,7 @@ ywl.on_init = function (cb_stack, cb_args) { } else if (code == TPE_OLD_ASSIST) { ywl.notify_error(error); - $('#tp-assist-current-version').html('当前助手版本太低（v' + ret.version + '），请下载最新版本!'); + $('#tp-assist-current-version').html('当前助手版本太低（v' + ret.version + '），请下载最新版本!'); } else { $("#tp-assist-current-version").text(error); diff --git a/server/www/teleport/static/js/ui/teleport.js b/server/www/teleport/static/js/ui/teleport.js index cd05681..6be3e51 100644 --- a/server/www/teleport/static/js/ui/teleport.js +++ b/server/www/teleport/static/js/ui/teleport.js @@ -1,6 +1,6 @@ "use strict"; -var g_low_version = ""; +var g_req_version = ""; var g_last_version = ""; var g_current_version = ""; @@ -27,9 +27,9 @@ var error_process = function (ret, func_success, func_error) { } }; -var teleport_init = function (low_version, last_version, func_success, func_error) { +var teleport_init = function (last_version, req_version, func_success, func_error) { - g_low_version = low_version; + g_req_version = req_version; g_last_version = last_version; var data = {}; var args_ = encodeURIComponent(JSON.stringify(data)); @@ -41,11 +41,10 @@ var teleport_init = function (low_version, last_version, func_success, func_erro dataType: 'json', success: function (ret) { g_current_version = ret.version; - console.log("current_version", g_current_version); if (version_compare()) { error_process(ret, func_success, func_error); } else { - func_error(ret, TPE_OLD_ASSIST, '助手版本太低，请下载最新版本！'); + func_error(ret, TPE_OLD_ASSIST, '助手版本太低，请下载最新版本！'); } }, error: function (jqXhr) { @@ -55,11 +54,9 @@ var teleport_init = function (low_version, last_version, func_success, func_erro }; var version_compare = function () { - var cur_version = parseInt(g_current_version.split(".")[2]); -// var last_version = parseInt(g_last_version.split(".")[2]); - var low_version = parseInt(g_low_version.split(".")[2]); - return cur_version >= low_version; + var req_version = parseInt(g_req_version.split(".")[2]); + return cur_version >= req_version; }; var to_teleport = function (url, args, func_success, func_error) { diff --git a/server/www/teleport/view/auth/login.mako b/server/www/teleport/view/auth/login.mako index a21b865..6516676 100644 --- a/server/www/teleport/view/auth/login.mako +++ b/server/www/teleport/view/auth/login.mako @@ -59,7 +59,7 @@
- +
diff --git a/server/www/teleport/view/auth/register.mako b/server/www/teleport/view/auth/register.mako deleted file mode 100644 index d92e478..0000000 --- a/server/www/teleport/view/auth/register.mako +++ /dev/null @@ -1,513 +0,0 @@ - - - - - - - - TELEPORT::注册 - - - - - - - - - - - - - - - - ## - ## - ## - ## - - - - - - - -
-
-
-
-
-
-
- - -
- - -
-
- 用邮箱注册 - 用手机号注册 -
- -
-

欢迎在TELEPORT创建团队。您将成为此团队管理员，需要先注册您的个人账号。

-
-
- - -
-
- - - - - - ##
- ##
- ## - ## - ##
- ##
- ##
- ##
- ## - ## - ##
- ##
- - -
-
- - - -
-

验证码，点击图片可更换

-
- -
- - -
-

创建一个运维管理团队，您可以随时在团队管理界面修改下列信息。

-
-
- - -
-
-
- -
- 您正在加入团队是: -
- -
- - -
-
- -
-
- -
- - -
- -
- -
-
-
-
-
- - - - - - ## 模式对话框：页面加载后先让用户输入邀请码 - - - - - - - \ No newline at end of file diff --git a/server/www/teleport/view/auth/sucessful.mako b/server/www/teleport/view/auth/sucessful.mako deleted file mode 100644 index 4f0b4f1..0000000 --- a/server/www/teleport/view/auth/sucessful.mako +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - TELEPORT::注册成功 - - - - - - - - - - - - - - - - - - - -
-
-
- 您的账号密码已经发送到关联邮箱.请点击这里 - 登陆进入登陆页面 -
-
-
- - - - - - \ No newline at end of file diff --git a/server/www/teleport/view/common/_sidebar_nav_menu.mako b/server/www/teleport/view/common/_sidebar_nav_menu.mako index c9b9681..868b13f 100644 --- a/server/www/teleport/view/common/_sidebar_nav_menu.mako +++ b/server/www/teleport/view/common/_sidebar_nav_menu.mako @@ -148,8 +148,9 @@
-
服务端版本：${eom_ver.TS_VER}
-
助手版本：${eom_ver.TP_ASSIST_LAST_VER}
+
服务端：v${eom_ver.TS_VER}
+
助手：v${eom_ver.TP_ASSIST_LAST_VER}
+
当前助手：v${eom_ver.TP_ASSIST_REQUIRE}
\ No newline at end of file diff --git a/version.in b/version.in index 1af66f3..6b50a6b 100644 --- a/version.in +++ b/version.in @@ -14,6 +14,6 @@ Build ： 构建号。构建号用于表明此版本发布之前进行了多少 -TELEPORT_SERVER 2.1.0.1 -TELEPORT_ASSIST 2.1.0.1 +TELEPORT_SERVER 2.1.2.1 +TELEPORT_ASSIST 2.1.2.1 TELEPORT_ASSIST_REQUIRE 2.0.0.1