Commit baeb2548 authored by wanli's avatar wanli

🐞 fix(): 后端EPK打包接口参数优化

parent 434e1e86
''' '''
Author: your name Author: your name
Date: 2021-07-12 11:14:48 Date: 2021-07-12 11:14:48
LastEditTime: 2021-07-22 14:56:12 LastEditTime: 2021-07-22 17:54:40
LastEditors: Please set LastEditors LastEditors: Please set LastEditors
Description: In User Settings Edit Description: In User Settings Edit
FilePath: \evm-store\tools\build_out\controllers\appi.py FilePath: \evm-store\tools\build_out\controllers\appi.py
...@@ -15,7 +15,7 @@ from pathlib import Path ...@@ -15,7 +15,7 @@ from pathlib import Path
import urllib import urllib
from datetime import datetime from datetime import datetime
from urllib import parse, request from urllib import parse, request
from urllib.parse import urlparse from urllib.parse import urlparse, urljoin
from application.app import db, config from application.app import db, config
from models.device import DeviceModel from models.device import DeviceModel
from models.annex import AnnexModel from models.annex import AnnexModel
...@@ -134,7 +134,7 @@ class BuildAppResource(object): ...@@ -134,7 +134,7 @@ class BuildAppResource(object):
# with open(os.sep.join([target_dir, "epk.json"]), "w") as f: # with open(os.sep.join([target_dir, "epk.json"]), "w") as f:
# json.dump(app.to_dict(), f) # json.dump(app.to_dict(), f)
return { 'app_name': app.app_name, 'app_file': "{}.epk".format(app.app_name), 'app_url': epk_path }, ResponseCode.HTTP_SUCCESS return { 'app_name': app.app_name, 'app_file': "{}.epk".format(app.app_name), 'app_url': urljoin(params.get("host_url"), epk_path) }, ResponseCode.HTTP_SUCCESS
buildAppResource = BuildAppResource() buildAppResource = BuildAppResource()
......
''' '''
Author: your name Author: your name
Date: 2021-07-19 14:29:33 Date: 2021-07-19 14:29:33
LastEditTime: 2021-07-22 17:43:52 LastEditTime: 2021-07-22 17:51:55
LastEditors: Please set LastEditors LastEditors: Please set LastEditors
Description: In User Settings Edit Description: In User Settings Edit
FilePath: \evm-store\tools\build_out\views\api.py FilePath: \evm-store\tools\build_out\views\api.py
...@@ -228,12 +228,10 @@ class BuildAppResource(Resource): ...@@ -228,12 +228,10 @@ class BuildAppResource(Resource):
args = self.parser.parse_args() args = self.parser.parse_args()
try: try:
# logger.info(request.host)
logger.info(dir(request)) # logger.info(request.host_url)
logger.info(request.host) # logger.info(request.path)
logger.info(request.host) # logger.info(request.full_path)
logger.info(request.path)
logger.info(request.full_path)
data = dict() data = dict()
for key, value in args.items(): for key, value in args.items():
...@@ -254,8 +252,9 @@ class BuildAppResource(Resource): ...@@ -254,8 +252,9 @@ class BuildAppResource(Resource):
f.save(file_path.resolve().as_posix()) f.save(file_path.resolve().as_posix())
files.append(file_path.resolve().as_posix()) files.append(file_path.resolve().as_posix())
result, message = signalManager.actionApplicationBuild.emit( data.update({ 'host_url': request.host_url })
data, files)
result, message = signalManager.actionApplicationBuild.emit(data, files)
if result: if result:
return response_result(ResponseCode.HTTP_SUCCESS, data=result) return response_result(ResponseCode.HTTP_SUCCESS, data=result)
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment