bianxinhua / task_api · 提交

转到一个项目

作者 bianxinhua
提交 fa8ccd6b726deeab01ccd9abba456ff383a6ccc3 1 个父辈 1103ed11

add README

内嵌 并排对比
正在显示 45 个修改的文件 包含 583 行增加 和 129 行删除
@@ -3,7 +3,7 @@ pfphone=19990000011 @@ -3,7 +3,7 @@ pfphone=19990000011
3 pfphone1=19990000015 3 pfphone1=19990000015
4 ckotherdeptphone=19990000012 4 ckotherdeptphone=19990000012
5 pfphone2=18100000005 5 pfphone2=18100000005
6 -appphone=19990000000 6 +appphone=19990000015
7 password=123456 7 password=123456
8 base_url=https://ability-test.fjmaimaimai.com 8 base_url=https://ability-test.fjmaimaimai.com
9 base_public_url = http://public-interface-test.fjmaimaimai.com/ 9 base_public_url = http://public-interface-test.fjmaimaimai.com/
@@ -2,7 +2,7 @@ name: 发布任务 @@ -2,7 +2,7 @@ name: 发布任务
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
5 - id: ${get_task_id()} 5 + id: ${get_appoint_task_id()}
6 msg: ok 6 msg: ok
7 request: 7 request:
8 headers: 8 headers:
  1 +name: 保存指派任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + name: 测试指派任务名称${get_nowtime()}
  6 + acceptanceCriteria: 测试指派任务的验收标准${get_nowtime()}
  7 + description: 测试指派任务的任务描述${get_nowtime()}
  8 + planTime: ${get_today()}
  9 + msg: ok
  10 +teardown_hooks:
  11 + - ${teardown_hook_get_appoint_task_id($response)}
  12 +request:
  13 + headers:
  14 + Content-Type: application/json; charset=UTF-8
  15 + Authorization: Bearer ${get_task_Authorization()}
  16 + Origin: https://value-test.fjmaimaimai.com
  17 + Referer: https://value-test.fjmaimaimai.com/
  18 + User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
  19 + X-Requested-With: XMLHttpRequest
  20 + json:
  21 + appointTo: 3245096039079680
  22 + planTime: $planTime
  23 + name: $name
  24 + resourceType: 1
  25 + resourceList:
  26 + - id: ${get_resource_id()}
  27 + title: ${get_resource_title()}
  28 + content: ${get_resource_content()}
  29 + serial: ${get_serialNo()}
  30 + customerValue:
  31 + - 31
  32 + taskCharacter: 12
  33 + reward: 2000
  34 + acceptanceCriteria: $acceptanceCriteria
  35 + description: $description
  36 + taskBelong: 13
  37 +# pictures:
  38 + method: POST
  39 + url: task/appoint/update
  40 +validate:
  41 + - eq:
  42 + - content.code
  43 + - 0
  44 + - eq:
  45 + - content.msg
  46 + - $msg
  1 +name: 发布任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + id: ${get_bid_task_id()}
  6 + msg: ok
  7 +request:
  8 + headers:
  9 + Content-Type: application/json; charset=UTF-8
  10 + Authorization: Bearer ${get_task_Authorization()}
  11 + Origin: https://value-test.fjmaimaimai.com
  12 + Referer: https://value-test.fjmaimaimai.com/
  13 + User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
  14 + X-Requested-With: XMLHttpRequest
  15 + json:
  16 + id: $id
  17 + method: POST
  18 + url: task/open
  19 +validate:
  20 + - eq:
  21 + - content.code
  22 + - 0
  23 + - eq:
  24 + - content.msg
  25 + - $msg
  1 +name: 保存竞标任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + name: 测试竞标任务名称${get_nowtime()}
  6 + acceptanceCriteria: 测试竞标任务的验收标准${get_nowtime()}
  7 + description: 测试竞标任务的任务描述${get_nowtime()}
  8 + bidStartTime: ${get_today()}
  9 + bidEndTime: ${get_tomorrow()}
  10 + msg: ok
  11 +teardown_hooks:
  12 + - ${teardown_hook_get_bid_task_id($response)}
  13 +request:
  14 + headers:
  15 + Content-Type: application/json; charset=UTF-8
  16 + Authorization: Bearer ${get_task_Authorization()}
  17 + Origin: https://value-test.fjmaimaimai.com
  18 + Referer: https://value-test.fjmaimaimai.com/
  19 + User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
  20 + X-Requested-With: XMLHttpRequest
  21 + json:
  22 + bidStartTime: $bidStartTime
  23 + bidEndTime: $bidEndTime
  24 + name: $name
  25 + resourceType: 1
  26 + resourceList:
  27 + - id: ${get_resource_id()}
  28 + title: ${get_resource_title()}
  29 + content: ${get_resource_content()}
  30 + serial: ${get_serialNo()}
  31 + customerValue:
  32 + - 31
  33 + taskCharacter: 12
  34 + reward: 2000
  35 + acceptanceCriteria: $acceptanceCriteria
  36 + description: $description
  37 + isImportant: true
  38 + taskBelong: 13
  39 + isRemind: true
  40 +# pictures:
  41 + method: POST
  42 + url: task/bid/update
  43 +validate:
  44 + - eq:
  45 + - content.code
  46 + - 0
  47 + - eq:
  48 + - content.msg
  49 + - $msg
  1 +name: 公司任务（抢单任务）
  2 +base_url: ${ENV(base_url)}
  3 +verify: False
  4 +variables:
  5 + currtime: ${make_time()}
  6 + uuid: ${make_uuid()}
  7 + access_token: ${get_task_accesstoken()}
  8 + sign: ${make_sign($currtime, $uuid, $access_token)}
  9 +request:
  10 + headers:
  11 + Content-Type: application/json;charset=utf-8
  12 + User-Agent: okhttp/3.12.3
  13 + X-MMM-AccessToken: $access_token
  14 + X-MMM-AppName: com.mmm.ability
  15 + X-MMM-AppProject: ability
  16 + X-MMM-DeviceType: '0'
  17 + X-MMM-Sign: $sign
  18 + X-MMM-Timestamp: $currtime
  19 + X-MMM-Uuid: $uuid
  20 + X-MMM-Version: 1.0.0
  21 + json:
  22 + action: 0
  23 + newest: 1
  24 + pageIndex: 0
  25 + pageSize: 20
  26 + method: POST
  27 + url: v1/task/contendTasks
  28 +validate:
  29 + - eq:
  30 + - content.code
  31 + - 0
  32 + - eq:
  33 + - content.msg
  34 + - 获取成功
  35 +# - $msg
