From 5f2ca39a793eca15033bc01b529092a3fa489145 Mon Sep 17 00:00:00 2001 From: ieemoo Date: Tue, 12 Nov 2024 15:34:02 +0800 Subject: [PATCH] Arthur-Wu committed this file on 2021-09-10 15:45:30. --- YiMao/config/{ApiInfo.py => ApiInfo_web.py} | 0 ....xlsx => YMHT_ApiTestCase_0.0.1Debug.xlsx} | Bin .../scripts/test_01MarketSystemParameters.py | 2 +- YiMao/scripts/test_02StoreMangementModule.py | 2 +- .../test_03SampleDistributionActivity.py | 2 +- YiMao/scripts/test_04LotteryDraw.py | 2 +- YiMao/scripts/test_05CouponPromotion.py | 2 +- YiMao/scripts/test_06ADManagement.py | 2 +- YiMao/scripts/test_07VersionManagement.py | 2 +- YiMao/scripts/test_08UpgradeTask.py | 2 +- commons/Common.py | 19 +++++++++++++++--- 11 files changed, 24 insertions(+), 11 deletions(-) rename YiMao/config/{ApiInfo.py => ApiInfo_web.py} (100%) rename YiMao/data/{YMHT_ApiTestCase_0.02.xlsx => YMHT_ApiTestCase_0.0.1Debug.xlsx} (100%) diff --git a/YiMao/config/ApiInfo.py b/YiMao/config/ApiInfo_web.py similarity index 100% rename from YiMao/config/ApiInfo.py rename to YiMao/config/ApiInfo_web.py diff --git a/YiMao/data/YMHT_ApiTestCase_0.02.xlsx b/YiMao/data/YMHT_ApiTestCase_0.0.1Debug.xlsx similarity index 100% rename from YiMao/data/YMHT_ApiTestCase_0.02.xlsx rename to YiMao/data/YMHT_ApiTestCase_0.0.1Debug.xlsx diff --git a/YiMao/scripts/test_01MarketSystemParameters.py b/YiMao/scripts/test_01MarketSystemParameters.py index de412dc..0fe09ea 100644 --- a/YiMao/scripts/test_01MarketSystemParameters.py +++ b/YiMao/scripts/test_01MarketSystemParameters.py @@ -3,7 +3,7 @@ import unittest,allure,ddt,time,json,requests from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel from commons.AssertLib import _assert_result ExlFilePath = GlobalPath['YMDataPath'] + '/YMHT_ApiTestCase_0.0.1.xlsx' diff --git a/YiMao/scripts/test_02StoreMangementModule.py b/YiMao/scripts/test_02StoreMangementModule.py index 6a356fa..c6f7126 100644 --- a/YiMao/scripts/test_02StoreMangementModule.py +++ b/YiMao/scripts/test_02StoreMangementModule.py @@ -3,7 +3,7 @@ import unittest,allure,ddt,time,json,requests from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel,Txt from commons.AssertLib import _assert_result ExlFilePath = GlobalPath['YMDataPath'] + '/YMHT_ApiTestCase_0.0.1.xlsx' diff --git a/YiMao/scripts/test_03SampleDistributionActivity.py b/YiMao/scripts/test_03SampleDistributionActivity.py index 60b0756..094370c 100644 --- a/YiMao/scripts/test_03SampleDistributionActivity.py +++ b/YiMao/scripts/test_03SampleDistributionActivity.py @@ -4,7 +4,7 @@ import unittest,allure,ddt,time,json,requests,datetime from datetime import datetime,timedelta from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel,Txt from commons.PgSqlLib import PGSQL from commons.AssertLib import _assert_result diff --git a/YiMao/scripts/test_04LotteryDraw.py b/YiMao/scripts/test_04LotteryDraw.py index 39f59ae..3431892 100644 --- a/YiMao/scripts/test_04LotteryDraw.py +++ b/YiMao/scripts/test_04LotteryDraw.py @@ -3,7 +3,7 @@ import unittest,allure,ddt,json,requests from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel,Txt from commons.AssertLib import _assert_result ExlFilePath = GlobalPath['YMDataPath'] + '/YMHT_ApiTestCase_0.0.1.xlsx' diff --git a/YiMao/scripts/test_05CouponPromotion.py b/YiMao/scripts/test_05CouponPromotion.py index 8fbdb81..353e2d7 100644 --- a/YiMao/scripts/test_05CouponPromotion.py +++ b/YiMao/scripts/test_05CouponPromotion.py @@ -4,7 +4,7 @@ import unittest,allure,ddt,time,json,requests,datetime from datetime import datetime,timedelta from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel,Txt from commons.PgSqlLib import PGSQL from commons.AssertLib import _assert_result diff --git a/YiMao/scripts/test_06ADManagement.py b/YiMao/scripts/test_06ADManagement.py index d512c34..1e9a9fc 100644 --- a/YiMao/scripts/test_06ADManagement.py +++ b/YiMao/scripts/test_06ADManagement.py @@ -4,7 +4,7 @@ import unittest,allure,ddt,time,json,requests,datetime from datetime import datetime,timedelta from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel,Txt from commons.AssertLib import _assert_result ExlFilePath = GlobalPath['YMDataPath'] + '/YMHT_ApiTestCase_0.0.1.xlsx' diff --git a/YiMao/scripts/test_07VersionManagement.py b/YiMao/scripts/test_07VersionManagement.py index 776aa68..b77cca3 100644 --- a/YiMao/scripts/test_07VersionManagement.py +++ b/YiMao/scripts/test_07VersionManagement.py @@ -4,7 +4,7 @@ import unittest,allure,ddt,time,json,requests,datetime from datetime import datetime,timedelta from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel,Txt from commons.AssertLib import _assert_result ExlFilePath = GlobalPath['YMDataPath'] + '/YMHT_ApiTestCase_0.0.1.xlsx' diff --git a/YiMao/scripts/test_08UpgradeTask.py b/YiMao/scripts/test_08UpgradeTask.py index c4558e1..2f91672 100644 --- a/YiMao/scripts/test_08UpgradeTask.py +++ b/YiMao/scripts/test_08UpgradeTask.py @@ -4,7 +4,7 @@ import unittest,allure,ddt,time,json,requests,datetime from datetime import datetime,timedelta from configs.globalObj import LOGGER from configs.globalParams import * -from YiMao.config.ApiInfo import * +from YiMao.config.ApiInfo_web import * from commons.FileHandler import ReadExcel,Txt from commons.AssertLib import _assert_result # ExlFilePath = GlobalPath['YMDataPath'] + '/YMHT_ApiTestCase_0.0.1.xlsx' diff --git a/commons/Common.py b/commons/Common.py index eb7abf5..4edee42 100644 --- a/commons/Common.py +++ b/commons/Common.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import os,sys,random,string -import time, datetime +import time,datetime,random,os,sys,string class Common(): @@ -24,4 +23,18 @@ class Common(): if file_name.endswith('.txt'): file_path = os.path.join(root, file_name) os.remove(file_path) - print(f"已删除: {file_path}") \ No newline at end of file + print(f"已删除: {file_path}") + + def return_sission_id(self): + def generate_24_digit_random_integer(): + timestamp = int(time.time() * 1000) + random_number = random.randint(0, 99999999999999) + combined_number = str(timestamp) + str(random_number) + if len(combined_number) >= 24: + return int(combined_number[:24]) + else: + combined_number = combined_number.ljust(24, '0') + return int(combined_number) + random_integer = generate_24_digit_random_integer() + return random_integer +