更改文件配置

automated_main/view/api_automation/api_test_plan/extend/test_plan_thread.py

@@ -149,15 +149,15 @@ class TaskThread:
             if api_task.api_send_enterprise_wechat == 1:
                 ENV_PROFILE = os.getenv("ENV")
                 if ENV_PROFILE == "SERVER":
-                    result_host = 'http://qa.rd.com'
+                    result_host = 'http://172.16.0.82:8089'
                 elif ENV_PROFILE == "1":
                     result_host = 'http://localhost:8080'
                 api_task_result = result_host + "/#/api_test_plan_result?apiResultId=" + str(api_result_id)
-                # wx_url = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a6f1ce13-2d16-465d-b03e-791fae0f3562"
-                wx_url = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=5809fec4-ec3e-465a-9fd3-3f57831b11f6"
-                a = SendEnterpriseWechatMsg()
-                a.send_msg(wx_url, api_total_number, pass_result, api_successful_total_number, api_error_total_number,
-                           api_task_result)
+                wx_url = ""
+                # 发送企业微信
+                # a = SendEnterpriseWechatMsg()
+                # a.send_msg(wx_url, api_total_number, pass_result, api_successful_total_number, api_error_total_number,
+                #            api_task_result)
 
             elif api_task.api_send_enterprise_wechat == 2 or 0:
                 pass

automated_main/view/performance_test/performance_script/extend/new_performance_task_thread.py

@@ -48,13 +48,13 @@ class NewTaskThread:
 
         logger.info("性能脚本名称" + fn)
 
-        ENV_PROFILE = os.getenv("ENV")
-        if ENV_PROFILE == "SERVER":
-            jmeter = 'jmeter'
-        elif ENV_PROFILE == "1":
-            jmeter = 'jmeter'
-        else:
-            jmeter = 'jmeter'
+        # ENV_PROFILE = os.getenv("ENV")
+        # if ENV_PROFILE == "SERVER":
+        #     jmeter = 'jmeter'
+        # elif ENV_PROFILE == "1":
+        #     jmeter = 'jmeter'
+        # else:
+        #     jmeter = 'jmeter'
         jmx = create_para_jmx(performance_script_path, performance_script.performance_threads,
                               performance_script.performance_loop_count,
                               str(performance_script.performance_duration),
@@ -62,7 +62,7 @@ class NewTaskThread:
                               performance_script.performance_scheduler,
                               performance_script.loop_count_forever,
                               performance_script.data_set, performance_script.performance_data_script)
-        jmeter_script = jmeter + ' -n -t ' + jmx + ' -l ' + settings.JMETER_REPORT + '/' + fn + '/' + fn + '.jtl'
+        jmeter_script = 'jmeter -n -t ' + jmx + ' -l ' + settings.JMETER_REPORT + '/' + fn + '/' + fn + '.jtl'
         logger.info("性能脚本命令：" + jmeter_script)
         ENV_PROFILE = os.getenv("ENV")
         logger.info(ENV_PROFILE)
@@ -88,7 +88,6 @@ class NewTaskThread:
         logger.info(jmeter_aggregate_report)
         logger.info("***********")
 
-
         # 响应时间随时间变化曲线
         response_codes_per_second_report = 'java -jar ' + CMDRUNNER + ' --tool Reporter --generate-csv ' + response_codes_per_second_csv + ' --input-jtl ' + settings.JMETER_REPORT + "/" + fn + "/" + fn + ".jtl" + ' --plugin-type ResponseTimesOverTime'
 
@@ -142,15 +141,10 @@ class NewTaskThread:
                 run_function = lambda x, y: x if y in x else x + [y]
                 jtl_error = reduce(run_function, [[], ] + jtl_error_list)
 
-
         for jtl_error_data in jtl_error:
             PerformanceReportError.objects.create(performance_report_error_name=jtl_error_data['jtl_error'],
                                                   performance_report_id=performance_report.id)
 
-
-
-
-
         # # 解析jtl异常问题
         # df = pd.read_csv(settings.JMETER_REPORT + '/' + fn + '/' + fn + '.jtl')
         # jtl_error_list = []