@@ -2,8 +2,8 @@ name: 抢单任务详情 @@ -2,8 +2,8 @@ name: 抢单任务详情
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
5 - id: ${get_task_id()}  
6 - status: ${get_task_status_from_database()} 5 + id: ${get_loot_task_id()}
  6 +# status: ${get_task_status_1_from_database()}
7 msg: ok 7 msg: ok
8 request: 8 request:
9 headers: 9 headers:
  1 +name: 发布任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + id: ${get_loot_task_id()}
  6 + msg: ok
  7 +request:
  8 + headers:
  9 + Content-Type: application/json; charset=UTF-8
  10 + Authorization: Bearer ${get_task_Authorization()}
  11 + Origin: https://value-test.fjmaimaimai.com
  12 + Referer: https://value-test.fjmaimaimai.com/
  13 + User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
  14 + X-Requested-With: XMLHttpRequest
  15 + json:
  16 + id: $id
  17 + method: POST
  18 + url: task/open
  19 +validate:
  20 + - eq:
  21 + - content.code
  22 + - 0
  23 + - eq:
  24 + - content.msg
  25 + - $msg
  1 +name: 保存抢单任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + name: 测试抢单任务名称${get_nowtime()}
  6 + acceptanceCriteria: 测试抢单任务的验收标准${get_nowtime()}
  7 + description: 测试抢单任务的任务描述${get_nowtime()}
  8 + msg: ok
  9 +teardown_hooks:
  10 + - ${teardown_hook_get_loot_task_id($response)}
  11 +request:
  12 + headers:
  13 + Content-Type: application/json; charset=UTF-8
  14 + Authorization: Bearer ${get_task_Authorization()}
  15 + Origin: https://value-test.fjmaimaimai.com
  16 + Referer: https://value-test.fjmaimaimai.com/
  17 + User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
  18 + X-Requested-With: XMLHttpRequest
  19 + json:
  20 + name: $name
  21 + resourceType: 1
  22 + resourceList:
  23 + - id: ${get_resource_id()}
  24 + title: ${get_resource_title()}
  25 + content: ${get_resource_content()}
  26 + serial: ${get_serialNo()}
  27 + customerValue:
  28 + - 31
  29 + taskCharacter: 12
  30 + reward: 2000
  31 + acceptanceCriteria: $acceptanceCriteria
  32 + description: $description
  33 + isImportant: false
  34 + taskBelong: 13
  35 +# pictures:
  36 + method: POST
  37 + url: task/loot/update
  38 +validate:
  39 + - eq:
  40 + - content.code
  41 + - 0
  42 + - eq:
  43 + - content.msg
  44 + - $msg
