From 00308e4be1fc2b3cca1b3074ca10bfa23c961992 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Mon, 7 Nov 2016 01:00:35 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=B1=BB=E5=BA=93=E7=9A=84=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/User.php | 6 +++---
 extend/StrOrg.php                     | 2 --
 public/static/index/js/app.js         | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/application/index/controller/User.php b/application/index/controller/User.php
index 72d70cc..eb80868 100644
--- a/application/index/controller/User.php
+++ b/application/index/controller/User.php
@@ -7,9 +7,9 @@
 
 namespace app\index\controller;
 
-use extend\StrOrg;
+use think\Controller;
 
-class User extends Base  {
+class User extends Controller {
     public function index(){
         return $this->fetch();
     }
@@ -146,7 +146,7 @@ class User extends Base  {
 
     private function getAuthStr(){
         $ticket = config('AUTH_TICKET');
-        $nonceStr = StrOrg::randString(12,5,'oOLl01');
+        $nonceStr = \StrOrg::randString(12,5,'oOLl01');
         $now = time();
         $hashStr =  sha1("ticket={$ticket}&noncestr={$nonceStr}&timestamp={$now}");
         $urlParam = [
diff --git a/extend/StrOrg.php b/extend/StrOrg.php
index cd0dec7..b3ab2b6 100644
--- a/extend/StrOrg.php
+++ b/extend/StrOrg.php
@@ -4,8 +4,6 @@
  * @author  zhaoxiang <zhaoxiang051405@gmail.com>
  */
 
-namespace extend;
-
 
 class StrOrg {
 
diff --git a/public/static/index/js/app.js b/public/static/index/js/app.js
index 6c4f3b2..1bfc1f4 100644
--- a/public/static/index/js/app.js
+++ b/public/static/index/js/app.js
@@ -17,7 +17,7 @@
                 $.post(target, query).success(function(data) {
                     if (data.url) {
                         alertMSG.showAlert({
-                            msg:'<p><i class="icon-ok-sign mr10" style="color:#3c3"></i>'+data.info+' 页面即将自动跳转~</p>',
+                            msg:'<p><i class="icon-ok-sign mr10" style="color:#3c3"></i>'+data.msg+' 页面即将自动跳转~</p>',
                             callback: function(){
                                 setTimeout(function(){
                                     window.location.href= data.url;
@@ -26,7 +26,7 @@
                         });
                     } else {
                         alertMSG.showAlert({
-                            msg:'<p>'+data.info+'</p>',
+                            msg:'<p>'+data.msg+'</p>',
                         });
                     }
                 });