Arthur-Wu committed this file on 2021-09-10 15:45:30.

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'

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'

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

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'

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

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'

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'

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'

commons/Common.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-import os,sys,random,string
+import time,datetime,random,os,sys,string
-import time, datetime
 
 
 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}")
+                    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
+