1 -name: 保存任务 1 +name: 保存抢单任务
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTgzMzc4NzAsImV4cCI6MTU5ODM0ODY3MCwibmJmIjoxNTk4MzM3ODcwLCJqdGkiOiJPc1FMQUd6QmdxNUFiNDBhIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.nu8EwnYA9PwYHVBzuB6OfnacLD-V3LeyDLiPoeqIo54  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTg4NjQ3NjUsImV4cCI6MTU5ODg3NTU2NSwibmJmIjoxNTk4ODY0NzY1LCJqdGkiOiJFUG5pQzQ5dVZrVTg3WHd5Iiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.7GZs8bIO-RlDcJTkZr8AZd-6VLS_ptsTULi3RL8hTCE
1 -C54raNPNzRzKT77XDBxkCeJTZpGBCPHQ  
  1 +4YMeKJiyKxEffaNd8JYB8RSkrFhj3irY
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTgzMzc4NzEsImV4cCI6MTU5ODM0ODY3MSwibmJmIjoxNTk4MzM3ODcxLCJqdGkiOiJRTDRiZFJ5T25EZ0xpOVdhIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.x0itN9vEYO6wPFXxf3OyV_Etljtry3OwWktlpAyZr80  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTg4NjQ3NjUsImV4cCI6MTU5ODg3NTU2NSwibmJmIjoxNTk4ODY0NzY1LCJqdGkiOiI1NVZqcTYxWUZsOWNhWnptIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.EIQqHKXSyQeoOSz4gDW006v2V7nBJtyBskGSnKK-rSI
1 -oqlaho6q4k  
  1 +ttosts8vxjr
1 -84d2004bf28a2095230e8e14993d398d40aa7bd061b6ad48cb6f7a7cfdb84569d7d0ca57  
  1 +9ae96156b03893790822a25c332635a55596657255165d212719d21848161c8832412cbb
1 -3667592490893312  
  1 +3679205383782400
1 -mYGaGzm/2A8LNNjaJG2iyFolUo9vPkYDkeIDBW8rSZeAtTiDMc6MYX+DjBpMKR1wPzyMSaaQgTIxqPA8EKx1GYwgOEdN2b7+/W6r6ZCP+g5MwWEbQj1VHmZwF+5A+ik2X9q6abD9yR48ShP96jKH+yTilDaG5nSmrYY6A0u46PE=  
  1 +QLDVfBcYi7T76LcWhcF9bjPvuerNnJrn9BNav2E6GKyXNsPvX7RKxxTS5Qnf2Xf8UNdJWK7g/3rwCReZacnXMJkRmFHVGlGN5la+Gh7e6qtYvEol0wrkM4x97IaaN0aq6M9Azm78lW55Dr3SK7cVmno7DIAcOh8MRkEIGI6iDY0=
  1 +3035452474095305728
1 -3247366011913216  
  1 +3248817613892608
