Merge branch 'dev' of wugg/fivechang into master

1

application/Admin/common.php

@@ -18,7 +18,7 @@ function makeToken($account){
     if($has){
         Db::name("admin_token")->where(["adminid"=>$account['id']])->update(["token"=>$token,"expiretime"=>date("Y-m-d H:i:s",$now+1800)]);
     }else{
-        Db::name("admin_token")->insert(["token"=>$token,"expiretime"=>date("Y-m-d H:i:s",$now+1800),"addtime"=>date("Y-m-d H:i:s",$now+1800),
+        Db::name("admin_token")->insert(["token"=>$token,"expiretime"=>date("Y-m-d H:i:s",$now+1800),"addtime"=>date("Y-m-d H:i:s"),
             "adminid"=>$account['id']]);
     }
     return $token;

application/Home/controller/Login.php

@@ -32,6 +32,10 @@ class Login
         if(empty($account)){
             return error_show(1005,"卡号不正确");
         }
+        $pass = sha1($password.$account['salt']);
+        if($pass!=$account['password']){
+            return error_show(1006,"账户密码错误");
+        }
         if($account['status']==2){
             return error_show(1005,"卡号已过有效期");
         }