github
/
teleport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

升级服务端版本号到 2.2.9.3，准备发布新版本。

pull/32/head
Apex Liu 2017-06-04 03:41:56 +08:00
parent 6ef17c79b1
commit 1a3f7f3378
10 changed files with 108 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/builder/core/ver.py
View File

@ -1,3 +1,3 @@
# -*- coding: utf8 -*- # -*- coding: utf8 -*-
VER_TELEPORT_SERVER = "2.2.8.1" VER_TELEPORT_SERVER = "2.2.9.3"
VER_TELEPORT_ASSIST = "2.2.6.1" VER_TELEPORT_ASSIST = "2.2.6.1"

BIN
server/tp_core/core/tp_core.rc
View File

Binary file not shown.

2
server/tp_core/core/ts_ver.h
View File

@ -1,6 +1,6 @@
#ifndef __TS_SERVER_VER_H__ #ifndef __TS_SERVER_VER_H__
#define __TS_SERVER_VER_H__ #define __TS_SERVER_VER_H__
#define TP_SERVER_VER L"2.2.8.1" #define TP_SERVER_VER L"2.2.9.3"
#endif // __TS_SERVER_VER_H__ #endif // __TS_SERVER_VER_H__

BIN
server/tp_web/src/tp_web.rc
View File

Binary file not shown.

2
server/tp_web/src/ts_ver.h
View File

@ -1,6 +1,6 @@
#ifndef __TS_SERVER_VER_H__ #ifndef __TS_SERVER_VER_H__
#define __TS_SERVER_VER_H__ #define __TS_SERVER_VER_H__
#define TP_SERVER_VER L"2.2.8.1" #define TP_SERVER_VER L"2.2.9.3"
#endif // __TS_SERVER_VER_H__ #endif // __TS_SERVER_VER_H__

2
server/www/teleport/app/eom_ver.py
View File

@ -1,4 +1,4 @@
# -*- coding: utf8 -*- # -*- coding: utf8 -*-
TS_VER = "2.2.8.1" TS_VER = "2.2.9.3"
TP_ASSIST_LAST_VER = "2.2.6.1" TP_ASSIST_LAST_VER = "2.2.6.1"
TP_ASSIST_REQUIRE = "2.0.0.1" TP_ASSIST_REQUIRE = "2.0.0.1"

8
server/www/teleport/view/auth/login.mako
View File

@ -26,8 +26,8 @@
<div class="col-md-5"> <div class="col-md-5">
<div class="auth-box auth-box-lg"> <div class="auth-box auth-box-lg">
<div class="header"> <div class="header">
<a id="login-type-password" class="title selected" href="javascript:;">账号/密码 登录</a> <a id="login-type-password" class="title selected" href="javascript:;">账号/密码登录</a>
<a id="login-type-oath" class="title" href="javascript:;">身份验证器</a> <a id="login-type-oath" class="title" href="javascript:;">身份验证器登录</a>
</div> </div>
<div class="inputarea"> <div class="inputarea">
@ -61,8 +61,8 @@
<div id="login-area-oath" style="display:none;"> <div id="login-area-oath" style="display:none;">
<div class="inputbox"> <div class="inputbox">
<div class="input-group input-group-lg"> <div class="input-group input-group-lg">
<span class="input-group-addon"><i class="fa fa-google fa-fw"></i></span> <span class="input-group-addon"><i class="fa fa-clock-o fa-fw"></i></span>
<input id="oath-code" type="text" class="form-control" placeholder="谷歌身份验证器动态验证码"> <input id="oath-code" type="text" class="form-control" placeholder="6位数字身份验证器动态验证码">
</div> </div>
</div> </div>
</div> </div>

198
server/www/teleport/view/auth/page_base.mako
View File