1 -3273395953934592  
  1 +3274475036725504
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4MzM3ODcxLCJleHAiOjE1OTgzNDg2NzEsIm5iZiI6MTU5ODMzNzg3MSwianRpIjoiZ1pMN21pMmFycEhNYlRyaiIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.vaTxIhdCUnfG0CksphY0YGDqxr-iM_DOTmMX8NF_6UI  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4ODY0NzY2LCJleHAiOjE1OTg4NzU1NjYsIm5iZiI6MTU5ODg2NDc2NiwianRpIjoiYXIzaFhBekc3WGN3TVRkbCIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.lOkS3UxFvqyaSfBGy5m3bey63HNbaFDQ57FWakBftmA
1 -QZJjDhX22fX4aJTT32s5BChPXJ8CJ2jG  
  1 +MSmH3bAPn44brCGzsjcaWW2xWa6Y2QBc
1 -o213scwfkxo  
  1 +v5uarxgozjm
@@ -9,6 +9,7 @@ from helpfunc.pg_db_func import * @@ -9,6 +9,7 @@ from helpfunc.pg_db_func import *
9 9
10 import time,datetime,re 10 import time,datetime,re
11 11
  12 +
12 from urllib.parse import * 13 from urllib.parse import *
13 14
14 15
@@ -39,3 +40,8 @@ def get_nowtime(): @@ -39,3 +40,8 @@ def get_nowtime():
39 def get_second(): 40 def get_second():
40 curr_time = datetime.datetime.now() 41 curr_time = datetime.datetime.now()
41 return curr_time.second 42 return curr_time.second
  43 +
  44 +def get_tomorrow():
  45 + td = datetime.timedelta(days=1)
  46 + tomorrow = (datetime.datetime.utcnow() + td).isoformat()
  47 + print(tomorrow)
@@ -7,7 +7,6 @@ @@ -7,7 +7,6 @@
7 import json 7 import json
8 from urllib.parse import * 8 from urllib.parse import *
9 9
10 -  
11 path = 'E:/task_api/' 10 path = 'E:/task_api/'
12 # path = 'E:/mmm_auto/task_api/' 11 # path = 'E:/mmm_auto/task_api/'
13 def teardown_hook_get_Authorization(response): 12 def teardown_hook_get_Authorization(response):
@@ -68,25 +67,76 @@ def teardown_hook_get_login_code(response): @@ -68,25 +67,76 @@ def teardown_hook_get_login_code(response):
68 except Exception as e: 67 except Exception as e:
69 print('写入失败', e) 68 print('写入失败', e)
70 return res 69 return res
71 -  
72 -def teardown_hook_get_task_id(response): 70 +#写入抢单任务id
  71 +def teardown_hook_get_loot_task_id(response):
  72 + if response.status_code == 200:
  73 + jsondata = json.loads(response.text)
  74 + task_id =jsondata['data']['id']
  75 + try:
  76 + # 保存token到文件
  77 + with open(path + 'config/loot_task_id.txt','w+') as f:
  78 + f.write(task_id)
  79 + print('写入成功，task_id：{}'.format(task_id))
  80 + f.close()
  81 + except Exception as e:
  82 + print('写入失败', e)
  83 + return task_id
  84 +#获取抢单任务id
  85 +def get_loot_task_id():
  86 + try:
  87 + # 保存token到文件
  88 + with open(path + "config/loot_task_id.txt", 'r') as f:
  89 + task_id = f.read()
  90 + print('读取成功，task_id：{}'.format(task_id))
  91 + except Exception as e:
  92 + print('读取失败', e)
  93 + # Authorization = str(Authorization)
  94 + return task_id
  95 +#写入竞标任务id
  96 +def teardown_hook_get_bid_task_id(response):
