Commit b05fde41 by 杨昕

code format

parent 94f75ac8
Pipeline #9868 passed with stages
in 33 seconds
...@@ -18,6 +18,12 @@ class MediaController extends Controller ...@@ -18,6 +18,12 @@ class MediaController extends Controller
'master' => 'offcncloud', 'master' => 'offcncloud',
]; ];
protected $domain = [
'develop' => 'dev-offcncloud.s3-cn-north-1.qiniucs.com',
'test' => 'test-offcncloud.s3-cn-north-1.qiniucs.com',
'master' => 'offcncloud.s3-cn-north-1.qiniucs.com'
];
/** /**
* 获取媒资ID * 获取媒资ID
* @param Request $request * @param Request $request
...@@ -51,7 +57,9 @@ class MediaController extends Controller ...@@ -51,7 +57,9 @@ class MediaController extends Controller
$token = QiniuModel::uploadToken($this->bucketList[$branch],$key); $token = QiniuModel::uploadToken($this->bucketList[$branch],$key);
return ["token" => $token]; $domain = $this->domain[$branch];
return ["token" => $token,'domain' => $domain];
}); });
return success($result); return success($result);
} }
......
...@@ -10,11 +10,6 @@ use Illuminate\Support\Facades\DB; ...@@ -10,11 +10,6 @@ use Illuminate\Support\Facades\DB;
class UsersController extends Controller class UsersController extends Controller
{ {
protected $domain = [
'dev' => 'dev-offcncloud.s3-cn-north-1.qiniucs.com',
'test' => 'test-offcncloud.s3-cn-north-1.qiniucs.com',
'master'=> 'offcncloud.s3-cn-north-1.qiniucs.com',
];
/** /**
* 第三方验权 * 第三方验权
* @param Request $request * @param Request $request
...@@ -131,8 +126,7 @@ class UsersController extends Controller ...@@ -131,8 +126,7 @@ class UsersController extends Controller
throw new DatabaseException('用户名信息更新失败'); throw new DatabaseException('用户名信息更新失败');
} }
$branch = empty(getenv('branch')) ? 'test' : getenv('branch'); return $newtoken;
return ['access_token'=>$newtoken,'domain'=> $this->domain[$branch]];
}else{ }else{
throw new DatabaseException('用户名称或者密码错误'); throw new DatabaseException('用户名称或者密码错误');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment