Commit 9ec68541 authored by wangmeng's avatar wangmeng

tijiao

parent 4a947b59
...@@ -12,7 +12,7 @@ rouer.register('email',views.EmailViewSet) ...@@ -12,7 +12,7 @@ rouer.register('email',views.EmailViewSet)
urlpatterns = [ urlpatterns = [
#报告列表 #报告列表
re_path('list/', views.ReportVIew.as_view()), re_path('list/', views.ReportVIew.as_view()),
path('<int:id>', views.ReportVIew.as_view()), path('/list/<id>', views.ReportVIew.as_view()),
path('send/meail/<name>',views.mailReport), path('send/meail/<name>',views.mailReport),
#报告详情 #报告详情
path('<name>',views.reportDetails), path('<name>',views.reportDetails),
......
...@@ -232,7 +232,7 @@ EMAIL_FROM = 'xiao_whb@163.com' ...@@ -232,7 +232,7 @@ EMAIL_FROM = 'xiao_whb@163.com'
AES_KEY="fusion" AES_KEY="fusion"
#服务器地址(用于测试报告) #服务器地址(用于测试报告)
HOST = "http://autotest-dev.liweijia.com" HOST = "http://116.211.118.66:30309"
# 跨域问题 # 跨域问题
CORS_ORIGIN_ALLOW_ALL = True CORS_ORIGIN_ALLOW_ALL = True
......
...@@ -47,7 +47,7 @@ def get_discover(): ...@@ -47,7 +47,7 @@ def get_discover():
"case_fail":result.failure_count, "case_fail":result.failure_count,
"start_time":str(times), "start_time":str(times),
"run_time":result.fields['totalTime'], "run_time":result.fields['totalTime'],
"report_details":HOST+"/report/fusion_http_report-{}.html".format(report_time) "report_details":HOST+"/report/fusion_report-{}.html".format(report_time)
} }
with open(yamlpath, 'w', encoding='utf-8') as f: with open(yamlpath, 'w', encoding='utf-8') as f:
yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True) yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)
......
...@@ -44,7 +44,7 @@ def get_discover(): ...@@ -44,7 +44,7 @@ def get_discover():
"case_fail":result.failure_count, "case_fail":result.failure_count,
"start_time":str(times), "start_time":str(times),
"run_time":result.fields['totalTime'], "run_time":result.fields['totalTime'],
"report_details":HOST + "/report/fusion_http_report-{}.html".format(report_time) "report_details":HOST + "/report/fusion_report-{}.html".format(report_time)
} }
with open(yamlpath, 'w', encoding='utf-8') as f: with open(yamlpath, 'w', encoding='utf-8') as f:
yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True) yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)
......
...@@ -44,7 +44,7 @@ def get_discover(): ...@@ -44,7 +44,7 @@ def get_discover():
# "start_time":result.begin_times, # "start_time":result.begin_times,
"start_time": str(times), "start_time": str(times),
"run_time":result.fields['totalTime'], "run_time":result.fields['totalTime'],
"report_details":HOST + "/report/fusion_http_report-{}.html".format(report_time) "report_details":HOST + "/report/fusion_report-{}.html".format(report_time)
} }
with open(yamlpath, 'w', encoding='utf-8') as f: with open(yamlpath, 'w', encoding='utf-8') as f:
yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True) yaml.dump(data, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)
......
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