73 if response.status_code == 200: 97 if response.status_code == 200:
74 jsondata = json.loads(response.text) 98 jsondata = json.loads(response.text)
75 task_id =jsondata['data']['id'] 99 task_id =jsondata['data']['id']
76 try: 100 try:
77 # 保存token到文件 101 # 保存token到文件
78 - with open(path + 'config/task_id.txt','w+') as f: 102 + with open(path + 'config/bid_task_id.txt','w+') as f:
79 f.write(task_id) 103 f.write(task_id)
80 print('写入成功，task_id：{}'.format(task_id)) 104 print('写入成功，task_id：{}'.format(task_id))
81 f.close() 105 f.close()
82 except Exception as e: 106 except Exception as e:
83 print('写入失败', e) 107 print('写入失败', e)
84 return task_id 108 return task_id
  109 +#获取竞标任务id
  110 +def get_bid_task_id():
  111 + try:
  112 + # 保存token到文件
  113 + with open(path + "config/bid_task_id.txt", 'r') as f:
  114 + task_id = f.read()
  115 + print('读取成功，task_id：{}'.format(task_id))
  116 + except Exception as e:
  117 + print('读取失败', e)
  118 + # Authorization = str(Authorization)
  119 + return task_id
85 120
86 -def get_task_id(): 121 +#写入指派任务id
  122 +def teardown_hook_get_appoint_task_id(response):
  123 + if response.status_code == 200:
  124 + jsondata = json.loads(response.text)
  125 + task_id =jsondata['data']['id']
  126 + try:
  127 + # 保存token到文件
  128 + with open(path + 'config/appoint_task_id.txt','w+') as f:
  129 + f.write(task_id)
  130 + print('写入成功，task_id：{}'.format(task_id))
  131 + f.close()
  132 + except Exception as e:
  133 + print('写入失败', e)
  134 + return task_id
  135 +#获取指派任务id
  136 +def get_appoint_task_id():
87 try: 137 try:
88 # 保存token到文件 138 # 保存token到文件
89 - with open(path + "config/task_id.txt", 'r') as f: 139 + with open(path + "config/appoint_task_id.txt", 'r') as f:
90 task_id = f.read() 140 task_id = f.read()
91 print('读取成功，task_id：{}'.format(task_id)) 141 print('读取成功，task_id：{}'.format(task_id))
92 except Exception as e: 142 except Exception as e:
@@ -7,6 +7,8 @@ from helpfunc.m_func import * @@ -7,6 +7,8 @@ from helpfunc.m_func import *
7 import psycopg2 7 import psycopg2
8 from datetime import * 8 from datetime import *
9 9
  10 +
  11 +
