Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
49a84a7e
Commit
49a84a7e
authored
Oct 14, 2020
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
bfeb2a1f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletions
+11
-1
zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
+11
-1
No files found.
zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
View file @
49a84a7e
...
@@ -84,6 +84,7 @@ class TrademarkCtl extends CtlBase {
...
@@ -84,6 +84,7 @@ class TrademarkCtl extends CtlBase {
let
data
=
JSON
.
parse
(
rtn
.
stdout
);
let
data
=
JSON
.
parse
(
rtn
.
stdout
);
return
system
.
getResultSuccess
(
data
.
data
)
return
system
.
getResultSuccess
(
data
.
data
)
}
}
/**
/**
* @api {post} /web/trademark/trademarkctl/querypublish 检索发布
* @api {post} /web/trademark/trademarkctl/querypublish 检索发布
* @apiGroup 标源管理
* @apiGroup 标源管理
...
@@ -116,6 +117,7 @@ class TrademarkCtl extends CtlBase {
...
@@ -116,6 +117,7 @@ class TrademarkCtl extends CtlBase {
}
}
return
system
.
getResult
(
rtn
)
return
system
.
getResult
(
rtn
)
}
}
/**
/**
* @api {post} /web/trademark/trademarkctl/publish 批量发布
* @api {post} /web/trademark/trademarkctl/publish 批量发布
* @apiGroup 标源管理
* @apiGroup 标源管理
...
@@ -162,6 +164,11 @@ class TrademarkCtl extends CtlBase {
...
@@ -162,6 +164,11 @@ class TrademarkCtl extends CtlBase {
let
upload
=
await
this
.
uploadSve
.
findOne
({
let
upload
=
await
this
.
uploadSve
.
findOne
({
id
:
uploadid
id
:
uploadid
});
});
if
(
upload
.
status
==
1
)
return
{
status
:
1
,
msg
:
"ok"
}
let
sp
=
fileurl
.
split
(
"/"
);
let
sp
=
fileurl
.
split
(
"/"
);
let
filename
=
sp
[
sp
.
length
-
1
];
let
filename
=
sp
[
sp
.
length
-
1
];
await
this
.
restClient
.
execDownload
(
fileurl
,
filename
);
await
this
.
restClient
.
execDownload
(
fileurl
,
filename
);
...
@@ -199,7 +206,10 @@ class TrademarkCtl extends CtlBase {
...
@@ -199,7 +206,10 @@ class TrademarkCtl extends CtlBase {
pushd
.
channel_name
=
p
.
actionBody
.
channel_name
;
pushd
.
channel_name
=
p
.
actionBody
.
channel_name
;
await
this
.
publish
(
pushd
,
{
upload_id
:
uploadid
})
await
this
.
publish
(
pushd
,
{
upload_id
:
uploadid
})
}
}
return
system
.
getResult
(
1
,
"ok"
)
return
{
status
:
1
,
msg
:
"ok"
}
}
}
/**
/**
...
...
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