更新readme

175930106
1 parent 035004b8
Showing 17 changed files with 49 additions and 4 deletions
.settings/org.eclipse.core.resources.prefs
README.md
commons/__pycache__/ConfigDB.cpython-36.pyc
commons/__pycache__/Faker.cpython-36.pyc
commons/__pycache__/Logging.cpython-36.pyc
commons/__pycache__/MySession.cpython-36.pyc
commons/__pycache__/SendEmail.cpython-36.pyc
commons/__pycache__/__init__.cpython-36.pyc
commons/__pycache__/clientSession.cpython-36.pyc
commons/__pycache__/common.cpython-36.pyc
commons/__pycache__/readConf.cpython-36.pyc
commons/api/__pycache__/__init__.cpython-36.pyc
commons/api/__pycache__/upStream.cpython-36.pyc
commons/common.py
commons/readConf.py
config/marketConfig/test_config_hg2.conf
testcase/upStream/test_upStream.py
+eclipse.preferences.version=1
+encoding//commons/readConf.py=utf-8
@@ -6,4 +6,4 @@ git git
  
 0629
  
-测试测试
 \ No newline at end of file
+测试测试111
 \ No newline at end of file
@@ -51,6 +51,28 @@ def get_api_config(api,section,key):
         log.error("File Not Exist :<%r> "%str(api_config_path))
         raise Exception("File Not Exist :<%r> "%str(api_config_path))
  
+def get_market_config(api,section,key):
+    "object file is *src/config/marketConfig/*.conf"
+    current_path=os.path.dirname(__file__)
+    src_path=os.path.dirname(current_path)
+    api_path=src_path+"/config/marketConfig/"
+    api_config_path=api_path+api+".conf"
+    #验证文件是否存在
+    file_path = os.path.exists(api_config_path)
+    if file_path:
+    #获取文件的数据
+        if isinstance(key,int):
+                log.error("key of section cannot be int Type :<%r> "%str(key))
+                raise Exception("key of section cannot be int Type :<%r> "%str(key))
+        else:
+            config = configparser.ConfigParser()
+            config.read(api_config_path,encoding="utf-8")       
+            return config.get(section, key)
+    else:
+        log.error("File Not Exist :<%r> "%str(api_config_path))
+        raise Exception("File Not Exist :<%r> "%str(api_config_path))
+
+
  
 def run_one(name):
     test_suite = unittest.TestSuite()
@@ -89,3 +111,5 @@ def run_Name(name):
     print("运行用例为{}".format(test_cases))
     runner = unittest.TextTestRunner()
     runner.run(test_cases)
+
+# print(get_market_config("test_config_hg2","loginInfo","userName"))
 \ No newline at end of file
@@ -23,9 +23,9 @@ class readConfig(object):
         if self.evn_name == 'nt':
             self.relative_path = r'/config/marketConfig/'
             # # 本地调试路径
-            # self.file_path = os.path.abspath(os.path.join(os.getcwd(), "../..")) + self.relative_path+self.file_name
+            self.file_path = os.path.abspath(os.path.join(os.getcwd(), "../..")) + self.relative_path+self.file_name
             # 本地main方法执行路径
-            self.file_path = os.path.abspath(os.path.join(os.getcwd(), "../")) + self.relative_path + self.file_name
+#             self.file_path = os.path.abspath(os.path.join(os.getcwd(), "../")) + self.relative_path + self.file_name
         elif self.evn_name == 'posix':
             self.relative_path = r'/config/marketConfig/'
             self.file_path = os.path.abspath(os.path.join(os.getcwd())) + self.relative_path + self.file_name
+#沈阳市场信息
+[loginInfo]
+userName=scgy
+password=DYdgRcAyx2bPboAmu0tgIYBM1kMxFAuDty7IQk4162Zh+8KKa8jtu6xIjG9W4yauTfPiuP1sqxDatskXFqCOz76ea14AqRCYEBz53xVr+vLfcz9zOB2d1T3aIlJbEk8yi2c21pd/MFkBw+Fhd0tky/6eN8kJA8mtsj3uDwSb9qo=
+
+[testInfo]
+#已添加的身份证号
+cCNum=11010119990307865X
+cCNumB=110101199903077593
+#入库未开卡的卡号
+cardNum=210607113166
+#已开卡的卡号
+cardNumRe=888800001207
+#密码设置
+loginPwd=111111
+
+[host]
+cardHost=http://test.card.diligrp.com:8386
+uapHost=http://test.uap.diligrp.com
+gatewayHost=http://test.gateway.diligrp.com:8285
 \ No newline at end of file
@@ -6,7 +6,6 @@ from commons.MySession import my
 from commons.api.upStream import upStream
 from commons import common as com
 from commons import common
-from commons import Faker
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 uu=upStream()