Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
newShopBack
Project
Project
Details
Activity
Releases
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
newshop
newShopBack
Commits
342c8234
Commit
342c8234
authored
Dec 06, 2019
by
侯贺政
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限节点url ;上传文件类型报错优化
Signed-off-by:
houhezheng
<
houhezheng@romens.cn
>
parent
5beca137
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
urlmanager.php
backend/config/urlmanager.php
+14
-0
BranchScoreController.php
backend/controllers/v1/branch/BranchScoreController.php
+4
-1
ShopUserController.php
backend/controllers/v1/shopuser/ShopUserController.php
+4
-1
No files found.
backend/config/urlmanager.php
View file @
342c8234
...
@@ -289,6 +289,20 @@ return [
...
@@ -289,6 +289,20 @@ return [
'POST,OPTIONS assign-authority-role'
=>
'assign-authority-role'
,
'POST,OPTIONS assign-authority-role'
=>
'assign-authority-role'
,
],
],
],
],
//权限节点
[
'class'
=>
'yii\rest\UrlRule'
,
'controller'
=>
[
'v1/authority/authority-node'
,
],
'extraPatterns'
=>
[
'GET,OPTIONS node-list'
=>
'node-list'
,
'GET,OPTIONS node-details'
=>
'node-details'
,
'put,OPTIONS node-update'
=>
'node-update'
,
'POST,OPTIONS node-add'
=>
'node-add'
,
'DELETE,OPTIONS node-del'
=>
'node-del'
,
]
],
],
],
],
],
]
]
...
...
backend/controllers/v1/branch/BranchScoreController.php
View file @
342c8234
...
@@ -365,7 +365,10 @@ class BranchScoreController extends BaseController
...
@@ -365,7 +365,10 @@ class BranchScoreController extends BaseController
$fileInfo
=
$upload_file
->
upload
();
$fileInfo
=
$upload_file
->
upload
();
if
(
$fileInfo
[
'CODE'
]
!=
'200'
)
{
if
(
$fileInfo
[
'CODE'
]
!=
'200'
)
{
Yii
::
$app
->
response
->
statusCode
=
422
;
Yii
::
$app
->
response
->
statusCode
=
422
;
return
$fileInfo
;
if
(
$fileInfo
[
'INFO'
][
'uploadFiles'
][
0
]
==
"类型不对"
)
{
$fileInfo
[
'INFO'
][
'uploadFiles'
][
0
]
=
'文件类型要求97-2003工作簿 xls格式!'
;
}
return
$fileInfo
[
'INFO'
];
}
}
$arr
=
Helper
::
newSpreadsheet
(
$fileInfo
[
'INFO'
][
0
])
->
getRows
(
false
,
[
'rowOffset'
=>
1
,
'columns'
=>
10
]);
$arr
=
Helper
::
newSpreadsheet
(
$fileInfo
[
'INFO'
][
0
])
->
getRows
(
false
,
[
'rowOffset'
=>
1
,
'columns'
=>
10
]);
...
...
backend/controllers/v1/shopuser/ShopUserController.php
View file @
342c8234
...
@@ -129,7 +129,10 @@ class ShopUserController extends BaseController
...
@@ -129,7 +129,10 @@ class ShopUserController extends BaseController
$fileInfo
=
$upload_file
->
upload
();
$fileInfo
=
$upload_file
->
upload
();
if
(
$fileInfo
[
'CODE'
]
!=
'200'
)
{
if
(
$fileInfo
[
'CODE'
]
!=
'200'
)
{
Yii
::
$app
->
response
->
statusCode
=
422
;
Yii
::
$app
->
response
->
statusCode
=
422
;
return
$fileInfo
;
if
(
$fileInfo
[
'INFO'
][
'uploadFiles'
][
0
]
==
"类型不对"
)
{
$fileInfo
[
'INFO'
][
'uploadFiles'
][
0
]
=
'文件类型要求97-2003工作簿 xls格式!'
;
}
return
$fileInfo
[
'INFO'
];
}
}
$arr
=
Helper
::
newSpreadsheet
(
$fileInfo
[
'INFO'
][
0
])
->
getRows
(
true
,
[
'rowOffset'
=>
2
,
'columns'
=>
9
]);
$arr
=
Helper
::
newSpreadsheet
(
$fileInfo
[
'INFO'
][
0
])
->
getRows
(
true
,
[
'rowOffset'
=>
2
,
'columns'
=>
9
]);
...
...
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