Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
evm-store
Project overview
Project overview
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
wanli
evm-store
Commits
6830a350
Commit
6830a350
authored
Apr 22, 2021
by
wanli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
aea41442
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
backend/controller/apps_manager.py
backend/controller/apps_manager.py
+3
-3
backend/controller/build_logs_manager.py
backend/controller/build_logs_manager.py
+1
-6
No files found.
backend/controller/apps_manager.py
View file @
6830a350
...
@@ -74,7 +74,7 @@ class AppsManager(object):
...
@@ -74,7 +74,7 @@ class AppsManager(object):
app_info
=
{}
app_info
=
{}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
epk_path
,
'appVersion'
:
app
.
app_version
,
'output'
:
os
.
path
.
dirname
(
epk_path
)
}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
epk_path
,
'appVersion'
:
app
.
app_version
,
'output'
:
os
.
path
.
dirname
(
epk_path
)
}
if
editor
.
role
==
"administrator"
or
editor
.
role
==
"
enterprise
"
:
if
editor
.
role
==
"administrator"
or
editor
.
role
==
"
community
"
:
params
[
'algorithm'
]
=
"h"
params
[
'algorithm'
]
=
"h"
epk
=
EpkApp
(
**
params
)
epk
=
EpkApp
(
**
params
)
app_info
=
epk
.
pack
()
app_info
=
epk
.
pack
()
...
@@ -150,7 +150,7 @@ class AppsManager(object):
...
@@ -150,7 +150,7 @@ class AppsManager(object):
# 打包成EPK文件
# 打包成EPK文件
app_info
=
{}
app_info
=
{}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
dest_dir
,
'appVersion'
:
app
.
app_version
,
'output'
:
target_dir
}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
dest_dir
,
'appVersion'
:
app
.
app_version
,
'output'
:
target_dir
}
if
editor
.
role
==
"administrator"
or
editor
.
role
==
"
enterprise
"
:
if
editor
.
role
==
"administrator"
or
editor
.
role
==
"
community
"
:
params
[
'algorithm'
]
=
"h"
params
[
'algorithm'
]
=
"h"
epk
=
EpkApp
(
**
params
)
epk
=
EpkApp
(
**
params
)
app_info
=
epk
.
pack
()
app_info
=
epk
.
pack
()
...
@@ -301,7 +301,7 @@ class AppsManager(object):
...
@@ -301,7 +301,7 @@ class AppsManager(object):
# 打包成EPK文件
# 打包成EPK文件
app_info
=
{}
app_info
=
{}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
dest_dir
,
'appVersion'
:
app
.
app_version
,
'output'
:
target_dir
}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
dest_dir
,
'appVersion'
:
app
.
app_version
,
'output'
:
target_dir
}
if
user
.
role
==
"administrator"
or
user
.
role
==
"
enterprise
"
:
if
user
.
role
==
"administrator"
or
user
.
role
==
"
community
"
:
params
[
'algorithm'
]
=
"h"
params
[
'algorithm'
]
=
"h"
epk
=
EpkApp
(
**
params
)
epk
=
EpkApp
(
**
params
)
app_info
=
epk
.
pack
()
app_info
=
epk
.
pack
()
...
...
backend/controller/build_logs_manager.py
View file @
6830a350
...
@@ -68,7 +68,7 @@ class BuildLogsManager(object):
...
@@ -68,7 +68,7 @@ class BuildLogsManager(object):
# 打包成EPK文件
# 打包成EPK文件
app_info
=
{}
app_info
=
{}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
dest_dir
,
'appVersion'
:
app
.
app_version
,
'output'
:
target_dir
}
params
=
{
'appName'
:
app
.
app_name
,
'appDir'
:
dest_dir
,
'appVersion'
:
app
.
app_version
,
'output'
:
target_dir
}
if
editor
.
role
==
"administrator"
or
editor
.
role
==
"
enterprise
"
:
if
editor
.
role
==
"administrator"
or
editor
.
role
==
"
community
"
:
params
[
'algorithm'
]
=
"h"
params
[
'algorithm'
]
=
"h"
epk
=
EpkApp
(
**
params
)
epk
=
EpkApp
(
**
params
)
app_info
=
epk
.
pack
()
app_info
=
epk
.
pack
()
...
@@ -85,11 +85,6 @@ class BuildLogsManager(object):
...
@@ -85,11 +85,6 @@ class BuildLogsManager(object):
epk_path
=
os
.
sep
.
join
([
target_dir
.
replace
(
config
.
get
(
"UPLOAD_PATH"
),
""
),
"{}.epk"
.
format
(
app
.
app_name
)])
.
replace
(
'
\\
'
,
'/'
)
epk_path
=
os
.
sep
.
join
([
target_dir
.
replace
(
config
.
get
(
"UPLOAD_PATH"
),
""
),
"{}.epk"
.
format
(
app
.
app_name
)])
.
replace
(
'
\\
'
,
'/'
)
# build = BuildLogs.get(app=app)
# if build:
# build.delete()
# commit()
# 新增一条BuildLogs
# 新增一条BuildLogs
result
=
BuildLogs
(
app
=
app
,
app_path
=
epk_path
,
app_info
=
app_info
,
create_by
=
editor
,
create_at
=
datetime
.
now
(),
update_by
=
editor
,
update_at
=
datetime
.
now
())
result
=
BuildLogs
(
app
=
app
,
app_path
=
epk_path
,
app_info
=
app_info
,
create_by
=
editor
,
create_at
=
datetime
.
now
(),
update_by
=
editor
,
update_at
=
datetime
.
now
())
commit
()
commit
()
...
...
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