jinql
/
12306
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
411 Commits
10 Branches
1 Tag
64 MiB
Commit Graph

411 Commits (8258d3d910dee305d58e2f03d7b48d67f42b7da6)

Author SHA1 Message Date
tan 1deb2b2d8a update readme 2019-01-10 11:25:14 +08:00
tan 543cbe34dd update 2019-01-10 11:22:43 +08:00
tan f59eb0ab0c update readme 2019-01-10 11:21:42 +08:00
tan a699ff49c9 add docker.sh logs function 2019-01-10 11:18:18 +08:00
tan 8fbb53c673 modified readme file for adding docker-compose profile 2019-01-10 11:17:54 +08:00
tan f4eb73585a update docker-compose files 2019-01-10 10:55:35 +08:00
tan 9fa568e93b update Dockerfile file 2019-01-10 10:55:20 +08:00
tan 5eac8415aa Merge branch 'master' of github.com:MonsterTan/12306 2019-01-10 10:06:10 +08:00
MonsterTan cf2c6bf486
Merge pull request #3 from testerSunshine/master 
update
 2019-01-10 10:04:49 +08:00
wenxianping d933e07dc4 Merge remote-tracking branch 'origin/master' 2019-01-10 09:52:46 +08:00
wenxianping fc675d57e8 增加cdn 2019-01-10 09:52:19 +08:00
wenxianping c7f0861d38
Merge pull request #134 from wosenbo/master 
添加新的座位类型和配置说明
 2019-01-09 19:15:43 +08:00
tan 221d9e25a4 Merge branch 'master' of github.com:MonsterTan/12306 2019-01-09 17:40:08 +08:00
tan 0d561034eb update docker-compose 2019-01-09 17:38:30 +08:00
MonsterTan 5e501a2423
Merge pull request #2 from testerSunshine/master 
update
 2019-01-09 17:37:31 +08:00
paul f4f0e7dfb3 完善动卧座位相关判断 2019-01-09 16:45:49 +08:00
paul 25c33e413e 增加座位类型：动卧 2019-01-09 15:18:59 +08:00
paul 500139ae59 添加可选座位提示，方便用户填写 2019-01-09 14:14:40 +08:00
wenxianping f2c083997d
Merge pull request #120 from AaronJny/fix-requirements-install-doc 
对linux的安装依赖做了特别说明。
 2019-01-08 18:38:10 +08:00
wenxianping ad8066972b 增加代理ip口子 2019-01-08 17:04:40 +08:00
MonsterTan 99ec619f2c
Merge pull request #1 from testerSunshine/master 
update
 2019-01-08 16:41:58 +08:00
AaronJny 542db361b2 对linux的安装依赖做了特别说明。 
1.使用 `python2 -m pip install ...`的形式安装依赖可以避免多版本python、pip下的冲突问题，否则有可能会出现将依赖安装到python3上，项目无法运行的情况。
2.对root用户和非root用户做了区分。当非root用户直接使用`pip install ...`命令安装时，依赖会安装到当前用户目录下，但运行项目使用的是`sudo python run.py`，读取的是root用户目录下的依赖，可能会导致项目运行失败。
 2019-01-08 14:18:37 +08:00
wenxianping 8e97d1d160 优化提示 2019-01-08 10:22:46 +08:00
wenxianping f76371ba72 readme update 2019-01-08 10:16:24 +08:00
wenxianping a9cf9c6c6c 删除cdn提示 2019-01-08 09:48:18 +08:00
wenxianping ac69e2c9e0 删除加入cdn提示 2019-01-07 22:54:46 +08:00
wenxianping 37f20eda21
Merge pull request #101 from cclauss/patch-4 
Use feature detection instead of version detection
 2019-01-07 22:47:08 +08:00
wenxianping 15491c8aa6
Merge pull request #100 from cclauss/patch-3 
Define xrange() in Python 3
 2019-01-07 22:34:20 +08:00
wenxianping 34789a5a3e
Merge pull request #99 from cclauss/patch-2 
Define raw_input() in Python 3
 2019-01-07 22:34:07 +08:00
wenxianping b2416455f4
Merge pull request #103 from pyfaith/master 
修正查询余票时，不显示当前cdn轮询IP问题
 2019-01-07 20:56:11 +08:00
pyfaith dedc491203 修正查询余票时，不显示当前cdn轮询IP问题 2019-01-07 18:51:27 +08:00
wenxianping e6ce310eca 验证码图片改后缀 2019-01-07 17:48:41 +08:00
tan fe1ea37a7e complete docker script 2019-01-07 17:02:35 +08:00
cclauss 4c1ab61b7b
Trailing whitespace 2019-01-07 09:45:38 +01:00
tan 8c26862732 add docker.sh file to control compose file 2019-01-07 16:44:36 +08:00
tan 8c548f13de modify some config about compose file. 2019-01-07 16:44:12 +08:00
cclauss 3ca6f13d06
Fix typo 2019-01-07 09:34:44 +01:00
cclauss 4371b0b3b0
Use feature detection instead of version detection 2019-01-07 09:11:31 +01:00
cclauss 378bb75bf8
Use feature detection instead of version detection 
Follows the Python porting best practice [__use feature detection instead of version detection__](https://docs.python.org/3/howto/pyporting.html#use-feature-detection-instead-of-version-detection).
 2019-01-07 09:09:26 +01:00
cclauss 252ca4002c
Define xrange() in Python 3 
__xrange()__ was removed in Python 3 in favor of a reworked version of __range()__.  This change ensures equivalent functionality in both Python 2 and Python 3.
 2019-01-07 09:04:01 +01:00
cclauss 342bebc733
Define raw_input() in Python 3 
__raw_input()__ was removed in Python 3 in favor of a reworked version of __input()__.  This change ensures equivalent functionality in both Python 2 and Python 3.
 2019-01-07 08:58:43 +01:00
tan 7518d21c60 update docker files 2019-01-07 15:21:42 +08:00
wenxianping ec38172b3d readme update 2019-01-07 11:57:53 +08:00
wenxianping 2df57447d3 优化cdn。 2019-01-07 11:54:47 +08:00
wenxianping 2cb98db402 Merge remote-tracking branch 'origin/master' 2019-01-07 11:44:12 +08:00
wenxianping a78683bad2 修改cpu占用过高问题 2019-01-07 11:44:06 +08:00
wenxianping 94410cbbd8
Merge pull request #89 from HousqLove/master 
优化手动识别时的坐标_v2
 2019-01-07 11:43:08 +08:00
housq 41a78209c8 优化手动识别时的坐标 2019-01-06 12:26:08 +08:00
wenxianping cfebf48646 修改休眠bug 
增加软卧功能
 2019-01-06 12:16:45 +08:00
wenxianping fb03acd46f
Merge pull request #73 from ttdevs/master 
修改配置文件的加载方式
 2019-01-05 16:29:40 +08:00