diff --git a/FlyCube/MpApi/Controller/LoginController.class.php b/FlyCube/MpApi/Controller/LoginController.class.php
index aa6ef56..3f43dab 100644
--- a/FlyCube/MpApi/Controller/LoginController.class.php
+++ b/FlyCube/MpApi/Controller/LoginController.class.php
@@ -15,58 +15,54 @@ class LoginController extends Controller
 	 */
 	public function login()
 	{
-		//header("Access-Control-Allow-Origin: " . C('LimitApi')); //请求域名限制
-		// header('Access-Control-Allow-Headers:Token'); //token请求头
-		header("Access-Control-Allow-Origin: *");
-		header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
-		header("Access-Control-Allow-Headers: Content-Type, Authorization");
-		echo json_encode(array('status' => 0, 'msg' => "hello"), JSON_UNESCAPED_UNICODE);
+		header("Access-Control-Allow-Origin: " . C('LimitApi')); //请求域名限制
+		header('Access-Control-Allow-Headers:Token'); //token请求头
 
-		// if (!$_POST['username']) {
-		// 	echo json_encode(array('status' => 0, 'msg' => '用户名不能为空'), JSON_UNESCAPED_UNICODE);
-		// 	exit;
-		// }
-		// if (!$_POST['password']) {
-		// 	echo json_encode(array('status' => 0, 'msg' => '密码不能为空'), JSON_UNESCAPED_UNICODE);
-		// 	exit;
-		// }
+		if (!$_POST['username']) {
+			echo json_encode(array('status' => 0, 'msg' => '用户名不能为空'), JSON_UNESCAPED_UNICODE);
+			exit;
+		}
+		if (!$_POST['password']) {
+			echo json_encode(array('status' => 0, 'msg' => '密码不能为空'), JSON_UNESCAPED_UNICODE);
+			exit;
+		}
 
-		// $adminuserDb = D('adminuser');
-		// $where['name'] = $_POST['username'];
-		// $where['del'] = '0';
-		// $adminInfo = $adminuserDb->where($where)->field('name,uname,pwd,qx,shop_id,photo,lasttime')->find();
-		// if ($adminInfo) {
-		// 	if (MD5(MD5($_POST['password'])) == $adminInfo['pwd']) {
-		// 		//登陆成功
-		// 		$this->shop_id = $adminInfo['shop_id'];
-		// 		$data['lasttime'] = time();
-		// 		$adminuserDb->where($where)->save($data); //最后登录时间写入数据库
-		// 		//从program表拿用户头像
-		// 		$adminInfo['photo'] = json_decode($adminInfo['photo'])[0]; //反序列化 取到头像名称
-		// 		switch ($adminInfo['qx']) {
-		// 			case 4:
-		// 				$adminInfo['power'] = 'admin';
-		// 				break;
-		// 			case 5:
-		// 				$adminInfo['power'] = 'editor';
-		// 				break;
-		// 		}
-		// 		//删除多余信息
-		// 		unset($adminInfo['pwd']);
-		// 		//创建token
-		// 		$token = $this->makeToken(array('shop_id' => $this->shop_id));
-		// 		//登陆成功 返回token
-		// 		echo json_encode(array('status' => 1, 'msg' => '登陆成功', 'adminInfo' => $adminInfo, 'token' => $token), JSON_UNESCAPED_UNICODE);
-		// 	} else {
-		// 		//密码错误
-		// 		echo json_encode(array('status' => 0, 'msg' => '登陆失败'), JSON_UNESCAPED_UNICODE);
-		// 		exit;
-		// 	}
-		// } else {
-		// 	//账号不存在或已注销
-		// 	echo json_encode(array('status' => 0, 'msg' => "登陆失败"), JSON_UNESCAPED_UNICODE);
-		// 	exit;
-		// }
+		$adminuserDb = D('adminuser');
+		$where['name'] = $_POST['username'];
+		$where['del'] = '0';
+		$adminInfo = $adminuserDb->where($where)->field('name,uname,pwd,qx,shop_id,photo,lasttime')->find();
+		if ($adminInfo) {
+			if (MD5(MD5($_POST['password'])) == $adminInfo['pwd']) {
+				//登陆成功
+				$this->shop_id = $adminInfo['shop_id'];
+				$data['lasttime'] = time();
+				$adminuserDb->where($where)->save($data); //最后登录时间写入数据库
+				//从program表拿用户头像
+				$adminInfo['photo'] = json_decode($adminInfo['photo'])[0]; //反序列化 取到头像名称
+				switch ($adminInfo['qx']) {
+					case 4:
+						$adminInfo['power'] = 'admin';
+						break;
+					case 5:
+						$adminInfo['power'] = 'editor';
+						break;
+				}
+				//删除多余信息
+				unset($adminInfo['pwd']);
+				//创建token
+				$token = $this->makeToken(array('shop_id' => $this->shop_id));
+				//登陆成功 返回token
+				echo json_encode(array('status' => 1, 'msg' => '登陆成功', 'adminInfo' => $adminInfo, 'token' => $token), JSON_UNESCAPED_UNICODE);
+			} else {
+				//密码错误
+				echo json_encode(array('status' => 0, 'msg' => '登陆失败'), JSON_UNESCAPED_UNICODE);
+				exit;
+			}
+		} else {
+			//账号不存在或已注销
+			echo json_encode(array('status' => 0, 'msg' => "登陆失败"), JSON_UNESCAPED_UNICODE);
+			exit;
+		}
 	}
 	/**
 	 * @description: 构建token