diff --git a/artifact/package.json b/artifact/package.json index 6d1c460c4..9a7314f7a 100644 --- a/artifact/package.json +++ b/artifact/package.json @@ -5,7 +5,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Kungfu Trader Artifact", "license": "Apache-2.0", "private": true, @@ -22,12 +22,12 @@ "cli": "yarn kfs craft cli" }, "dependencies": { - "@kungfu-trader/kfx-broker-sim": "^2.4.75", - "@kungfu-trader/kfx-broker-xtp-demo": "^2.4.75", - "@kungfu-trader/kungfu-app": "^2.4.75", - "@kungfu-trader/kungfu-cli": "^2.4.75", - "@kungfu-trader/kungfu-core": "^2.4.75", - "@kungfu-trader/kungfu-sdk": "^2.4.75" + "@kungfu-trader/kfx-broker-sim": "^2.4.76-alpha.0", + "@kungfu-trader/kfx-broker-xtp-demo": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-app": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-cli": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-core": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0" }, "repository": { "url": "https://github.com/kungfu-trader/kungfu.git" diff --git a/developer/sdk/package.json b/developer/sdk/package.json index e8873b4ff..ddf085d3e 100644 --- a/developer/sdk/package.json +++ b/developer/sdk/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "SDK for developing Kungfu Applications", "license": "Apache-2.0", "main": "src/index.js", @@ -34,10 +34,10 @@ "format": "prettier -l -w --config ../../framework/core/.prettierrc.js ." }, "dependencies": { - "@kungfu-trader/kungfu-app": "^2.4.75", - "@kungfu-trader/kungfu-cli": "^2.4.75", - "@kungfu-trader/kungfu-core": "^2.4.75", - "@kungfu-trader/kungfu-js-api": "^2.4.75", - "@kungfu-trader/kungfu-toolchain": "^2.4.75" + "@kungfu-trader/kungfu-app": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-cli": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-core": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-js-api": "^2.4.76-alpha.0", + "@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0" } } diff --git a/developer/toolchain/package.json b/developer/toolchain/package.json index c0366914f..1e88fe502 100644 --- a/developer/toolchain/package.json +++ b/developer/toolchain/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Toolchain for Kungfu Development (babel/cmake-js/node-gyp/webpack/yarn/etc).", "license": "Apache-2.0", "main": "package.json", diff --git a/examples/assemble-python/package.json b/examples/assemble-python/package.json index 83a4767cd..6471a2afe 100644 --- a/examples/assemble-python/package.json +++ b/examples/assemble-python/package.json @@ -1,7 +1,7 @@ { "name": "@kungfu-trader/examples-assemble-python", "author": "kungfu-trader", - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "KungFu Example Assemble Python", "license": "Apache-2.0", "private": true, @@ -13,6 +13,6 @@ "read_bytes": "kfc -l debug assemble src/json/read_bytes_10026.json" }, "devDependencies": { - "@kungfu-trader/kungfu-sdk": "^2.4.75" + "@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0" } } diff --git a/examples/strategy-cpp-101/package.json b/examples/strategy-cpp-101/package.json index 565e426ea..430c495b3 100644 --- a/examples/strategy-cpp-101/package.json +++ b/examples/strategy-cpp-101/package.json @@ -1,7 +1,7 @@ { "name": "@kungfu-trader/examples-strategy-cpp", "author": "kungfu-trader", - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "KungFu Strategy 101 - C++ Demo", "license": "Apache-2.0", "private": true, @@ -15,7 +15,7 @@ "format": "node ../../framework/core/.gyp/run-format-cpp.js src" }, "devDependencies": { - "@kungfu-trader/kungfu-sdk": "^2.4.75" + "@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0" }, "repository": { "url": "https://github.com/kungfu-trader/kungfu.git" diff --git a/examples/strategy-cpp-exe/package.json b/examples/strategy-cpp-exe/package.json index 21b51c2e0..80850a4bb 100644 --- a/examples/strategy-cpp-exe/package.json +++ b/examples/strategy-cpp-exe/package.json @@ -1,7 +1,7 @@ { "name": "@kungfu-trader/examples-strategy-cpp-exe", "author": "kungfu-trader", - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "KungFu Strategy 101 - C++ Demo", "license": "Apache-2.0", "private": true, @@ -23,7 +23,7 @@ "cached": "kfc -l debug run -c system -g service -n cached" }, "devDependencies": { - "@kungfu-trader/kungfu-sdk": "^2.4.75" + "@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0" }, "repository": { "url": "https://github.com/kungfu-trader/kungfu.git" diff --git a/examples/strategy-python-101/package.json b/examples/strategy-python-101/package.json index a324f224d..2f549709f 100644 --- a/examples/strategy-python-101/package.json +++ b/examples/strategy-python-101/package.json @@ -1,7 +1,7 @@ { "name": "@kungfu-trader/examples-strategy-python", "author": "kungfu-trader", - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "KungFu Strategy 101 - Python Demo", "license": "Apache-2.0", "private": true, @@ -15,7 +15,7 @@ "format": "node ../../framework/core/.gyp/run-format-python.js src" }, "devDependencies": { - "@kungfu-trader/kungfu-sdk": "^2.4.75" + "@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0" }, "repository": { "url": "https://github.com/kungfu-trader/kungfu.git" diff --git a/extensions/sim/package.json b/extensions/sim/package.json index e2a0d9bbb..502db6fa1 100644 --- a/extensions/sim/package.json +++ b/extensions/sim/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Kungfu Extension - SIM", "license": "Apache-2.0", "main": "package.json", @@ -29,10 +29,10 @@ "package": "kfs project package" }, "dependencies": { - "@kungfu-trader/kungfu-core": "^2.4.75" + "@kungfu-trader/kungfu-core": "^2.4.76-alpha.0" }, "devDependencies": { - "@kungfu-trader/kungfu-sdk": "^2.4.75" + "@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0" }, "kungfuBuild": { "python": { diff --git a/extensions/xtp/package.json b/extensions/xtp/package.json index e58e8caa7..35763ffb0 100644 --- a/extensions/xtp/package.json +++ b/extensions/xtp/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Kungfu Extension - XTP Demo", "license": "Apache-2.0", "main": "package.json", @@ -29,10 +29,10 @@ "package": "kfs project package" }, "dependencies": { - "@kungfu-trader/kungfu-core": "^2.4.75" + "@kungfu-trader/kungfu-core": "^2.4.76-alpha.0" }, "devDependencies": { - "@kungfu-trader/kungfu-sdk": "^2.4.75" + "@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0" }, "kungfuDependencies": { "xtp": "v2.2.32.2" diff --git a/framework/api/package.json b/framework/api/package.json index 19df4c91b..7879c2209 100644 --- a/framework/api/package.json +++ b/framework/api/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Kungfu Javascript/Typescript API", "license": "Apache-2.0", "repository": { @@ -31,7 +31,7 @@ "format": "prettier -l -w --config ../core/.prettierrc.js ." }, "dependencies": { - "@kungfu-trader/kungfu-core": "^2.4.75", + "@kungfu-trader/kungfu-core": "^2.4.76-alpha.0", "cfonts": "^2.10.0", "chalk": "^4.1.0", "fast-csv": "^4.3.5", diff --git a/framework/app/package.json b/framework/app/package.json index 977d62495..63e18ca7d 100644 --- a/framework/app/package.json +++ b/framework/app/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Kungfu App Framework", "license": "Apache-2.0", "repository": { @@ -31,7 +31,7 @@ "format": "prettier -l -w --config ../core/.prettierrc.js ." }, "dependencies": { - "@kungfu-trader/kungfu-js-api": "^2.4.75", + "@kungfu-trader/kungfu-js-api": "^2.4.76-alpha.0", "ant-design-vue": "^3.2.16", "core-js": "^3.20.0", "iconv-lite": "^0.6.3", @@ -42,7 +42,7 @@ "vue": "^3.2.34" }, "devDependencies": { - "@kungfu-trader/kungfu-toolchain": "^2.4.75", + "@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0", "@types/markdown-it": "^12.2.3", "electron": "19.1.8", "webpack-bundle-analyzer": "^4.6.1" diff --git a/framework/cli/package.json b/framework/cli/package.json index 55a9ef806..d001ec7de 100644 --- a/framework/cli/package.json +++ b/framework/cli/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Kungfu App Framework", "license": "Apache-2.0", "repository": { @@ -33,14 +33,14 @@ "format": "prettier -l -w --config ../core/.prettierrc.js ." }, "dependencies": { - "@kungfu-trader/kungfu-js-api": "^2.4.75", + "@kungfu-trader/kungfu-js-api": "^2.4.76-alpha.0", "blessed": "^0.1.81", "core-js": "^3.20.0" }, "devDependencies": { "@babel/core": "^7.0.0", "@babel/polyfill": "^7.12.1", - "@kungfu-trader/kungfu-toolchain": "^2.4.75", + "@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0", "@types/blessed": "^0.1.19", "colors": "^1.4.0", "commander": "^9.0.0", diff --git a/framework/core/package.json b/framework/core/package.json index 1393dbf6d..e46653bd5 100644 --- a/framework/core/package.json +++ b/framework/core/package.json @@ -4,7 +4,7 @@ "name": "Kungfu Trader", "email": "info@kungfu.link" }, - "version": "2.4.75", + "version": "2.4.76-alpha.0", "description": "Kungfu Core Library", "license": "Apache-2.0", "main": "lib/index.js", @@ -70,7 +70,7 @@ "sywac": "^1.3.0" }, "devDependencies": { - "@kungfu-trader/kungfu-toolchain": "^2.4.75", + "@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0", "@kungfu-trader/libnode": "16.15.0", "cmake-js": "^7.0.0", "electron": "19.1.8", diff --git a/framework/core/src/include/kungfu/common.h b/framework/core/src/include/kungfu/common.h index 74fbc4df1..abb308ff4 100644 --- a/framework/core/src/include/kungfu/common.h +++ b/framework/core/src/include/kungfu/common.h @@ -347,7 +347,7 @@ template struct data { auto accessor = boost::hana::second(it); j[name.c_str()] = accessor(*reinterpret_cast(this)); }); - return j.dump(); + return j.dump(-1, ' ', false, nlohmann::json::basic_json::error_handler_t::replace); } explicit operator std::string() const { return to_string(); } diff --git a/lerna.json b/lerna.json index 184766ab6..e14e4faee 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.75", + "version": "2.4.76-alpha.0", "packages": [ "framework/*", "developer/*",