Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

easytrader forked from shidenggui/easytrader #1

Open
wants to merge 293 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
293 commits
Select commit Hold shift + click to select a range
be4f6da
fix: use self._main replace self._app.top_window() to stably get handle
shidenggui Oct 9, 2017
961459a
Update README.md
shidenggui Oct 29, 2017
8fa475b
fix: switch window to normal window after login
shidenggui Jan 8, 2018
79d142c
fix: fix sometime elementNotFound error
shidenggui Jan 8, 2018
4429b77
update version
shidenggui Jan 8, 2018
2947e54
feature: support remote controll client
shidenggui Jan 9, 2018
d5571fb
remove invalid gftrader support
shidenggui Jan 9, 2018
7411f36
add missing exit() function
shidenggui Jan 9, 2018
1c4fa96
remove invalid files
shidenggui Jan 9, 2018
87ad63d
fix: 修复当只有沪深股市之一有额度时, auto_ipo 调用出错的问题
shidenggui Jan 10, 2018
e5d8426
update documents
shidenggui Jan 10, 2018
5c5c15d
refactor: 重构以及增加交易后等待消息窗口弹出的时间,从 0.2s 增加 0.3s, 减少出错的概率
shidenggui Jan 10, 2018
be2eb9c
feature: 添加对国金证券的支持
shidenggui Jan 10, 2018
227d1ae
update README.md
shidenggui Jan 11, 2018
9540418
添加操作通用同花顺客户端的接口
shidenggui Jan 11, 2018
11aa299
feature: 添加对市价交易的支持
shidenggui Jan 12, 2018
85cc6c7
feature: increase wait time between operations for system stability
shidenggui Jan 12, 2018
5fc6b45
update version from 0.12.8 to 0.13.0
shidenggui Jan 12, 2018
cd75e98
update docs
shidenggui Jan 12, 2018
3ce7c84
update docs
shidenggui Jan 12, 2018
2f67a7f
* add more detail error description for common ths client
shidenggui Jan 15, 2018
f7c666a
fix dependency
shidenggui Jan 18, 2018
5060098
delete unused file
shidenggui Jan 18, 2018
897f958
修复单日没有新股或者有新股但是都没有额度时 auto_ipo() 函数出错的情况
shidenggui Jan 19, 2018
fe686a4
update version
shidenggui Jan 19, 2018
321b104
update README.md
shidenggui Jan 19, 2018
9a95fb0
update README.md
shidenggui Jan 20, 2018
6566b4d
refactor: extract duplicate pop dialog detect code to method
shidenggui Jan 20, 2018
e0b5db4
refactor: extract handle pop dialog code to PopDialog class, for DRY
shidenggui Jan 20, 2018
663a167
fix: fix ht buy/sell button cant click error
shidenggui Jan 21, 2018
d02268b
fix: handle pop dialog function add missing condition
shidenggui Jan 21, 2018
1124e80
update version to 0.13.3
shidenggui Jan 21, 2018
c6555b9
refactor: merge duplicated code
shidenggui Jan 21, 2018
2310359
fix: fix typo
shidenggui Jan 21, 2018
4265962
refactor: use set replace list
shidenggui Jan 22, 2018
f15ebc7
refactor: server use decorater replace duplicated code
shidenggui Jan 22, 2018
d39b458
clienttrader中登录配置支持exe_path和comm_password (#262)
ahuigo Jan 27, 2018
8c3a691
update version from 0.13.3 to 0.13.4
shidenggui Jan 28, 2018
1b33f0a
fix typo
shidenggui Feb 5, 2018
9db0bea
fix: rename stock_code => security
shidenggui Feb 6, 2018
4450bdc
update version 0.13.4 to 0.13.5
shidenggui Feb 6, 2018
25c4d8d
更新华泰新版本的一些小问题
KimChow Feb 6, 2018
fe34810
Merge remote-tracking branch 'origin/master'
KimChow Feb 6, 2018
4cacda5
update docs
shidenggui Apr 1, 2018
826a548
update README.md
shidenggui Apr 1, 2018
45db710
update README.md
shidenggui Apr 1, 2018
e5d2609
refactor: remove outdated test code
shidenggui Apr 1, 2018
ce3cc53
refactor: remove outdated test code
shidenggui Apr 1, 2018
9fd751c
:star: use bumpversion
shidenggui Apr 5, 2018
b848c7e
Bump version: 0.13.5 → 0.13.6
shidenggui Apr 5, 2018
330fb3e
Update README.md
shidenggui Apr 14, 2018
36fd8fc
Merge branch 'master' of https://github.com/KimChow/easytrader into K…
shidenggui Apr 15, 2018
85d533c
:hammer: remove comment code
shidenggui Apr 15, 2018
8d90415
Merge branch 'KimChow-master'
shidenggui Apr 15, 2018
f6ccbd4
:bug: fix #264
shidenggui Apr 15, 2018
354813f
:hammer: update README.md
shidenggui Apr 15, 2018
838ae96
Bump version: 0.13.6 → 0.13.7
shidenggui Apr 15, 2018
80aa80d
:star: update README.md, close #275
shidenggui Apr 18, 2018
09357df
:fix: alter easytrader yh verify code server address
shidenggui Apr 23, 2018
71bbec8
Bump version: 0.13.7 → 0.13.8
shidenggui Apr 23, 2018
37e346d
:bug: fix typo
shidenggui Apr 24, 2018
050647a
Bump version: 0.13.8 → 0.13.9
shidenggui Apr 24, 2018
79d7c56
:star: ISSUE_TEMPLATE add BROKER_TYPE
shidenggui Apr 25, 2018
29db344
:star: add not support py3 prompt
shidenggui Apr 25, 2018
741cfea
Bump version: 0.13.9 → 0.13.10
shidenggui Apr 25, 2018
6b00ab5
update _type_keys (#279)
lynic Apr 26, 2018
d9552bd
:hammer: format code style
shidenggui Apr 29, 2018
4b38bc9
:bug: 雪球改为使用 cookies 登陆
shidenggui Apr 29, 2018
d0a4230
Bump version: 0.13.10 → 0.13.11
shidenggui Apr 29, 2018
fb8004c
:bug: fix forget set cookies in account_config
shidenggui Apr 29, 2018
834c4f7
Bump version: 0.13.11 → 0.13.12
shidenggui Apr 29, 2018
1d8f1e9
:bug: xq_follower 使用 cookies 登陆
shidenggui Apr 29, 2018
46c8e55
:hammer: refactor code
shidenggui Apr 29, 2018
47a241f
Bump version: 0.13.12 → 0.13.13
shidenggui Apr 29, 2018
8a98544
:star: xq_follower 添加 adjust_sell 参数以解决根据百分比调仓时卖出股份偏差的问题
shidenggui May 5, 2018
f3a6d5a
Bump version: 0.13.13 → 0.14.0
shidenggui May 5, 2018
6ade291
:star: add .travis.yml
shidenggui May 6, 2018
a430968
:hammer: reformat code
shidenggui May 6, 2018
2fb027e
:hammer: update README.md, add icons
shidenggui May 6, 2018
6f62cc7
:bug: fix xq_follower adjust_sell_price should handle project stock code
shidenggui May 13, 2018
6028b16
Bump version: 0.14.0 → 0.14.1
shidenggui May 13, 2018
554ed51
:bug: add rqopen-client version limit, support pip 10
shidenggui May 24, 2018
9b19135
Bump version: 0.14.1 → 0.14.2
shidenggui May 24, 2018
02f0919
:hammer: use black to format code
shidenggui Jun 27, 2018
e273e3f
:star: support get grid data by xls strategy
shidenggui Jul 1, 2018
3090fbc
Bump version: 0.14.2 → 0.15.0
shidenggui Jul 1, 2018
062cb90
:hammer: refactor code style
shidenggui Jul 1, 2018
75f165c
:hammer: disable client test by default, for travis ci
shidenggui Jul 1, 2018
2db155e
:bug: fix somtime save file failed because window full path length limit
shidenggui Jul 2, 2018
39bcdf3
Bump version: 0.15.0 → 0.15.1
shidenggui Jul 2, 2018
ddd29d3
:bug: grid data get copy strategy should wait until file save complete
shidenggui Jul 4, 2018
76b3d73
Bump version: 0.15.1 → 0.15.2
shidenggui Jul 4, 2018
9504619
:star: add basic hooks
shidenggui Aug 8, 2018
3d4fd4d
:star: add basic hooks
shidenggui Aug 8, 2018
5efa6c1
:star: remove support for python 3.4
shidenggui Aug 8, 2018
f495959
:hammer: fix merge
shidenggui Aug 8, 2018
ec7af51
:hammer: travis use pipenv
shidenggui Aug 8, 2018
e60df4f
add sleep wait file save success (#299)
zhoubeiqing Aug 10, 2018
af39125
银河客户端修改登陆按钮为确定,更新验证码控件id,修复验证码截图范围过小导致只有三个数字被截取问题 (#300)
zhoubeiqing Aug 14, 2018
ec53abf
:star: add clienttrader add refresh api. close 297
shidenggui Aug 15, 2018
b43605d
:star: yh_clienttrader support login by xiadan.exe
shidenggui Aug 15, 2018
afe6304
Bump version: 0.15.2 → 0.16.0
shidenggui Aug 15, 2018
9091998
:hammer: refactor gird_strategy interface
shidenggui Aug 17, 2018
7641a11
Bump version: 0.16.0 → 0.17.0
shidenggui Aug 17, 2018
d46971e
bugfix:
Aug 31, 2018
9b1f3f7
missing window in _set_market_trade_type (#303)
zhangyichent Aug 31, 2018
10c1756
:star: use type annotation
shidenggui Aug 31, 2018
fdd4068
bugfix for sendkeys (#304)
lhztop Aug 31, 2018
dcdb48c
:star: follower support slippage
shidenggui Sep 7, 2018
5940c93
:star: add Makefile
shidenggui Sep 7, 2018
50ab138
Merge branch 'master' of github.com:shidenggui/easytrader
shidenggui Sep 7, 2018
7a93581
Bump version: 0.17.0 → 0.18.0
shidenggui Sep 7, 2018
af4b0b2
:memo: update docs about follower slippage
shidenggui Sep 7, 2018
737c78d
:bug: follower should print price include slippage
shidenggui Sep 8, 2018
f7148fa
Bump version: 0.18.0 → 0.18.1
shidenggui Sep 8, 2018
619aa06
:bug: follower should not adjust sell amount when buy stock
shidenggui Sep 14, 2018
e4b4304
Bump version: 0.18.1 → 0.18.2
shidenggui Sep 14, 2018
5b61750
Update README.md
shidenggui Sep 26, 2018
d75d949
Update README.md
shidenggui Sep 26, 2018
a924876
:star: update README.md
shidenggui Nov 5, 2018
1420825
Merge branch 'master' of github.com:shidenggui/easytrader
shidenggui Nov 5, 2018
7523735
error handler
Nov 13, 2018
9edeef4
Merge branch 'master' of https://github.com/lhztop/easytrader
Nov 13, 2018
f637309
modify to 2
Nov 14, 2018
ea16a09
add perf clock
Nov 15, 2018
c19185c
market buy sell
Nov 16, 2018
9f2fbc8
add log
Nov 16, 2018
b35a3c5
perf on property
Nov 19, 2018
74f426a
bugfix:
Nov 19, 2018
839322e
bugfix: setforegroundwindow instead of setfocus
Nov 23, 2018
5219dcb
bugfix2
Nov 23, 2018
690ed46
modify type keys
Dec 25, 2018
1235fc9
add set foreground
Dec 26, 2018
e2bc0df
wrap
Dec 26, 2018
aa10483
guozhai
Dec 28, 2018
c17c1f0
:pencli2: fix doc json format
shidenggui Jan 16, 2019
289fdde
delete else
Mar 21, 2019
a719638
modify
Mar 29, 2019
7c908a1
test
Mar 29, 2019
eea23d8
:bug: fix xq follower cant get history
shidenggui Apr 4, 2019
e6a9008
Bump version: 0.18.2 → 0.18.3
shidenggui Apr 4, 2019
76b4329
close prompt
Apr 4, 2019
ec6baff
:star: upgrade pywinauto to 0.6.6 && refactor DeprecationWarning
shidenggui Apr 5, 2019
e5ae4da
Bump version: 0.18.3 → 0.18.4
shidenggui Apr 5, 2019
6743401
银河客户端验证码去掉绘制边框 (#332)
zhoubeiqing May 20, 2019
a61681f
银河客户端在操作前增加刷新,否则得到的值永远是一样的 (#334)
zhoubeiqing May 26, 2019
0330dfa
ipo no kechuangban
Jul 12, 2019
fcb8541
kcb
Jul 31, 2019
4e31e22
auto test
Aug 6, 2019
ba6615e
银河双子星客户端一键打新无需点击全选 (#337)
zhoubeiqing Aug 14, 2019
2706cd0
timeout
Aug 15, 2019
775a9d9
:memo: update docs for xq
shidenggui Apr 8, 2019
eb4dc69
:star: update docs
shidenggui Sep 17, 2019
4e137ec
timeout
Sep 19, 2019
94e885d
dd
Sep 19, 2019
5c9f89d
Merge branch 'master' of https://github.com/lhztop/easytrader
Sep 19, 2019
e3be7aa
add kcb limit price when market trade
Sep 23, 2019
8c72ce4
client trader
Sep 23, 2019
84d5da0
kcb limit price
Sep 23, 2019
58e87f7
kcb
Sep 23, 2019
a264428
trader
Oct 15, 2019
dddffa4
log info
Oct 15, 2019
9a84a78
log
Oct 15, 2019
f5d33fe
click cancel
Oct 15, 2019
7d3d234
easy diff
Oct 15, 2019
89166a2
log
Oct 17, 2019
42ad128
t
Oct 17, 2019
89a5318
gbk error
Oct 22, 2019
d9a217a
Update joinquant_follower.py (#349)
samdeng2 Oct 23, 2019
fbfe74c
modify
Oct 30, 2019
951c31b
commit
Nov 7, 2019
cf82d50
Merge branch 'master' of https://github.com/lhztop/easytrader
Nov 7, 2019
ce9b766
trade
Nov 19, 2019
7695c9d
trade
Nov 19, 2019
8d262f8
log close
Nov 20, 2019
80c3d03
close_pormpt_window_no_wait
Nov 20, 2019
9479a81
Merge branch 'master' of https://github.com/shidenggui/easytrader
Dec 11, 2019
18f2e3c
error
Dec 11, 2019
99f205c
client
Dec 11, 2019
fd34783
delete shortcuts
Dec 12, 2019
316993d
wk client
Dec 26, 2019
0a15007
:star: refacotr utils functions and use absolute import
shidenggui Jan 12, 2020
428b87b
:star: ht client trader changes default grid copy strategy to xls
shidenggui Jan 12, 2020
5cd4a5f
:star: remove jsonpickle
shidenggui Jan 12, 2020
8f56583
:star: refactor code
shidenggui Jan 12, 2020
40b1cf6
:star: update README.md
shidenggui Jan 12, 2020
da70dcb
Bump version: 0.18.4 → 0.18.5
shidenggui Jan 12, 2020
7e62935
modify for easytrader (#354)
lhztop Jan 12, 2020
0233e24
:star: fix merge
shidenggui Jan 12, 2020
eccc408
:star: update README.md
shidenggui Jan 12, 2020
7946000
:star: update docs
shidenggui Jan 12, 2020
775743d
:star: add empty requirements for readthedocs
shidenggui Jan 12, 2020
df5527d
:bug: fix docs
shidenggui Jan 12, 2020
f286352
:bug: fix mkdocs.yml
shidenggui Jan 12, 2020
9d73e87
:bug: fix mkdocs.yml
shidenggui Jan 12, 2020
3a0a533
:bug: fix mkdocs.yml
shidenggui Jan 12, 2020
4b60655
:bug: fix missing package
shidenggui Jan 13, 2020
fc2d6a8
Bump version: 0.18.5 → 0.18.6
shidenggui Jan 13, 2020
4ae7ee2
:star: update README.md
shidenggui Mar 12, 2020
6699363
:star: update docs
shidenggui Mar 12, 2020
f99570d
:star:(trade) allow use type_keys when set_edit_text not working
shidenggui Mar 12, 2020
df6fd07
Bump version: 0.18.6 → 0.18.7
shidenggui Mar 12, 2020
7e90c8a
Update README.md
shidenggui Mar 13, 2020
4863702
Update README.md
shidenggui Mar 14, 2020
7e97cf7
:star: update README.md
shidenggui Mar 14, 2020
de2126c
:star:(broker) support 海通证券
shidenggui Mar 25, 2020
06560a2
Bump version: 0.18.7 → 0.19.0
shidenggui Mar 25, 2020
f17c316
:star:(grid) suport change tmp folder for xls strategy
shidenggui Mar 25, 2020
ad47fe6
:star:(docs) update docs
shidenggui Mar 25, 2020
fc11864
Bump version: 0.19.0 → 0.20.0
shidenggui Mar 25, 2020
efb7f3d
:star:(broker) fix xls strategy bug
shidenggui Mar 25, 2020
c775a49
Bump version: 0.20.0 → 0.20.1
shidenggui Mar 25, 2020
57a58e2
修改委托编号提取
Apr 22, 2020
d98f38a
增加了华泰证券客户端的国债正回购/逆回购的接口。 (#375)
matrixleon18 May 27, 2020
20b39a1
目的:让joinquant follow能运行起来。
qzhjiang May 30, 2020
52a71c3
目的:让joinquant follow能运行起来。 (#377)
qzhjiang May 30, 2020
8dcddcf
:star: update README.md
shidenggui Jun 1, 2020
7833946
:star:(bug) default logger level should be info
shidenggui Jun 1, 2020
1e3d2ab
Merge branch 'master' of https://github.com/xayjin/easytrader into xa…
shidenggui Jun 1, 2020
0f824b9
:star: 支持包含字母的委托单号
shidenggui Jun 1, 2020
acaa0b4
Bump version: 0.20.1 → 0.20.2
shidenggui Jun 1, 2020
8a6c749
:star: upgrade rqopen-client
shidenggui Jun 1, 2020
8ff177d
Bump version: 0.20.2 → 0.20.3
shidenggui Jun 1, 2020
883be7a
:star: remove rqopenclient
shidenggui Jun 2, 2020
a86bd22
Bump version: 0.20.3 → 0.20.4
shidenggui Jun 2, 2020
38a83c3
同花顺网上交易5.0 刷新(refresh)
qzhjiang Jun 4, 2020
ee7cf8b
Merge remote-tracking branch 'origin/master'
qzhjiang Jun 4, 2020
ae97c30
修复同花顺“刷新”;去除对win32gui的引用
qzhjiang Jun 6, 2020
b37661b
:star: remove rqopenclient
shidenggui Jun 15, 2020
6137dc5
Bump version: 0.20.4 → 0.20.5
shidenggui Jun 15, 2020
3af5a20
Update README.md
shidenggui Jun 19, 2020
791bda6
Update index.md
shidenggui Jun 19, 2020
e92a1ef
Merge branch 'master' of https://github.com/qzhjiang/easytrader into …
shidenggui Jun 26, 2020
8973ad6
:star: fix merge
shidenggui Jun 26, 2020
bb1c4d1
:star: 支持通过点击工具栏刷新按钮刷新
shidenggui Jun 26, 2020
2411cee
:bug: init toolbar after login
shidenggui Jun 26, 2020
e855280
Bump version: 0.20.5 → 0.21.0
shidenggui Jun 26, 2020
ba33924
from easytrader.utils.misc import str2num (#384)
cclauss Jun 26, 2020
dcb8058
:bug:(pywinauto) specify pywinauto version
shidenggui Jul 8, 2020
d63de43
Bump version: 0.21.0 → 0.22.0
shidenggui Jul 8, 2020
1724b21
修正银河下单程序登陆 (#401)
keshunchen Sep 4, 2020
6de1bc3
切换菜单时增加对弹窗的去除 (#387)
zhoubeiqing Sep 4, 2020
dd7c5bc
修复自动打新问题 (#405)
wangxiaowei-cloud Sep 24, 2020
4bbe9fe
加入了一些功能, 若有帮助,请合并到主版本中 (#407)
xiangsf Oct 12, 2020
5fdbaf9
修复华泰证券登入过程死锁的问题 (#408)
wangxiaowei-cloud Oct 23, 2020
e68b04d
修正华泰通讯密码包含特殊字符时不能被正确输入的问题 (#412)
lovelykd Nov 22, 2020
c9bb9bc
optimization: 优化验证码识别结果,加快获取速度 (#415)
Ckend Jan 5, 2021
ca18e4e
修复通用版同花顺自动打新功能 (#424)
r52097 Mar 10, 2021
376c10a
支持同花顺官网下载的客户端(内含对多个券商的支持) (#426)
r52097 Mar 12, 2021
dbb1665
Bump version: 0.22.0 → 0.23.0
shidenggui Mar 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[bumpversion]
current_version = 0.23.0
commit = True
files = easytrader/__init__.py setup.py
tag = True
tag_name = {new_version}
7 changes: 7 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[run]
branch = True
include = easytrader/*
omit = tests/*

[report]
fail_under = -1
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## env

OS: win7/ win10 / mac / linux
PYTHON_VERSION: 3.x
EASYTRADER_VERSION: 0.xx.xx
BROKER_TYPE: gj / ht / xq / xxx

## problem

## how to repeat



7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
cmd_cache.pk
bak
.mypy_cache
.pyre
.pytest_cache
yjb_account.json
htt.json
gft.json
test.py
ht_account.json
.idea
.vscode
.ipynb_checkpoints
Untitled.ipynb
untitled.txt
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
account.json
account.session
# C extensions
*.so

Expand Down
Loading