diff --git a/resources/同花顺系统设置.png b/resources/同花顺系统设置.png new file mode 100644 index 0000000..3ac4c6f Binary files /dev/null and b/resources/同花顺系统设置.png differ diff --git a/src/real_trader.py b/src/real_trader.py index b358d1a..e6d38b1 100644 --- a/src/real_trader.py +++ b/src/real_trader.py @@ -17,8 +17,10 @@ class RealTrader: user="35207457", password="351916", exe_path=r"C:\\ths\\xiadan.exe" ) except Exception as e: - time.sleep(3) + time.sleep(1) self.trader.connect(r"C:\\ths\\xiadan.exe") + self.trader.enable_type_keys_for_editor() + self.trader.grid_strategy_instance.tmp_folder = "C:\\temp" def logout(self): self.trader.exit() @@ -42,10 +44,10 @@ class RealTrader: self.trader.refresh() def buy(self, code, price, amount): - self.trader.buy(code, price, amount) + return self.trader.buy(code, price, amount) def sell(self, code, price, amount): - self.trader.sell(code, price, amount) + return self.trader.sell(code, price, amount) def cancel(self, entrust_no): - self.trader.cancel_entrust(entrust_no) + return self.trader.cancel_entrust(entrust_no) diff --git a/src/trade_server.py b/src/trade_server.py index 9c90a7c..2f93c89 100644 --- a/src/trade_server.py +++ b/src/trade_server.py @@ -24,7 +24,7 @@ threading.Thread(target=run_pending_tasks).start() trader = RealTrader() ### test code start -# trader.login() +trader.login() # time.sleep(5) # trader.logout() ### test code end @@ -58,7 +58,7 @@ def buy(): print(f"buy: {code}, {price}, {amount}") result = trader.buy(code, price, amount) - response = {"success": True, "message": result} + response = {"success": True, "data": result} return jsonify(response), 200 except ValueError: abort( @@ -82,7 +82,7 @@ def sell(): print(f"sell: {code}, {price}, {amount}") result = trader.sell(code, price, amount) - response = {"success": True, "message": result} + response = {"success": True, "data": result} return jsonify(response), 200 except ValueError: abort( @@ -96,7 +96,7 @@ def cancel(entrust_no): print(f"cancel: {entrust_no}") result = trader.cancel(entrust_no) - response = {"success": True, "message": result} + response = {"success": True, "data": result} return jsonify(response), 200 @@ -106,11 +106,7 @@ def get_balance(): balance = trader.get_balance() print(f"balance: {balance}") - response = { - "success": True, - "message": "Balance retrieved successfully.", - "data": balance, - } + response = {"success": True, "data": balance} return jsonify(response), 200 @@ -119,11 +115,7 @@ def get_positions(): """Get the positions of the account.""" positions = trader.get_positions() - response = { - "success": True, - "message": "Positions retrieved successfully.", - "data": positions, - } + response = {"success": True, "data": positions} return jsonify(response), 200 @@ -132,11 +124,7 @@ def get_today_trades(): """Get the today's trades of the account.""" trades = trader.get_today_trades() - response = { - "success": True, - "message": "Today's trades retrieved successfully.", - "data": trades, - } + response = {"success": True, "data": trades} return jsonify(response), 200 @@ -145,11 +133,7 @@ def get_today_entrust(): """Get the today's entrust of the account.""" entrust = trader.get_today_entrust() - response = { - "success": True, - "message": "Today's entrust retrieved successfully.", - "data": entrust, - } + response = {"success": True, "data": entrust} return jsonify(response), 200 @@ -158,10 +142,7 @@ def refresh(): """Refresh the account.""" trader.refresh() - response = { - "success": True, - "message": "Account data refreshed successfully.", - } + response = {"success": True, "data": "Account data refreshed successfully."} return jsonify(response), 200