trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #38 from JackTerok/develop 

Bugfixes
This commit is contained in:
HojouFotytu 2019-01-13 22:07:50 +09:00 committed by GitHub
parent 517df7aae8 17ff9a9203
commit d657ca9e68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/DataObjects/ProfitTrailerData.cs
View File

@ -25,9 +25,11 @@ namespace Core.Main.DataObjects
public ProfitTrailerData(PTMagicConfiguration systemConfiguration) public ProfitTrailerData(PTMagicConfiguration systemConfiguration)
{ {
_systemConfiguration = systemConfiguration;
string html = ""; string html = "";
string url = systemConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL + "api/data?token=" + systemConfiguration.GeneralSettings.Application.ProfitTrailerServerAPIToken; string url = systemConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL + "api/data?token=" + systemConfiguration.GeneralSettings.Application.ProfitTrailerServerAPIToken;
try try
{ {
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);

8
Core/Main/PTMagic.cs
View File

@ -609,8 +609,8 @@ namespace Core.Main
{ {
bool result = true; bool result = true;
//Import Initial ProfitTrailer Information //Import Initial ProfitTrailer Information(Deactivated for now)
SettingsAPI.GetInitialProfitTrailerSettings(this.PTMagicConfiguration); //SettingsAPI.GetInitialProfitTrailerSettings(this.PTMagicConfiguration);
// Check for valid default setting // Check for valid default setting
GlobalSetting defaultSetting = this.PTMagicConfiguration.AnalyzerSettings.GlobalSettings.Find(s => s.SettingName.Equals("default", StringComparison.InvariantCultureIgnoreCase)); GlobalSetting defaultSetting = this.PTMagicConfiguration.AnalyzerSettings.GlobalSettings.Find(s => s.SettingName.Equals("default", StringComparison.InvariantCultureIgnoreCase));
@ -963,8 +963,8 @@ namespace Core.Main
private void ValidateSettings() private void ValidateSettings()
{ {
//Reimport Initial ProfitTrailer Information //Reimport Initial ProfitTrailer Information(Deactivated for now)
SettingsAPI.GetInitialProfitTrailerSettings(this.PTMagicConfiguration); //SettingsAPI.GetInitialProfitTrailerSettings(this.PTMagicConfiguration);
// Check for a valid exchange // Check for a valid exchange
if (this.PTMagicConfiguration.GeneralSettings.Application.Exchange == null) if (this.PTMagicConfiguration.GeneralSettings.Application.Exchange == null)

2
Monitor/wwwroot/assets/js/waves.js
View File

File diff suppressed because one or more lines are too long

2
PTMagic/Program.cs
View File

@ -7,7 +7,7 @@ using Core.Helper;
using Core.Main.DataObjects.PTMagicData; using Core.Main.DataObjects.PTMagicData;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
[assembly: AssemblyVersion("2.0.6")] [assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyProduct("PT Magic")] [assembly: AssemblyProduct("PT Magic")]
namespace PTMagic namespace PTMagic

4
_Development/DevSettings/settings.general.json
View File

@ -8,6 +8,10 @@
"ProfitTrailerServerAPIToken": "", //Your Profit Trailer Server API Token "ProfitTrailerServerAPIToken": "", //Your Profit Trailer Server API Token
"ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above) "ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above)
"ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above) "ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above)
"Exchange": "Bittrex", // The exchange your are running Profit Trailer on
"StartBalance": 0, // The balance you had in your wallet when you started working with Profit Trailer
"TimezoneOffset": "+0:00", // Your timezone offset from UTC time
"MainFiatCurrency": "USD", // Your main fiat currency that will be used in the monitor
"AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting "AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting
"FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute "FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute
"InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them "InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them