diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 45473c1..5c96e94 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,11 +24,11 @@
-
+
-
-
+
+
@@ -39,43 +39,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -84,53 +62,41 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
@@ -185,12 +151,12 @@
-
-
-
+
+
+
@@ -244,6 +210,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -253,7 +247,7 @@
-
+
@@ -579,18 +573,18 @@
-
-
+
+
@@ -777,13 +771,6 @@
-
-
-
-
-
-
-
@@ -819,13 +806,6 @@
-
-
-
-
-
-
-
@@ -844,7 +824,6 @@
-
@@ -852,17 +831,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -870,7 +838,6 @@
-
@@ -878,7 +845,6 @@
-
@@ -894,7 +860,6 @@
-
@@ -902,9 +867,6 @@
-
-
-
@@ -912,7 +874,6 @@
-
@@ -920,7 +881,6 @@
-
@@ -928,7 +888,6 @@
-
@@ -936,9 +895,6 @@
-
-
-
@@ -946,40 +902,44 @@
-
-
+
-
-
-
-
-
+
+
+
-
+
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -987,15 +947,15 @@
-
+
-
-
+
+
@@ -1005,5 +965,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/COMMON/__pycache__/http_param.cpython-34.pyc b/COMMON/__pycache__/http_param.cpython-34.pyc
index 163797f..07bd125 100644
Binary files a/COMMON/__pycache__/http_param.cpython-34.pyc and b/COMMON/__pycache__/http_param.cpython-34.pyc differ
diff --git a/COMMON/http_param.py b/COMMON/http_param.py
index 144a716..7722077 100644
--- a/COMMON/http_param.py
+++ b/COMMON/http_param.py
@@ -17,7 +17,6 @@ def str_get_param(self, dict_param, param):
result = "?"
if dict_param["must"] == "1": # 如果参数是必填
result += dict_param["name"] + "=" + dict_param["value"] + "&"
- # result += dict_param["name"] + "=" + str(self.str_to(dict_param["type"], dict_param["value"])) + "&"
return self.str_sub(0, len(result)-1, result) + "&" + self.for_dict(param)
# 合并dict
def for_dict(self, d):
diff --git a/DAL/__pycache__/Dhttpbase.cpython-34.pyc b/DAL/__pycache__/Dhttpbase.cpython-34.pyc
index a764246..0c1b1c0 100644
Binary files a/DAL/__pycache__/Dhttpbase.cpython-34.pyc and b/DAL/__pycache__/Dhttpbase.cpython-34.pyc differ
diff --git a/README.md b/README.md
index cf07c0d..ff4d97e 100644
--- a/README.md
+++ b/README.md
@@ -1,143 +1,27 @@
-#python3ʵֵhttpӿԶ
+#Ŀ
+python3ԶӿڲԿ
-##
+#
* Win7 64python 3Pycharm. unittest
-* ȡļ--ȡ--ִв--¼Խ--htmlļ
+* xml
+* ʼͲԽ
-##ܼ
-* ֳ֧HTTPеpostget
-* excelעĵطΪÿԶ麯ΪΪxml
-* Ҫãвȫ
-* Խhtmlļ鿴
-
-
-##ģ˵
-* Httpbase.py ȡhttpͶ˿
-* Config.py httpķװ,ֶ֧Эչget,post
+# ÷
* Runner_m.py Ĵ롣run_casedz
-* Htmlreport.py htmlļ
-
-
-##Ҫʷ
-
-###2015-8-3 ʷ
-* ԶӿڲԿ
-* pyh(ɽhtmlļ), config.iniϢ excel
-
-``` ļ
-Case_config.ini
-[DEFAULT]
-index = [1001,1002] вid
-host = 192.168.1.249
-port = 10003
-```
-
-
-
-###2016-1-5 ־
-* ʹrequestsģ飬Զչget,post,put,delete,head,optionsȷͬʱ֧ϴͼƬ
-* excelʹhtmlxmlӿļpython.
-
-###2016-1-8 ־
-* ָ֧Խӿڲid
-
-###2016-1-9 ־
-* ŻhtmlxmlӿڣֻҪӿ֣Զ庯Ϳ
-
-
-###2016-1-12 ־
-* ȥԶʡ룬ֻڽӿxmlָԤڽͿ
-
-###2016-1-23 ־
-* Ԥڽżɹbug
-* Ҫ½idtokenʹýӿ
-
-###2016-3-22 ־
-* Ż˼㡣ʵʽǶײ㣬ֻҪʵʽǶײĵһ:data[{"a":b},{"a":"c"}].ֻҪ{"a":"b"}
- * һͶ㣨Ƕײ㣬ֻǼkeyǷڣ
- * Ҫõlist setķʽ
-* htmlӿ
-
-* οhttps://github.com/284772894/SaveXML
-
-### 2016-7-21
-
-* Ż
-* Ҫ˶Աȹ,һԱcode״̬ڶȫֶζԱȣ֮ǰ븴
-
-```
-def compare(exJson,factJson):
- if factJson["appStatus"]["errorCode"] == 0:
- return exJson==factJson
- else:
- print("ӿʧ")
- return False
-```
-
-
-### 2016-7-30 ־
-* ĶԱȹǶײ㣬ҳԱȵһcode,ȻԱǶײvalueǶײȫֶƥ
+* xml
```
-def compare(exJson,factJson,isList=0):
- isFlag = True
- if exJson.get("appStatus") == factJson.get("appStatus"):
- if isList== False: # ûǶײ
- return isFlag
- data2 = exJson.get("content")
- data3 = factJson.get("content")
- for item2 in data2:
- for item3 in data3:
- keys2 = item2.keys()
- keys3 = item3.keys()
- if keys2 == keys3: # Ƕײkeyȫ
- for key in keys2:
- value2 = item2.get(key)
- value3 = item3.get(key)
- if type(value3)==type(value2):# ԱǶײvaluetypeֵ
- pass
- else:
- isFlag = False
- break
- else:
- isFlag = False
- break
- else:
- isFlag = False
- print(isFlag)
- return isFlag
-```
-
-### 2016-8-22 ־
-
-* Աÿexcelʾʽ
-
-
-
-
-
-### 2016-8-23 ־
-
-* ԱԷʼķʽ֪ͨ
-
-### 2016-9-7
-* ܹعϵͳ
-
-### 2016-9-8
-* ӿڲչ
- * Ƿ
- * ֵǷȷ
-
-### 2016-9-9
-* ʵּǷ
-* ֵǷȷ
-* http_codeֵϲʵʽ
-
-```
-
- account # type=strʾַ
- 18576759587
- 1 # 1ʾ0DZ
+
+ ӿڲ
+ ddd.XX.com
+ 80
+ [1001] #
+ {"Accept":"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8","User-Agent":"Mozilla/5.0 (Windows NT 6.1; rv:29.0) Gecko/20100101 Firefox/29.0"}
+
+
+ account
+ 1361212121
+ 1
password
@@ -149,6 +33,52 @@ def compare(exJson,factJson,isList=0):
0
1
+ 0
+ 1001
+ ½
+ POST
+ Login
+ {"appStatus":{"errorCode":0,"message":"...
+ user_id # ½ҪصϢӿڵãuserid,token
+ 0
+
+
+
+ lookerId
+ 2
+ 1
+
+ 1002
+ ҳ
+ GET
+ GetPersonalHomePage1
+ {"appStatus":{"errorCode":0,"message":"ɹ"},"content":[{"business_name":"","notice_img":"\/product\/20160718184134_321.jpg","user_type":1,"user_id":2,"goods":[{"good_price":45211.0,"good_id":12,"good_name":"ŷ","banner_picture1":"\/product\/20160719165135_8977.png"},{"good_price":199.0,"good_id":14,"good_name":"1","banner_picture1":"\/product\/20160720102028_5352.jpg"},{"good_price":452.0,"good_id":6,"good_name":"ʵƷ","banner_picture1":"\/product\/20160718165448_2602.png"},{"good_price":99898.0,"good_id":11,"good_name":"Խâ","banner_picture1":"\/product\/20160720100057_5877.jpg"}],"shop_img":"\/product\/20160718120144_3196.jpg","head_picture":"http:\/\/dgm.boweixin.com\/\/product\/20160718134528_4744.jpg","notice_id":1}]}
+ 1 # Ҫ½IJ
+ 1 # Ƕײ
+
+
+
+
+ע,ֵ֤ͻ߷DZԤֵע仯
+
+ account # type=strʾַ
+ 18576759587
+ 1 # 1ʾ0DZ
+
+
```
+## ڼ
+
+Ƕײ㡣ǣһcode,ڶlistkeyǷȣlistvalueֵtypeǷ
+
+# ʹñ
+
+
+
+
+
+#
+* Ϣ鿴ҵ[־](channel_log.md)
+* ֮ǰд[ӿ](https://github.com/284772894/SaveXML)xml
diff --git a/channel_log.md b/channel_log.md
new file mode 100644
index 0000000..cf07c0d
--- /dev/null
+++ b/channel_log.md
@@ -0,0 +1,154 @@
+#python3ʵֵhttpӿԶ
+
+##
+* Win7 64python 3Pycharm. unittest
+* ȡļ--ȡ--ִв--¼Խ--htmlļ
+
+##ܼ
+* ֳ֧HTTPеpostget
+* excelעĵطΪÿԶ麯ΪΪxml
+* Ҫãвȫ
+* Խhtmlļ鿴
+
+
+##ģ˵
+* Httpbase.py ȡhttpͶ˿
+* Config.py httpķװ,ֶ֧Эչget,post
+* Runner_m.py Ĵ롣run_casedz
+* Htmlreport.py htmlļ
+
+
+##Ҫʷ
+
+###2015-8-3 ʷ
+* ԶӿڲԿ
+* pyh(ɽhtmlļ), config.iniϢ excel
+
+``` ļ
+Case_config.ini
+[DEFAULT]
+index = [1001,1002] вid
+host = 192.168.1.249
+port = 10003
+```
+
+
+
+###2016-1-5 ־
+* ʹrequestsģ飬Զչget,post,put,delete,head,optionsȷͬʱ֧ϴͼƬ
+* excelʹhtmlxmlӿļpython.
+
+###2016-1-8 ־
+* ָ֧Խӿڲid
+
+###2016-1-9 ־
+* ŻhtmlxmlӿڣֻҪӿ֣Զ庯Ϳ
+
+
+###2016-1-12 ־
+* ȥԶʡ룬ֻڽӿxmlָԤڽͿ
+
+###2016-1-23 ־
+* Ԥڽżɹbug
+* Ҫ½idtokenʹýӿ
+
+###2016-3-22 ־
+* Ż˼㡣ʵʽǶײ㣬ֻҪʵʽǶײĵһ:data[{"a":b},{"a":"c"}].ֻҪ{"a":"b"}
+ * һͶ㣨Ƕײ㣬ֻǼkeyǷڣ
+ * Ҫõlist setķʽ
+* htmlӿ
+
+* οhttps://github.com/284772894/SaveXML
+
+### 2016-7-21
+
+* Ż
+* Ҫ˶Աȹ,һԱcode״̬ڶȫֶζԱȣ֮ǰ븴
+
+```
+def compare(exJson,factJson):
+ if factJson["appStatus"]["errorCode"] == 0:
+ return exJson==factJson
+ else:
+ print("ӿʧ")
+ return False
+```
+
+
+### 2016-7-30 ־
+* ĶԱȹǶײ㣬ҳԱȵһcode,ȻԱǶײvalueǶײȫֶƥ
+
+```
+def compare(exJson,factJson,isList=0):
+ isFlag = True
+ if exJson.get("appStatus") == factJson.get("appStatus"):
+ if isList== False: # ûǶײ
+ return isFlag
+ data2 = exJson.get("content")
+ data3 = factJson.get("content")
+ for item2 in data2:
+ for item3 in data3:
+ keys2 = item2.keys()
+ keys3 = item3.keys()
+ if keys2 == keys3: # Ƕײkeyȫ
+ for key in keys2:
+ value2 = item2.get(key)
+ value3 = item3.get(key)
+ if type(value3)==type(value2):# ԱǶײvaluetypeֵ
+ pass
+ else:
+ isFlag = False
+ break
+ else:
+ isFlag = False
+ break
+ else:
+ isFlag = False
+ print(isFlag)
+ return isFlag
+```
+
+### 2016-8-22 ־
+
+* Աÿexcelʾʽ
+
+
+
+
+
+### 2016-8-23 ־
+
+* ԱԷʼķʽ֪ͨ
+
+### 2016-9-7
+* ܹعϵͳ
+
+### 2016-9-8
+* ӿڲչ
+ * Ƿ
+ * ֵǷȷ
+
+### 2016-9-9
+* ʵּǷ
+* ֵǷȷ
+* http_codeֵϲʵʽ
+
+```
+
+ account # type=strʾַ
+ 18576759587
+ 1 # 1ʾ0DZ
+
+
+ password
+ 222222
+ 1
+
+
+ type
+ 0
+ 1
+
+```
+
+
diff --git a/report.xlsx b/report.xlsx
index 3bcf389..1342aa4 100644
Binary files a/report.xlsx and b/report.xlsx differ
diff --git a/test4.xml b/test4.xml
index e8d6538..758f49e 100644
--- a/test4.xml
+++ b/test4.xml
@@ -3,7 +3,7 @@
导购码接口测试
dgm.boweixin.com
80
- [1001]
+ [1001,1002]
{"Accept":"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8","User-Agent":"Mozilla/5.0 (Windows NT 6.1; rv:29.0) Gecko/20100101 Firefox/29.0"}
@@ -39,7 +39,7 @@
1002
个人主页
GET
- GetPersonalHomePage1
+ GetPersonalHomePage
{"appStatus":{"errorCode":0,"message":"操作成功"},"content":[{"business_name":"坤达点子","notice_img":"\/product\/20160718184134_321.jpg","user_type":1,"user_id":2,"goods":[{"good_price":45211.0,"good_id":12,"good_name":"艾欧","banner_picture1":"\/product\/20160719165135_8977.png"},{"good_price":199.0,"good_id":14,"good_name":"麒麟瓜1","banner_picture1":"\/product\/20160720102028_5352.jpg"},{"good_price":452.0,"good_id":6,"good_name":"实力产品","banner_picture1":"\/product\/20160718165448_2602.png"},{"good_price":99898.0,"good_id":11,"good_name":"越南芒果","banner_picture1":"\/product\/20160720100057_5877.jpg"}],"shop_img":"\/product\/20160718120144_3196.jpg","head_picture":"http:\/\/dgm.boweixin.com\/\/product\/20160718134528_4744.jpg","notice_id":1}]}
1
1