jinql
/
12306
mirror of https://github.com/testerSunshine/12306
1
0
Fork 0
Code Issues Releases Wiki Activity
435 Commits
10 Branches
1 Tag
64 MiB
Commit Graph

435 Commits (a495af88346a0d794493c6030f6a6207debb5824)

Author SHA1 Message Date
fbigun 934e5ffd6a 修复测试代码运行时，测试代码运行报编码错误 2019-01-15 20:35:48 +08:00
wenxianping e0fee69e52
Merge pull request #195 from MonsterTan/master 
docker update
 2019-01-15 17:16:11 +08:00
tan 0ecd1bdfe3 update readme 2019-01-15 16:39:02 +08:00
tan 77b6e327d4 根据一些使用者反馈，修改权限参数。修改时间配置 2019-01-15 16:38:38 +08:00
tan c9bdc8cd14 add docker install script 2019-01-15 16:36:58 +08:00
MonsterTan 1fa7d11187
Merge pull request #4 from testerSunshine/master 
merge
 2019-01-15 16:18:26 +08:00
wenxianping 524c48a496 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.idea/12306.iml
#	.idea/inspectionProfiles/Project_Default.xml
#	.idea/misc.xml
#	.idea/workspace.xml
 2019-01-14 18:21:32 +08:00
wenxianping c27f3c57c3 rm idea 2019-01-14 18:20:34 +08:00
wenxianping 2327d4e323 更新群号 2019-01-14 18:13:00 +08:00
wenxianping 734b555b01
Merge pull request #187 from ferried/master 
remove settings of Interlij Idea
 2019-01-14 17:17:12 +08:00
ferried c7ca150732 remove settings of Interlij Idea 2019-01-14 11:27:09 +08:00
wenxianping 2f071287a4 修改已知bug 
issues：https://github.com/testerSunshine/12306/issues/177
 2019-01-14 09:46:33 +08:00
wenxianping 3fd25c3925
Merge pull request #152 from stormeyes/master 
添加 pushbear 微信通知的能力
 2019-01-14 09:21:43 +08:00
wenxianping 941cbe6831 修复循环断掉的bug 2019-01-12 21:28:46 +08:00
wenxianping 419c07409b Merge remote-tracking branch 'origin/master' 2019-01-12 17:49:10 +08:00
wenxianping 271beb0170 readme 2019-01-12 17:47:37 +08:00
wenxianping 856a4de2f1
Merge pull request #167 from fbigun/Feature-dockerignore 
增加docker忽略文件，减少不必要的文件打包
 2019-01-12 15:44:37 +08:00
wenxianping c68cc016e0 增加余票不足优先提交功能 2019-01-12 15:26:02 +08:00
fbigun ced815e7c2 增加docker忽略文件，减少不必要的文件打包 2019-01-12 14:54:22 +08:00
kongkongyzt 6c78809b4f remove tail whitespace 2019-01-11 01:14:48 +08:00
kongkongyzt 3da74df99c remove tail whitespace 2019-01-11 01:11:18 +08:00
kongkongyzt 1c5ba95ff8 添加测试用例， 完善pushbear代码 2019-01-11 00:41:41 +08:00
kongkongyzt bc88a9e067 添加pushbear微信通知推送 2019-01-11 00:24:45 +08:00
wenxianping 109967ca70
Merge pull request #142 from MonsterTan/master 
新增docker-compose功能模块
 2019-01-10 12:39:19 +08:00
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