10 def get_today(): 12 def get_today():
11 today = datetime.now(timezone.utc).astimezone().isoformat() 13 today = datetime.now(timezone.utc).astimezone().isoformat()
12 return today 14 return today
@@ -72,12 +74,29 @@ def get_employee_account_from_database(): @@ -72,12 +74,29 @@ def get_employee_account_from_database():
72 db.rollback() 74 db.rollback()
73 db.close() 75 db.close()
74 76
75 -#获取任务单的状态  
76 -def get_task_status_from_database(): 77 +#获取抢单任务单的状态:待发布
  78 +def get_task_status_1_from_database():
  79 + db = GetConnect()
  80 + cursor = db.cursor()
  81 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  82 + sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and id = {} '''.format(get_loot_task_id())
  83 + # print(sql)
  84 + try:
  85 + cursor.execute(sql)
  86 + result = cursor.fetchone()
  87 + return result[0]
  88 + except Exception as err:
  89 + # 发生错误时回滚
  90 + print(err)
  91 + db.rollback()
  92 + db.close()
  93 +
  94 +#获取抢单任务单的状态:待领取
  95 +def get_task_status_2_from_database():
77 db = GetConnect() 96 db = GetConnect()
78 cursor = db.cursor() 97 cursor = db.cursor()
79 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 98 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
80 - sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and id = {} '''.format(get_task_id()) 99 + sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and id = {} '''.format(get_loot_task_id())
81 # print(sql) 100 # print(sql)
82 try: 101 try:
83 cursor.execute(sql) 102 cursor.execute(sql)
@@ -122,4 +141,3 @@ def get_task_status_4_from_database(): @@ -122,4 +141,3 @@ def get_task_status_4_from_database():
122 print(err) 141 print(err)
123 db.rollback() 142 db.rollback()
124 db.close() 143 db.close()
125 -# print(get_task_status_4_from_database())  
1 config: 1 config:
2 - name: 价值系统登录 2 + name: 用户登录APP
3 base_url: ${ENV(base_url)} 3 base_url: ${ENV(base_url)}
4 4
5 teststeps: 5 teststeps:
1 config: 1 config:
2 - name: 账号登录测试 2 + name: 用户登录管理后台
3 base_url: ${ENV(base_business_url)} 3 base_url: ${ENV(base_business_url)}
4 4
5 teststeps: 5 teststeps:
  1 +config:
  2 + name: 用户新增抢单任务
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_0_false_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_loot_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +#- name: 发布任务
  36 +# api: api/m_api/loot/loot_open_api.yml
  37 +# varidate:
  38 +# validate:
  39 +# - eq:
  40 +# - content.msg
  41 +# - ok
1 config: 1 config:
2 - name: 19990000008保存抢单任务-发布任务 2 + name: 用户新增抢单任务-公司重要悬赏
3 3
4 teststeps: 4 teststeps:
5 5
6 - name: 提问问题-审核问题-获取资源 6 - name: 提问问题-审核问题-获取资源
7 testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml 7 testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
8 8
9 -- name: 19990000008登录系统 9 +- name: 登录系统
10 variables: 10 variables:
11 phone: ${ENV(wpftwphone)} 11 phone: ${ENV(wpftwphone)}
12 - testcase: testcases/m_login_testcases.yml 12 + testcase: testcases/common/COM002_m_login_testcases.yml
13 13
14 - name: 引用资源 14 - name: 引用资源
15 api: api/m_api/task_resource_api.yml 15 api: api/m_api/task_resource_api.yml
@@ -23,17 +23,17 @@ teststeps: @@ -23,17 +23,17 @@ teststeps:
23 - content.msg 23 - content.msg
24 - ok 24 - ok
25 25
26 -- name: 19990000000保存任务  
27 - api: api/m_api/loot/loot_update_0_api.yml 26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_true_api.yml
28 teardown_hooks: 28 teardown_hooks:
29 - - ${teardown_hook_get_task_id($response)} 29 + - ${teardown_hook_get_loot_task_id($response)}
30 varidate: 30 varidate:
31 validate: 31 validate:
32 - eq: 32 - eq:
33 - content.msg 33 - content.msg
34 - ok 34 - ok
35 -- name: 19990000000发布任务  
36 - api: api/m_api/task_open_api.yml 35 +- name: 发布任务
  36 + api: api/m_api/loot/loot_open_api.yml
37 varidate: 37 varidate:
38 validate: 38 validate:
39 - eq: 39 - eq:
1 config: 1 config:
2 - name: 19990000008保存抢单任务-删除任务 2 + name: 用户新增竞标任务
3 3
4 teststeps: 4 teststeps:
5 5
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
6 - name: 登录系统 9 - name: 登录系统
7 variables: 10 variables:
8 phone: ${ENV(wpftwphone)} 11 phone: ${ENV(wpftwphone)}
9 - testcase: testcases/m_login_testcases.yml 12 + testcase: testcases/common/COM002_m_login_testcases.yml
10 13
11 -- name: 保存任务  
12 - output:  
13 - - id  
14 - api: api/m_api/loot/loot_update_0_api.yml  
15 - extract:  
16 - id: content.data.id 14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
17 varidate: 20 varidate:
18 validate: 21 validate:
19 - eq: 22 - eq:
20 - content.msg 23 - content.msg
21 - ok 24 - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/bid/bid_update_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_bid_task_id($response)}
  30 + varidate:
  31 + validate:
22 - eq: 32 - eq:
23 - - content.data.id  
24 - - $id  
25 -- name: 删除任务  
26 - api: api/m_api/task_delete_api.yml 33 + - content.msg
  34 + - ok
  35 +- name: 发布任务
  36 + api: api/m_api/bid/bid_open_api.yml
27 varidate: 37 varidate:
28 validate: 38 validate:
29 - eq: 39 - eq:
  1 +config:
  2 + name: 用户新增指派任务
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/appoint/appoint_update_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_bid_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +- name: 发布任务
  36 + api: api/m_api/appoint/appoint_open_api.yml
  37 + varidate:
  38 + validate:
  39 + - eq:
  40 + - content.msg
  41 + - ok
  1 +config:
  2 + name: 抢单任务状态验证-待发布
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_false_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_loot_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +
  36 +- name: 查看详情
  37 + api: api/m_api/loot/loot_detail_api.yml
  38 + variables:
  39 + status: ${get_task_status_1_from_database()}
  40 + msg: ok
  41 + varidate:
  42 + validate:
  43 + - eq:
  44 + - content.msg
  45 + - $msg
  46 + - eq:
  47 + - content.data.status
  48 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-已发布，待领取
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_false_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_loot_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +- name: 发布任务
  36 + api: api/m_api/loot/loot_open_api.yml
  37 + varidate:
  38 + validate:
  39 + - eq:
  40 + - content.msg
  41 + - ok
  42 +
  43 +- name: 查看详情
  44 + api: api/m_api/loot/loot_detail_api.yml
  45 + variables:
  46 + status: ${get_task_status_2_from_database()}
  47 + msg: ok
  48 + varidate:
  49 + validate:
  50 + - eq:
  51 + - content.msg
  52 + - $msg
  53 + - eq:
  54 + - content.data.status
  55 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-已领取，待确认
  3 +
  4 +teststeps:
  5 +
  6 +#- name: COM008_loot_open_status_2_testcase.yml
  7 +# testcase: testcases/common/COM008_loot_open_status_2_testcase.yml
  8 +
  9 +- name: app端点击立即抢单
  10 + testcase: testcases/task/loot/loot_rewards_taskDetails_testcase.yml
  11 +
  12 +- name: 查看详情
  13 + api: api/m_api/loot/loot_detail_api.yml
  14 + variables:
  15 + status: ${get_task_status_2_from_database()}
  16 + msg: ok
  17 + varidate:
  18 + validate:
  19 + - eq:
  20 + - content.msg
  21 + - $msg
  22 + - eq:
  23 + - content.data.status
  24 + - $status
@@ -10,7 +10,7 @@ teststeps: @@ -10,7 +10,7 @@ teststeps:
10 - name: 有评分权限19990000011登录系统 10 - name: 有评分权限19990000011登录系统
11 variables: 11 variables:
12 phone: ${ENV(pfphone)} 12 phone: ${ENV(pfphone)}
13 - testcase: testcases/login_testcases.yml 13 + testcase: testcases/common/login_testcases.yml
14 14
15 - name: 19990000011查看待我审核 15 - name: 19990000011查看待我审核
16 output: 16 output:
1 -config:  
2 - name: QX002:同级别评分权限人员-查看问题-权限校验21  
3 -# #清理数据  
4 -# teardown_hooks:  
5 -# - ${teardown_hook_clean_db()}  
6 -# - ${teardown_hook_sleep_N_secs($response,2)}  
7 -  
8 -teststeps:  
9 -  
10 -- name: 19990000008提出问题  
11 - testcase: testcases/question/add_question.yml  
12 -  
13 -- name: 有评分权限19990000011登录系统  
14 - variables:  
15 - phone: ${ENV(pfphone)}  
16 - testcase: testcases/login_testcases.yml  
17 -  
18 -- name: 有评分权限19990000011查看待我审核  
19 - output:  
20 - - qid  
21 - api: api/app_api/question_api/audits_ireview_api.yml  
22 - extract:  
23 - qid: content.data.questions.0.id  
24 - validate:  
25 - - eq:  
26 - - content.data.questions.0.id  
27 - - $qid  
28 -#  
29 -#- name: 有评分权限18200000005审核问题  
30 -# api: api/question_api/auditquestion_api.yml  
31 -#  
32 -#- name: 同级别有评分权限18200000007登录系统  
33 -# variables:  
34 -# currtime: ${make_time()}  
35 -# uuid: ${make_uuid()}  
36 -# access_token: ''  
37 -# sign: ${make_sign($currtime, $uuid,$access_token)}  
38 -# phone: ${ENV(pfphone1)}  
39 -# testcase: testcases/login_testcases.yml  
40 -#  
41 -#- name: 同级别评分权限18200000007查看问题详情  
42 -# api: api/question_api/questiondetail_api.yml  
43 -# validate:  
44 -# - eq:  
45 -# - content.data.question.permission  
46 -# - 21  
47 -  
48 -  
@@ -7,7 +7,7 @@ teststeps: @@ -7,7 +7,7 @@ teststeps:
7 - name: 无评分权限的提问人员19990000008登录系统 7 - name: 无评分权限的提问人员19990000008登录系统
8 variables: 8 variables:
9 phone: ${ENV(wpftwphone)} 9 phone: ${ENV(wpftwphone)}
10 - testcase: testcases/login_testcases.yml 10 + testcase: testcases/common/login_testcases.yml
11 11
12 - name: 19990000008发布提问 12 - name: 19990000008发布提问
13 api: api/app_api/firstpage_api/addquestion_api.yml 13 api: api/app_api/firstpage_api/addquestion_api.yml
1 config: 1 config:
2 name: 首页-立即抢单 2 name: 首页-立即抢单
  3 + variables:
  4 + phone: ${ENV(appphone)}
3 5
4 teststeps: 6 teststeps:
5 7
6 -- name: 19990000008登录系统  
7 - variables:  
8 - phone: ${ENV(appphone)}  
9 - testcase: testcases/login_testcases.yml 8 +- name: 登录系统
  9 + testcase: testcases/common/login_testcases.yml
10 10
11 -- name: 19990000008登录价值系统  
12 - testcase: testcases/task_login_testcases.yml 11 +- name: 登录价值系统
  12 + testcase: testcases/common/COM001_task_login_testcases.yml
13 13
14 -- name: 19990000000查看公司悬赏任务列表 14 +- name: 公司任务（抢单任务）
15 output: 15 output:
16 - id 16 - id
17 - api: api/m_api/task_rewards_api.yml 17 + api: api/m_api/loot/loot_contendTasks_api.yml
18 extract: 18 extract:
19 id: content.data.tasks.0.id 19 id: content.data.tasks.0.id
20 validate: 20 validate:
21 - eq: 21 - eq:
22 - content.data.tasks.0.id 22 - content.data.tasks.0.id
23 - $id 23 - $id
24 -#  
25 -- name: 19990000008抢单 24 +- name: 抢单
26 api: api/m_api/loot/submitCompete_loot_api.yml 25 api: api/m_api/loot/submitCompete_loot_api.yml
@@ -13,20 +13,5 @@ testcases: @@ -13,20 +13,5 @@ testcases:
13 #- name: member_set_permission 成员管理设置权限 13 #- name: member_set_permission 成员管理设置权限
14 # testcase: testcases/task/member/member_set_permission_testcases.yml 14 # testcase: testcases/task/member/member_set_permission_testcases.yml
15 15
16 -#- name: 引用资源  
17 -# testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml  
18 -  
19 -#- name: loot_update_0 抢单任务-保存任务-删除任务  
20 -# testcase: testcases/task/loot/save_loot_update_0_delete_testcase.yml  
21 -  
22 -#- name: app端点击立即抢单  
23 -# testcase: testcases/task/task_rewards_taskDetails_testcase.yml  
24 -  
25 -#- name: loot_task_reject 抢单模式-驳回领取人-查看详情  
26 -# testcase: testcases/task/loot/loot_task_reject_testcase.yml  
27 -  
28 -#- name: loot_task_confirm 抢单模式-确认领取人-查看详情  
29 -# testcase: testcases/task/loot/loot_task_confirm_testcase.yml  
30 -  
31 -- name: loot_task_confirm 抢单模式-完成任务-验收任务  
32 - testcase: testcases/task/loot_task_finishTask_testcase.yml  
  16 +- name: COM009_loot_open_status_7_testcase.yml
  17 + testcase: testcases/common/COM009_loot_open_status_7_testcase.yml