Commit Graph

89 Commits (6ffdaa00481e8e3cfb04e8f9d73436a91f5589af)

Author SHA1 Message Date
wenxianping 6ffdaa0048 master margin test 2018-01-13 09:45:41 +08:00
wenxianping 4febb67ac2 fix 2018-01-13 09:44:57 +08:00
wenxianping 9170177769 Merge branch 'test' 2018-01-13 09:39:33 +08:00
wenxianping b84c5faf8f fix 2018-01-13 09:38:06 +08:00
wenxianping 91b0c471ee Merge branch 'dev' into test
# Conflicts:
#	.idea/workspace.xml
#	config/ticket_config.yaml
#	init/select_ticket_info.py
#	tkcode
2018-01-13 09:32:10 +08:00
wenxianping a6983a0422 转义 2018-01-12 23:38:50 +08:00
wenxianping 2ed2916397 排队提交订单规范加强,依赖减弱
测试版本
2018-01-12 23:16:02 +08:00
wenxianping 507910d1dd
Merge pull request #4 from hawkli-1994/hawkli-optimization
规范run文件的写法
2018-01-12 20:55:22 +08:00
hawkli 26ee65c48e 规范run文件的写法 2018-01-12 19:30:38 +08:00
wenxianping d8a91c1fc9 fix 2018-01-12 17:40:40 +08:00
wenxianping bd5bebac3a 跳出下单循环 2018-01-12 14:42:30 +08:00
wenxianping 6a07fd4739 fix 2018-01-12 12:35:02 +08:00
wenxianping 339c22b5e2 fix 2018-01-11 21:49:10 +08:00
wenxianping 488fd01864 限制队列线程买票大小 2018-01-11 21:45:53 +08:00
wenxianping 66413c9acc fix 2018-01-11 21:44:02 +08:00
wenxianping 39b10e05c0 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	init/select_ticket_info.py
2018-01-11 18:40:20 +08:00
wenxianping 264351d727 fix 2018-01-11 17:27:56 +08:00
wenxianping 977af7fd66 跳出下单循环 2018-01-11 17:26:54 +08:00
79277490@qq.com 27d3c8f216 更改队列大小 2018-01-11 16:17:16 +08:00
79277490@qq.com 943ca94b9c Merge remote-tracking branch 'origin/master' 2018-01-11 16:11:06 +08:00
wenxianping 1d1237e1a4 增加提交订单验证码校验 2018-01-11 16:01:37 +08:00
wenxianping 53f030537d 提交验证码拉去类别问题 2018-01-11 15:43:00 +08:00
79277490@qq.com 9865021f81 . 2018-01-11 15:39:42 +08:00
79277490@qq.com ebcd2a7997 命令测试 2018-01-11 15:34:15 +08:00
79277490@qq.com 4383d31878 队列循环提交 2018-01-11 15:26:12 +08:00
wenxianping 1d3a7867d5 修改提交需要验证码逻辑 2018-01-11 15:25:31 +08:00
79277490@qq.com f07b33d099 优化睡眠时间,队列循环提交 2018-01-11 15:23:50 +08:00
79277490@qq.com dffc307b55 Merge remote-tracking branch 'origin/master' 2018-01-11 15:09:28 +08:00
wenxianping 162a7cefe5 更改车次提示不间断 2018-01-11 13:34:35 +08:00
wenxianping e5b16fe778 test 2018-01-11 13:20:39 +08:00
79277490@qq.com e5320663e8 增加配置 2018-01-11 12:43:25 +08:00
wenxianping 246b364a52 fix 2018-01-11 11:15:16 +08:00
wenxianping 947c33cd6b 排队订单sleep逻辑修改
判断联系人不在列表给出提示
2018-01-11 11:06:41 +08:00
wenxianping 4604fd7d3b 优化排队效率 2018-01-10 22:36:51 +08:00
wenxianping 85ae1b9f6b test 2018-01-10 21:58:39 +08:00
wenxianping c4806e6306 优化查询逻辑 2018-01-10 21:32:11 +08:00
wenxianping f53270c151 优化登录订票流程 2018-01-10 19:36:22 +08:00
wenxianping bebdcfaf31 gix 2018-01-10 17:30:01 +08:00
wenxianping 43783612da 转码 2018-01-10 17:29:05 +08:00
wenxianping fdba481ee5 fix 2018-01-10 17:25:48 +08:00
wenxianping b4c536dcf2 优化查询速度 2018-01-10 15:23:53 +08:00
wenxianping fecc657d35 转码 2018-01-10 13:41:05 +08:00
wenxianping 0735431cd9 fix 2018-01-10 13:36:50 +08:00
79277490@qq.com 2a46ccddb4 test push 2018-01-10 12:20:57 +08:00
79277490@qq.com 18c8d96664 测试push 2018-01-10 12:18:21 +08:00
79277490@qq.com 66a9965afd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	init/select_ticket_info.py
2018-01-10 10:44:02 +08:00
79277490@qq.com 8a17c48f40 优化睡眠时间,去除没用的Print 2018-01-10 10:36:02 +08:00
wenxianping 83c4c925b6 fix 2018-01-10 10:35:09 +08:00
wenxianping b8ed4ae732 fix 2018-01-10 10:31:43 +08:00
79277490@qq.com eac67ea1e5 优化睡眠时间,去除没用的信息 2018-01-10 10:27:31 +08:00