Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qaHome
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
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
QA
qaHome
Commits
da3757b6
Commit
da3757b6
authored
Aug 29, 2018
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
c2682e8f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
8 deletions
+25
-8
server_v2.js
app/qa-home/controller/docker/server_v2.js
+25
-8
No files found.
app/qa-home/controller/docker/server_v2.js
View file @
da3757b6
...
...
@@ -321,12 +321,16 @@ exports.get_name_space = async function () {
let
db
=
this
.
mongo
(
"
NameSpaceGroup
"
);
try
{
await
formatListData
(
res
,
db
);
this
.
body
=
res
.
details
.
instances
;
this
.
body
=
{
code
:
"
0000
"
,
data
:
res
.
details
.
instances
};
}
catch
(
error
)
{
console
.
log
(
error
)
this
.
body
=
{
code
:
"
0001
"
,
msg
:
"
EOS获取数据问题
"
,
msg
:
"
EOS获取数据出错
"
,
data
:
JSON
.
stringify
(
res
),
detail
:
error
.
toString
()
}
}
...
...
@@ -425,10 +429,20 @@ exports.get_device = async function () {
await
this
.
bindDefault
();
let
self
=
this
;
let
opt
=
new
list_microservice
(
this
.
request
.
query
.
namespace
);
// let opth = new hosts_option()
let
dev
=
await
requestPromise
(
opt
);
// let hosts = await requestPromise(opth);
dev
=
JSON
.
parse
(
dev
);
try
{
dev
=
JSON
.
parse
(
dev
);
}
catch
(
error
)
{
console
.
log
(
error
)
console
.
log
(
dev
)
this
.
body
=
{
code
:
"
0001
"
,
msg
:
"
EOS获取数据出错
"
,
data
:
JSON
.
stringify
(
dev
),
detail
:
error
.
toString
()
}
return
}
// hosts = JSON.parse(hosts);
let
buss
=
[],
base
=
[],
ui
=
[];
let
items
=
dev
.
details
.
instances
;
...
...
@@ -446,9 +460,12 @@ exports.get_device = async function () {
}
this
.
body
=
{
common
:
base
,
backend
:
buss
,
frontend
:
ui
code
:
"
0000
"
,
data
:
{
common
:
base
,
backend
:
buss
,
frontend
:
ui
}
}
return
}
...
...
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