github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues 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>

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

@ -55,7 +55,7 @@
<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>

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