@ -1,100 +1,100 @@
<!DOCTYPE html> <!DOCTYPE html>
<%! <%!
import eom_ver import eom_ver
page_title_ = '' page_title_ = ''
%> %>
<!--[if IE 8]><html lang="en" class="ie8"> <![endif]--> <!--[if IE 8]><html lang="en" class="ie8"> <![endif]-->
<!--[if !IE]><!--> <!--[if !IE]><!-->
<html lang="zh_CN"> <html lang="zh_CN">
<!--<![endif]--> <!--<![endif]-->
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"/> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta content="yes" name="apple-mobile-web-app-capable"> <meta content="yes" name="apple-mobile-web-app-capable">
<meta content="black-translucent" name="apple-mobile-web-app-status-bar-style"> <meta content="black-translucent" name="apple-mobile-web-app-status-bar-style">
<title>${self.attr.page_title_}::TELEPORT</title> <title>${self.attr.page_title_}::TELEPORT</title>
<link rel="shortcut icon" href="${ static_url('favicon.png') }"> <link rel="shortcut icon" href="${ static_url('favicon.png') }">
<!-- CSS --> <!-- CSS -->
<link href="${ static_url('plugins/bootstrap/css/bootstrap.min.css') }" rel="stylesheet" type="text/css"/> <link href="${ static_url('plugins/bootstrap/css/bootstrap.min.css') }" rel="stylesheet" type="text/css"/>
<link href="${ static_url('plugins/font-awesome/css/font-awesome.min.css') }" rel="stylesheet"> <link href="${ static_url('plugins/font-awesome/css/font-awesome.min.css') }" rel="stylesheet">
<link href="${ static_url('css/main.css') }" rel="stylesheet" type="text/css"/> <link href="${ static_url('css/main.css') }" rel="stylesheet" type="text/css"/>
<link href="${ static_url('css/auth.css') }" rel="stylesheet" type="text/css"/> <link href="${ static_url('css/auth.css') }" rel="stylesheet" type="text/css"/>
<%block name="extend_css"/> <%block name="extend_css"/>
</head> </head>
<body> <body>
<div id="head"> <div id="head">
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-default navbar-fixed-top">
<div class="container"> <div class="container">
<ul class="nav navbar-nav navbar-left"> <ul class="nav navbar-nav navbar-left">
<li> <li>
<div class="logo"> <div class="logo">
<a href="/"><img src="${ static_url('img/site-logo.png') }" alt="TELEPORT，触维软件旗下产品。"/></a> <a href="/"><img src="${ static_url('img/site-logo.png') }" alt="TELEPORT，触维软件旗下产品。"/></a>
<span class="desc">连接 &middot; 尽在指掌中</span> <span class="desc">连接 &middot; 尽在指掌中</span>
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
</nav> </nav>
</div> </div>
<div id="content"> <div id="content">
<div class="container"> <div class="container">
${self.body()} ${self.body()}
</div> </div>
</div> </div>
<div id="foot"> <div id="foot">
<nav class="navbar navbar-default navbar-fixed-bottom"> <nav class="navbar navbar-default navbar-fixed-bottom">
<div class="container"> <div class="container">
<p>触维软件旗下产品 | TELEPORT v${eom_ver.TS_VER} | &copy;2015 - 2017 <a href="http://www.eomsoft.net/" target="_blank">触维软件</a>，保留所有权利。</p> <p>触维软件旗下产品 | TELEPORT v${eom_ver.TS_VER} | &copy;2015 - 2017 <a href="http://teleport.eomsoft.net/" target="_blank">触维软件</a>，保留所有权利。</p>
</div> </div>
</nav> </nav>
</div> </div>
<%block name="extend_content" /> <%block name="extend_content" />
<!-- JavaScript --> <!-- JavaScript -->
<script type="text/javascript" src="${ static_url('plugins/underscore/underscore.js') }"></script> <script type="text/javascript" src="${ static_url('plugins/underscore/underscore.js') }"></script>
<script type="text/javascript" src="${ static_url('plugins/jquery/jquery.min.js') }"></script> <script type="text/javascript" src="${ static_url('plugins/jquery/jquery.min.js') }"></script>
<script type="text/javascript" src="${ static_url('plugins/bootstrap/js/bootstrap.min.js') }"></script> <script type="text/javascript" src="${ static_url('plugins/bootstrap/js/bootstrap.min.js') }"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="${ static_url('plugins/html5shiv/html5shiv.min.js') }"></script> <script src="${ static_url('plugins/html5shiv/html5shiv.min.js') }"></script>
<![endif]--> <![endif]-->
<script type="text/javascript" src="${ static_url('js/json2.js') }"></script> <script type="text/javascript" src="${ static_url('js/json2.js') }"></script>
<script type="text/javascript" src="${ static_url('plugins/gritter/js/jquery.gritter.js') }"></script> <script type="text/javascript" src="${ static_url('plugins/gritter/js/jquery.gritter.js') }"></script>
<script type="text/javascript" src="${ static_url('js/ywl_const.js') }"></script> <script type="text/javascript" src="${ static_url('js/ywl_const.js') }"></script>
<script type="text/javascript" src="${ static_url('js/ywl_common.js') }"></script> <script type="text/javascript" src="${ static_url('js/ywl_common.js') }"></script>
<script type="text/javascript" src="${ static_url('js/ywl.js') }"></script> <script type="text/javascript" src="${ static_url('js/ywl.js') }"></script>
<script type="text/javascript" src="${ static_url('js/ywl_assist.js') }"></script> <script type="text/javascript" src="${ static_url('js/ywl_assist.js') }"></script>
<script type="text/javascript" src="${ static_url('js/ui/common.js') }"></script> <script type="text/javascript" src="${ static_url('js/ui/common.js') }"></script>
<script type="text/javascript" src="${ static_url('js/ui/controls.js') }"></script> <script type="text/javascript" src="${ static_url('js/ui/controls.js') }"></script>
<%block name="extend_js"/> <%block name="extend_js"/>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
// once page ready, init ywl object. // once page ready, init ywl object.
ywl.init(); ywl.init();
}); });
</script> </script>
<%block name="embed_js" /> <%block name="embed_js" />
</body> </body>
</html> </html>

4
server/www/teleport/view/uidesign/index.mako
View File

@ -33,10 +33,6 @@
<div class="page-content"> <div class="page-content">
<div class="box">
<img src="/test/oath-code?">
</div>
<div class="box"> <div class="box">
<h1>这是一级标题，This is H1.</h1> <h1>这是一级标题，This is H1.</h1>
<h2>这是二级标题，This is H2.</h2> <h2>这是二级标题，This is H2.</h2>

2
version.in
View File

@ -14,6 +14,6 @@ Build ： 构建号。构建号用于表明此版本发布之前进行了多少
TELEPORT_SERVER 2.2.8.1 TELEPORT_SERVER 2.2.9.3
TELEPORT_ASSIST 2.2.6.1 TELEPORT_ASSIST 2.2.6.1
TELEPORT_ASSIST_REQUIRE 2.0.0.1 TELEPORT_ASSIST_REQUIRE 2.0.0.1