3 次代碼提交 c0feb9688a ... 4e275adb77

作者 SHA1 備註 提交日期
  houyt 4e275adb77 add json document 6 年之前
  houyt 472ffbfede Merge branch 'master' of git.linkerplus.com:houyt/testing 6 年之前
  houyt 72dbdd8419 change 6 年之前
共有 3 個文件被更改,包括 1834 次插入1 次删除
  1. 1022 0
      apple.postman_collection_test.json
  2. 802 0
      apple.postman_environment_test.json
  3. 10 1
      test01.txt

文件差異過大導致無法顯示
+ 1022 - 0
apple.postman_collection_test.json


+ 802 - 0
apple.postman_environment_test.json

@@ -0,0 +1,802 @@
+{
+  "id": "591bb0e1-c914-d267-c5db-c5629c0adad4",
+  "name": "apple",
+  "values": [
+    {
+      "enabled": true,
+      "key": "url",
+      "value": "http://127.0.0.1:8000",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "access_token",
+      "value": "ceWJuW9QjdWqriiGcKB7xqU4gmooUx",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "phone_number",
+      "value": "18159801239",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "vip_id",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "area_id",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "car_code",
+      "value": "00000",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "interest_id1",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "interest_id2",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "cartype_id1",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "cartype_id2",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "vipmember_id",
+      "value": "149",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "valuecard_id",
+      "value": "120049",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "card_id",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "imurl",
+      "value": "linker-im.test.linkerplus.com",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "rongtoken",
+      "value": "ty9KnPkg56f5iAPJ3BhXPNaFaXr7OJ6JWyEq59XteCsz/Wd0JRNIVUmFrudbrSsdtGZDKFNVJ9A+Np8pAaVO5w==",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "area_id01",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "amount_package",
+      "value": "500.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "car_code02",
+      "value": "D88009",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "areashort02",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "phone_number02",
+      "value": "19159801111",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "vip_name02",
+      "value": "test宙斯",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "vipmember_id02",
+      "value": "104",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "real_payment",
+      "value": "480.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "amount_package02",
+      "value": "500.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "real_payment02",
+      "value": "480.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "car_number02",
+      "value": "C18033",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "recharge_id02",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_areashort",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_interest",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_cartype",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_phone_number",
+      "value": "19159801111",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_vip_name",
+      "value": "test宙斯",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_vipmember_id",
+      "value": "104",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_vipmember_number",
+      "value": "19159801111",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_amount_package",
+      "value": "500.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_real_payment",
+      "value": "480.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_recharge_id",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_card_id",
+      "value": "46",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_begin_date",
+      "value": "2018-06-29",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_card_number",
+      "value": "C18028",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_car_coder",
+      "value": "D88009",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_car_code",
+      "value": "D88009",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_amount_available",
+      "value": "8450.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "car_id",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "service_id",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "repairservice_id",
+      "value": "22",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_card_price",
+      "value": "199.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_userid",
+      "value": "91558",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_package_id",
+      "value": "30041",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_car_id",
+      "value": "124",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_service_id01",
+      "value": "30037",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_service_id02",
+      "value": "30036",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_service_id03",
+      "value": "34",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_packagecard_id",
+      "value": "undefined",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "variable_key",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_price01",
+      "value": "100.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_userid01",
+      "value": "121546",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_userid02",
+      "value": "121545",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_grade",
+      "value": "VIP会员",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_carproduct_name",
+      "value": "轮胎",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_storehouse_id01",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_storehouse_id02",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_shopid",
+      "value": "30039",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_department_id",
+      "value": "90038",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "parent_id",
+      "value": "null",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_department_id01",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_department_name01",
+      "value": "维修部",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_department_id02",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_department_name02",
+      "value": "外联部",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_department_headid",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_userid03",
+      "value": "121544",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_user_name01",
+      "value": "undefined",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_user_name02",
+      "value": "undefined",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_user_name03",
+      "value": "undefined",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_user_cellphone01",
+      "value": "17700004444",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_user_cellphnoe02",
+      "value": "17700003333",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_user_cellphone03",
+      "value": "17700009999",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_brands01",
+      "value": "30021",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "supplier_scope_id01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "supplier_scope_id02",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "supplier_scope_id03",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "supplier_category_id01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "supplier_id01",
+      "value": "30009",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_carproduct_id01",
+      "value": "30039",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "beauty_category_id01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "beauty_category_id02",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "beauty_category_id03",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_price02",
+      "value": "88.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_price03",
+      "value": "99.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_name01",
+      "value": "护理车身",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_name02",
+      "value": "一喷洗车",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_name03",
+      "value": "人工净化",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_repaircategory_id01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_repairecategory_id01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "repairservice_id01",
+      "value": "11",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "category_name01",
+      "value": "美容护理用品",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_category_name01",
+      "value": "检测/保养/换油",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "carlevel_id01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "repairservice_id02",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "test_category_name02",
+      "value": "电器电路维修",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "carcategory_id01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "carcategory_id01_id01",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "carcategory_id01_id01_id01",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "carcategory_id01_id01_id01_id01",
+      "value": "2280",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "carproduct_id01",
+      "value": "30039",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "name01",
+      "value": "轮胎",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "specification01",
+      "value": "LT002",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "code01",
+      "value": "PJ001",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "unit01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "unit_code01",
+      "value": "undefined",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "price01",
+      "value": "90.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "note01",
+      "value": "创建仓库中的配件内容",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "shop01",
+      "value": "30039",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "brands01",
+      "value": "30021",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "category01",
+      "value": "1",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "storehouse01",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "supplier01",
+      "value": "30009",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "carproduct_id02",
+      "value": "12",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "category_name02",
+      "value": "汽车精品饰品",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "name02",
+      "value": "座位垫",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "specification02",
+      "value": "大",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "code02",
+      "value": "zwd",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "unit02",
+      "value": "0",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "unit_code02",
+      "value": "undefined",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "price02",
+      "value": "70.00",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "shop02",
+      "value": "null",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "brands02",
+      "value": "3",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "category02",
+      "value": "2",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "storehouse02",
+      "value": "null",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "supplier02",
+      "value": "null",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "area_name",
+      "value": "京",
+      "type": "text"
+    },
+    {
+      "enabled": true,
+      "key": "area_name01",
+      "value": "京",
+      "type": "text"
+    }
+  ],
+  "timestamp": 1532346358319,
+  "_postman_variable_scope": "environment",
+  "_postman_exported_at": "2018-07-24T06:23:08.332Z",
+  "_postman_exported_using": "Postman/5.5.3"
+}

+ 10 - 1
test01.txt

@@ -1,6 +1,15 @@
 body 
+<<<<<<< HEAD
+p1 hhhhhh9
+
+p2 hhhhhg
+p2
+
+90
+=======
 p1 hhhhhhh
 
 p2 hhhhhg
 p2
-80
+80
+>>>>>>> c0feb9688a0d744a3b70ec4f6ce1eee2988e6720

部分文件因文件數量過多而無法顯示