Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨昕
media-resource
Commits
b05fde41
Commit
b05fde41
authored
Jul 13, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code format
parent
94f75ac8
Pipeline
#9868
passed with stages
in 33 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
MediaController.php
app/Http/Controllers/Api/Client/MediaController.php
+9
-1
UsersController.php
app/Http/Controllers/Api/Client/UsersController.php
+1
-7
No files found.
app/Http/Controllers/Api/Client/MediaController.php
View file @
b05fde41
...
@@ -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
);
}
}
...
...
app/Http/Controllers/Api/Client/UsersController.php
View file @
b05fde41
...
@@ -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
(
'用户名称或者密码错误'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment