Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
meibuyu-micro
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
without authentication
meibuyu-micro
Commits
13fd39cb
Commit
13fd39cb
authored
May 28, 2020
by
梁俊杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取站点支持关联团队
导出功能优化
parent
743a7ee4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
BaseInfoServiceInterface.php
src/Service/Interfaces/BaseInfoServiceInterface.php
+2
-1
Exporter.php
src/Tools/Exporter.php
+3
-2
No files found.
src/Service/Interfaces/BaseInfoServiceInterface.php
View file @
13fd39cb
...
...
@@ -130,11 +130,12 @@ interface BaseInfoServiceInterface
/**
* 获取所有站点的数据
* @param array $relations 支持的关联关系 ['team', 'country'] 分别代表 团队、国家
* @param array $columns 要显示的字段
* $columns = ['id', "name", "url", "country_id", "team_id"];
* @return array 默认已keyBy('id')
*/
public
function
sites
(
array
$columns
=
[
'id'
,
"name"
])
:
array
;
public
function
sites
(
array
$
relations
=
[],
array
$
columns
=
[
'id'
,
"name"
])
:
array
;
}
src/Tools/Exporter.php
View file @
13fd39cb
...
...
@@ -64,9 +64,10 @@ class Exporter
public
function
__construct
(
int
$export_type
,
$tempFilePath
=
""
,
$name
=
"export_data"
,
$sheetIndex
=
0
)
{
$this
->
config
=
container
(
ConfigInterface
::
class
);
$this
->
rootPath
=
$this
->
config
->
get
(
'server.settings.document_root'
,
BASE_PATH
.
'/public
/
'
);
$this
->
rootPath
=
$this
->
config
->
get
(
'server.settings.document_root'
,
BASE_PATH
.
'/public'
);
if
(
$tempFilePath
)
{
$tempFilePath
=
$this
->
rootPath
.
$tempFilePath
;
$tempFilePath
=
$this
->
rootPath
.
"/"
.
$tempFilePath
;
//print_r($tempFilePath);
if
(
file_exists
(
$tempFilePath
))
{
$this
->
fileType
=
ucfirst
(
strtolower
(
pathinfo
(
$tempFilePath
,
PATHINFO_EXTENSION
)));
$reader
=
IOFactory
::
createReader
(
$this
->
fileType
)
->
load
(
$tempFilePath
);
...
...
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