blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

[更新]增加Api接口支持

Browse Source
This commit is contained in:
Anyon 2018-05-19 16:05:54 +08:00
parent 1316e885f8
commit e1fbadddc4
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extend/controller/BasicApi.php
View File

@ -15,9 +15,6 @@
namespace controller; namespace controller;
use service\ToolsService; use service\ToolsService;
use think\exception\HttpResponseException;
use think\facade\Response;
use think\facade\Session;
/** /**
* 基础接口类 * 基础接口类
@ -39,13 +36,8 @@ class BasicApi
*/ */
public function __construct() public function __construct()
{ {
// Cors跨域Options请求处理
Session::init(config('session.'));
ToolsService::corsOptionsHandler(); ToolsService::corsOptionsHandler();
// Cors跨域会话切换及初始化
$this->request = app('request'); $this->request = app('request');
$sessionName = $this->request->header(session_name());
empty($sessionName) || session_id($sessionName);
} }
/** /**
@ -55,8 +47,7 @@ class BasicApi
*/ */
protected function success($msg, $data = []) protected function success($msg, $data = [])
{ {
$result = ['code' => 1, 'msg' => $msg, 'data' => $data, 'token' => session_name() . '=' . session_id()]; ToolsService::success($msg, $data);
throw new HttpResponseException(Response::create($result, 'json', 200, ToolsService::corsRequestHander()));
} }
/** /**
@ -66,8 +57,7 @@ class BasicApi
*/ */
protected function error($msg, $data = []) protected function error($msg, $data = [])
{ {
$result = ['code' => 0, 'msg' => $msg, 'data' => $data, 'token' => session_name() . '=' . session_id()]; ToolsService::success($msg, $data);
throw new HttpResponseException(Response::create($result, 'json', 200, ToolsService::corsRequestHander()));
} }
} }

36
extend/service/ToolsService.php
View File

@ -14,6 +14,10 @@
namespace service; namespace service;
use think\exception\HttpResponseException;
use think\facade\Response;
use think\facade\Session;
/** /**
* 系统工具服务 * 系统工具服务
* Class ToolsService * Class ToolsService
@ -29,11 +33,19 @@ class ToolsService
*/ */
public static function corsOptionsHandler() public static function corsOptionsHandler()
{ {
Session::init(config('session.'));
$token = request()->header('token', '');
empty($token) && $token = request()->post('token', '');
empty($token) && $token = request()->get('token', '');
list($name, $value) = explode('=', decode($token) . '=');
if (!empty($value) && session_name() === $name) {
session_id($value);
}
if (request()->isOptions()) { if (request()->isOptions()) {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
header('Access-Control-Allow-Credentials:true'); header('Access-Control-Allow-Credentials:true');
header('Access-Control-Allow-Methods:GET,POST,OPTIONS'); header('Access-Control-Allow-Methods:GET,POST,OPTIONS');
header('Access-Control-Allow-Headers:Accept,Referer,Host,Keep-Alive,User-Agent,X-Requested-With,Cache-Control,Cookie,' . session_name()); header("Access-Control-Allow-Headers:Accept,Referer,Host,Keep-Alive,User-Agent,X-Requested-With,Cache-Control,Cookie,token");
header('Content-Type:text/plain charset=UTF-8'); header('Content-Type:text/plain charset=UTF-8');
header('Access-Control-Max-Age:1728000'); header('Access-Control-Max-Age:1728000');
header('HTTP/1.0 204 No Content'); header('HTTP/1.0 204 No Content');
@ -56,6 +68,28 @@ class ToolsService
]; ];
} }
/**
* 返回成功的操作
* @param string $msg 消息内容
* @param array $data 返回数据
*/
public static function success($msg, $data = [])
{
$result = ['code' => 1, 'msg' => $msg, 'data' => $data, 'token' => encode(session_name() . '=' . session_id())];
throw new HttpResponseException(Response::create($result, 'json', 200, self::corsRequestHander()));
}
/**
* 返回失败的请求
* @param string $msg 消息内容
* @param array $data 返回数据
*/
public static function error($msg, $data = [])
{
$result = ['code' => 0, 'msg' => $msg, 'data' => $data, 'token' => encode(session_name() . '=' . session_id())];
throw new HttpResponseException(Response::create($result, 'json', 200, self::corsRequestHander()));
}
/** /**
* Emoji原形转换为String * Emoji原形转换为String
* @param string $content * @param string $content