Skip to content

Commit c22277f

Browse files
admpubadmpub
authored
Merge pull request #3 from top-think/master
Master
2 parents 9036139 + 55f6d36 commit c22277f

File tree

10 files changed

+20
-14
lines changed

10 files changed

+20
-14
lines changed

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
3-
版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn)
3+
版权所有Copyright © 2006-2017 by ThinkPHP (http://thinkphp.cn)
44
All rights reserved。
55
ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。
66

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
120120

121121
本项目包含的第三方源码和二进制文件之版权信息另行标注。
122122

123-
版权所有Copyright © 2006-2017 by ThinkPHP (http://thinkphp.cn)
123+
版权所有Copyright © 2006-2018 by ThinkPHP (http://thinkphp.cn)
124124

125125
All rights reserved。
126126

‎application/config.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// +----------------------------------------------------------------------
33
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
44
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
5+
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
66
// +----------------------------------------------------------------------
77
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
88
// +----------------------------------------------------------------------
@@ -14,10 +14,8 @@
1414
// | 应用设置
1515
// +----------------------------------------------------------------------
1616

17-
// 应用命名空间
18-
'app_namespace' => 'app',
1917
// 应用调试模式
20-
'app_debug' => true,
18+
'app_debug' => false,
2119
// 应用Trace
2220
'app_trace' => false,
2321
// 应用模式状态

‎application/database.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// +----------------------------------------------------------------------
33
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
44
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
5+
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
66
// +----------------------------------------------------------------------
77
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
88
// +----------------------------------------------------------------------

‎application/index/controller/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ class Index
55
{
66
public function index()
77
{
8-
return '<style type="text/css">*{ padding: 0; margin: 0; } .think_default_text{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:)</h1><p> ThinkPHP V5<br/><span style="font-size:30px">十年磨一剑 - 为API开发设计的高性能框架</span></p><span style="font-size:22px;">[ V5.0 版本由 <a href="http://www.qiniu.com" target="qiniu">七牛云</a> 独家赞助发布 ]</span></div><script type="text/javascript" src="http://tajs.qq.com/stats?sId=9347272" charset="UTF-8"></script><script type="text/javascript" src="http://ad.topthink.com/Public/static/client.js"></script><thinkad id="ad_bd568ce7058a1091"></thinkad>';
8+
return '<style type="text/css">*{ padding: 0; margin: 0; } .think_default_text{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:)</h1><p> ThinkPHP V5<br/><span style="font-size:30px">十年磨一剑 - 为API开发设计的高性能框架</span></p><span style="font-size:22px;">[ V5.0 版本由 <a href="http://www.qiniu.com" target="qiniu">七牛云</a> 独家赞助发布 ]</span></div><script type="text/javascript" src="https://tajs.qq.com/stats?sId=9347272" charset="UTF-8"></script><script type="text/javascript" src="https://e.topthink.com/Public/static/client.js"></script><think id="ad_bd568ce7058a1091"></think>';
99
}
1010
}

‎application/route.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// +----------------------------------------------------------------------
33
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
44
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
5+
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
66
// +----------------------------------------------------------------------
77
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
88
// +----------------------------------------------------------------------

‎application/tags.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// +----------------------------------------------------------------------
33
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
44
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
5+
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
66
// +----------------------------------------------------------------------
77
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
88
// +----------------------------------------------------------------------

‎build.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// +----------------------------------------------------------------------
33
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
44
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
5+
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
66
// +----------------------------------------------------------------------
77
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
88
// +----------------------------------------------------------------------

‎composer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@
1717
],
1818
"require": {
1919
"php": ">=5.4.0",
20-
"topthink/framework": "^5.0"
20+
"topthink/framework": "5.0.*"
21+
},
22+
"autoload": {
23+
"psr-4": {
24+
"app\\": "application"
25+
}
2126
},
2227
"extra": {
2328
"think-path": "thinkphp"

‎public/router.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22
// +----------------------------------------------------------------------
33
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
44
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
5+
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
66
// +----------------------------------------------------------------------
77
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
88
// +----------------------------------------------------------------------
99
// | Author: liu21st <liu21st@gmail.com>
1010
// +----------------------------------------------------------------------
1111
// $Id$
1212

13-
if (is_file($_SERVER["DOCUMENT_ROOT"] . $_SERVER["REQUEST_URI"])) {
13+
if (is_file($_SERVER["DOCUMENT_ROOT"] . $_SERVER["SCRIPT_NAME"])) {
1414
return false;
1515
} else {
16+
if (!isset($_SERVER['PATH_INFO'])) {
17+
$_SERVER['PATH_INFO'] = $_SERVER['REQUEST_URI'];
18+
}
1619
require __DIR__ . "/index.php";
1720
}

0 commit comments

Comments
 (0)