From 3f22e2469365ba0843d78b79d64fb05b4c02c77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Thu, 23 Feb 2017 17:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Auth.php | 12 ++++++++++++ application/admin/controller/Config.php | 12 ++++++++++++ application/admin/controller/Index.php | 12 ++++++++++++ application/admin/controller/Login.php | 12 ++++++++++++ application/admin/controller/Menu.php | 12 ++++++++++++ application/admin/controller/Node.php | 12 ++++++++++++ application/admin/controller/Plugs.php | 12 ++++++++++++ application/admin/controller/Role.php | 12 ++++++++++++ application/admin/controller/User.php | 12 ++++++++++++ application/admin/model/User.php | 12 ++++++++++++ application/common.php | 12 ++++++++++++ application/config.php | 12 ++++++++++++ application/database.php | 10 ++++++---- application/index/controller/Index.php | 26 ++++++++++++++++++------- application/route.php | 12 ++++++++++++ application/tags.php | 12 ++++++++++++ extend/controller/BasicAdmin.php | 12 ++++++++++++ extend/controller/BasicWechat.php | 19 +++++++++++++++--- extend/library/Csv.php | 12 ++++++++++++ extend/library/Data.php | 12 ++++++++++++ extend/library/Emoji.php | 12 ++++++++++++ extend/library/Express.php | 12 ++++++++++++ extend/library/File.php | 12 ++++++++++++ extend/library/Http.php | 12 ++++++++++++ extend/library/Ip2Region.php | 12 ++++++++++++ extend/library/News.php | 12 ++++++++++++ extend/library/Node.php | 12 ++++++++++++ extend/library/QRcode.php | 12 ++++++++++++ extend/library/Sms.php | 12 ++++++++++++ extend/library/Tools.php | 12 ++++++++++++ extend/library/resource/mines.php | 11 +++++++++++ extend/service/ExpressService.php | 12 ++++++++++++ extend/service/FansService.php | 18 ++++++++++++++--- extend/service/PayService.php | 14 +++++++++++-- extend/service/SmsService.php | 12 ++++++++++++ public/index.php | 16 +++++++++++++-- public/pay.html | 16 --------------- public/router.php | 12 +++++++----- 38 files changed, 448 insertions(+), 42 deletions(-) delete mode 100644 public/pay.html diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php index 6b3782a61..d2d9dcb56 100644 --- a/application/admin/controller/Auth.php +++ b/application/admin/controller/Auth.php @@ -1,5 +1,17 @@ +// | 开源协议 ( https://mit-license.org ) +// +---------------------------------------------------------------------- +// | github开源项目：https://github.com/zoujingli/Think.Admin // +---------------------------------------------------------------------- return [ diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index 91021478d..e2abf89db 100644 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -1,4 +1,16 @@ redirect('@admin'); - $version = Db::query('select version() as ver'); - $version = array_pop($version); - $this->assign('mysql_ver', $version['ver']); - return view(); - } +public function index() { +$this->redirect('@admin'); +$version = Db::query('select version() as ver'); +$version = array_pop($version); +$this->assign('mysql_ver', $version['ver']); +return view(); +} } diff --git a/application/route.php b/application/route.php index 0b67a5fe4..89b9a4fb5 100644 --- a/application/route.php +++ b/application/route.php @@ -1,3 +1,15 @@ [], diff --git a/extend/controller/BasicAdmin.php b/extend/controller/BasicAdmin.php index c26f93fe1..4417cad50 100644 --- a/extend/controller/BasicAdmin.php +++ b/extend/controller/BasicAdmin.php @@ -1,5 +1,17 @@ request->baseUrl(), '', false, true) . '?' . http_build_query($params); } - $wechat = &load_wechat('Oauth'); + $wechat = &load_wechat('Oauth'); # 微信网页授权处理 if (!$this->request->get('code', false)) { exit(redirect($wechat->getOauthRedirect($wxoauth_url, 'webOauth', 'snsapi_base'))->send()); @@ -108,4 +120,5 @@ class BasicWechat extends Controller { !!$redirect_url && exit(redirect($redirect_url)->send()); return $this->openid; } -} \ No newline at end of file + +} diff --git a/extend/library/Csv.php b/extend/library/Csv.php index db9f84dd7..e0fbd5851 100644 --- a/extend/library/Csv.php +++ b/extend/library/Csv.php @@ -1,5 +1,17 @@ array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), 'cpt' => 'application/mac-compactpro', diff --git a/extend/service/ExpressService.php b/extend/service/ExpressService.php index cbe42af53..330f73879 100644 --- a/extend/service/ExpressService.php +++ b/extend/service/ExpressService.php @@ -1,5 +1,17 @@ getDatacube('user', 'cumulate', date('Y-m-d', strtotime("-{$day} day")), date('Y-m-d', strtotime('-1 day'))); + $data['cumulate'] = (array) $extends->getDatacube('user', 'cumulate', date('Y-m-d', strtotime("-{$day} day")), date('Y-m-d', strtotime('-1 day'))); // 统计增量数 - $data['summary'] = (array)$extends->getDatacube('user', 'summary', date('Y-m-d', strtotime("-{$day} day")), date('Y-m-d', strtotime('-1 day'))); + $data['summary'] = (array) $extends->getDatacube('user', 'summary', date('Y-m-d', strtotime("-{$day} day")), date('Y-m-d', strtotime('-1 day'))); // 统计消息数 - $data['upstreammsg'] = (array)$extends->getDatacube('upstreammsg', 'summary', date('Y-m-d', strtotime("-{$day} day")), date('Y-m-d', strtotime('-1 day'))); + $data['upstreammsg'] = (array) $extends->getDatacube('upstreammsg', 'summary', date('Y-m-d', strtotime("-{$day} day")), date('Y-m-d', strtotime('-1 day'))); $temp = array(); for ($i = 1; $i <= $day; $i++) { $temp[date('Y-m-d', strtotime("-{$i} day"))] = []; diff --git a/extend/service/PayService.php b/extend/service/PayService.php index cb97c0a31..d1220ab74 100644 --- a/extend/service/PayService.php +++ b/extend/service/PayService.php @@ -1,12 +1,23 @@ - - - - 支付测试 - - -
- - - - -
- - \ No newline at end of file diff --git a/public/router.php b/public/router.php index 6ba1fabf9..ee2874588 100644 --- a/public/router.php +++ b/public/router.php @@ -1,14 +1,16 @@ +// | 开源协议 ( https://mit-license.org ) +// +---------------------------------------------------------------------- +// | github开源项目：https://github.com/zoujingli/Think.Admin // +---------------------------------------------------------------------- -// $Id$ if (is_file($_SERVER["DOCUMENT_ROOT"] . $_SERVER["REQUEST_URI"])) { return false;