Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sun
Project
Project
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
谢林臻
sun
Commits
6db8bb0e
Commit
6db8bb0e
authored
6 years ago
by
张永
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/channel_package_zy' into 'test'
修改单个渠道打包条件 See merge request
alpha/sun!92
parents
1d0032e0
79377283
master
deploy/like-prod
deploy/like-stage
deploy/like-test
dev
like-pre/r01
test
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
channel_build.py
api/channel_build.py
+7
-1
No files found.
api/channel_build.py
View file @
6db8bb0e
...
@@ -145,6 +145,12 @@ class Channel(APIView):
...
@@ -145,6 +145,12 @@ class Channel(APIView):
if
not
all
([
channel_name
,
url_name
,
auto_pack
,
channel_type
]):
if
not
all
([
channel_name
,
url_name
,
auto_pack
,
channel_type
]):
error_logger
.
error
(
u'参数不完整'
)
error_logger
.
error
(
u'参数不完整'
)
return
self
.
write_fail
(
code
=
ERROR
.
ARG_MISS
,
message
=
'参数不完整'
)
return
self
.
write_fail
(
code
=
ERROR
.
ARG_MISS
,
message
=
'参数不完整'
)
if
channel_id
:
channel
=
self
.
rpc
[
'venus/sun/channel_build/channel/get'
](
id
=
channel_id
)
.
unwrap
()
else
:
channel
=
{}
data
=
dict
()
data
=
dict
()
if
channel_name
:
if
channel_name
:
data
.
update
({
'name'
:
channel_name
})
data
.
update
({
'name'
:
channel_name
})
...
@@ -162,7 +168,7 @@ class Channel(APIView):
...
@@ -162,7 +168,7 @@ class Channel(APIView):
error_logger
.
error
(
'操作失败
%
s'
,
e
)
error_logger
.
error
(
'操作失败
%
s'
,
e
)
return
self
.
write_fail
(
message
=
'路径名不能重复'
,
code
=-
1
)
return
self
.
write_fail
(
message
=
'路径名不能重复'
,
code
=-
1
)
version
=
resp
.
get
(
'version'
,
''
)
version
=
resp
.
get
(
'version'
,
''
)
if
version
and
not
channel_id
:
if
version
and
channel
.
get
(
'url_name'
)
!=
url_name
:
channel_build_one
.
delay
(
version
,
url_name
)
channel_build_one
.
delay
(
version
,
url_name
)
return
self
.
write_success
(
message
=
'操作成功'
,
data
=
{})
return
self
.
write_success
(
message
=
'操作成功'
,
data
=
{})
...
...
This diff is collapsed.
Click to expand it.
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