diff --git a/Binance.TradeRobot.API/Binance.TradeRobot.API.csproj b/Binance.TradeRobot.API/Binance.TradeRobot.API.csproj index e433554..00d2ea8 100644 --- a/Binance.TradeRobot.API/Binance.TradeRobot.API.csproj +++ b/Binance.TradeRobot.API/Binance.TradeRobot.API.csproj @@ -12,6 +12,7 @@ + diff --git a/Binance.TradeRobot.API/Startup.cs b/Binance.TradeRobot.API/Startup.cs index ccd5fc5..dde2531 100644 --- a/Binance.TradeRobot.API/Startup.cs +++ b/Binance.TradeRobot.API/Startup.cs @@ -34,7 +34,7 @@ namespace Binance.TradeRobot.API services.AddSingleton(); services.AddSingleton(); - var fsql = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.SqlServer, Configuration.GetConnectionString("DB")).Build(); + var fsql = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("DB")).Build(); services.AddSingleton(typeof(IFreeSql), fsql); var idOption = new IdGeneratorOptions(1); diff --git a/Binance.TradeRobot.API/appsettings.json b/Binance.TradeRobot.API/appsettings.json index f52a8dd..b320ffb 100644 --- a/Binance.TradeRobot.API/appsettings.json +++ b/Binance.TradeRobot.API/appsettings.json @@ -9,7 +9,8 @@ "AllowedHosts": "*", "ConnectionStrings": { //"DB": "Data Source=192.168.201.44;Initial Catalog=HY.TradingRobot.DB;User ID=sa;Pwd=kaicn1132+-;" - "DB": "Data Source=.;Initial Catalog=Binance.TradeRobot.DB;User ID=sa;Pwd=pc911103;Encrypt=True; TrustServerCertificate=True;" + //"DB": "Data Source=.;Initial Catalog=Binance.TradeRobot.DB;User ID=sa;Pwd=pc911103;Encrypt=True; TrustServerCertificate=True;" + "DB": "data source=47.245.58.112;port=3306;user id=sa;password=rYn6re2AKhcDWcBi;initial catalog=tradedb;charset=utf8;sslmode=none;" }, "JwtConfig": { "Secret": "heyitraderobot11", diff --git a/Binance.TradeRobot.Business/Binance.TradeRobot.Business.csproj b/Binance.TradeRobot.Business/Binance.TradeRobot.Business.csproj index 9b7bcf1..da07f3a 100644 --- a/Binance.TradeRobot.Business/Binance.TradeRobot.Business.csproj +++ b/Binance.TradeRobot.Business/Binance.TradeRobot.Business.csproj @@ -9,6 +9,7 @@ + diff --git a/Binance.TradeRobot.Business/Business/ExchangeBusiness.cs b/Binance.TradeRobot.Business/Business/ExchangeBusiness.cs index ca0b772..15fa929 100644 --- a/Binance.TradeRobot.Business/Business/ExchangeBusiness.cs +++ b/Binance.TradeRobot.Business/Business/ExchangeBusiness.cs @@ -34,7 +34,6 @@ namespace Binance.TradeRobot.Business.Exchange var exchangeAccount = addExchangeAccountRequest.Map(); exchangeAccount.BusinessType = addExchangeAccountRequest.TradePolicy.GetBusinessType(); - var exchangeAPIKey = new ExchangeAPIKey() { Id = idGenerator.NewLong(), diff --git a/Binance.TradeRobot.Model/Db/Exchange/ExchangeAPIKey.cs b/Binance.TradeRobot.Model/Db/Exchange/ExchangeAPIKey.cs index 3f61ea6..2339f66 100644 --- a/Binance.TradeRobot.Model/Db/Exchange/ExchangeAPIKey.cs +++ b/Binance.TradeRobot.Model/Db/Exchange/ExchangeAPIKey.cs @@ -4,24 +4,26 @@ using System; namespace Binance.TradeRobot.Model.Db { - [Table(DisableSyncStructure = true)] + [Table(DisableSyncStructure = true, Name = "exchangeapikey")] public partial class ExchangeAPIKey { - [Column(IsPrimary = true)] + [Column(IsPrimary = true, DbType = "bigint")] public long Id { get; set; } /// /// 交易所账号Id /// + [Column(DbType = "bigint")] public long AccountId { get; set; } [Column(StringLength = 100, IsNullable = false)] public string APIKey { get; set; } - [Column(InsertValueSql = "getdate()")] + [Column(DbType = "datetime")] public DateTime CreateTime { get; set; } + [Column(DbType = "bigint")] public long? RobotId { get; set; } [Column(StringLength = 100, IsNullable = false)] diff --git a/Binance.TradeRobot.Model/Db/Exchange/ExchangeAccount.cs b/Binance.TradeRobot.Model/Db/Exchange/ExchangeAccount.cs index fe5d9ad..d04fced 100644 --- a/Binance.TradeRobot.Model/Db/Exchange/ExchangeAccount.cs +++ b/Binance.TradeRobot.Model/Db/Exchange/ExchangeAccount.cs @@ -5,11 +5,15 @@ using System; namespace Binance.TradeRobot.Model.Db { - [Table(DisableSyncStructure = true)] + [Table(DisableSyncStructure = true, Name = "exchangeaccount")] public partial class ExchangeAccount { + public ExchangeAccount() + { + CreateTime = DateTime.Now; + } - [Column(IsPrimary = true)] + [Column(DbType = "bigint", IsPrimary = true)] public long Id { get; set; } /// @@ -18,7 +22,7 @@ namespace Binance.TradeRobot.Model.Db [Column(MapType = typeof(int))] public Enums.BusinessType BusinessType { get; set; } - [Column(InsertValueSql = "getdate()")] + [Column(DbType = "datetime")] public DateTime CreateTime { get; set; } /// diff --git a/Binance.TradeRobot.Model/Db/代码生成/Exchangeaccount.cs b/Binance.TradeRobot.Model/Db/代码生成/Exchangeaccount.cs new file mode 100644 index 0000000..c40d8c8 --- /dev/null +++ b/Binance.TradeRobot.Model/Db/代码生成/Exchangeaccount.cs @@ -0,0 +1,32 @@ +using FreeSql.DatabaseModel;using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; +using Newtonsoft.Json; +using FreeSql.DataAnnotations; + +namespace Binance.TradeRobot.Model.Db { + + [JsonObject(MemberSerialization.OptIn), Table(Name = "exchangeaccount", DisableSyncStructure = true)] + public partial class Exchangeaccount { + + [JsonProperty, Column(DbType = "bigint", IsPrimary = true)] + public long Id { get; set; } + + [JsonProperty, Column(DbType = "int")] + public int? BusinessType { get; set; } + + [JsonProperty, Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + [JsonProperty, Column(StringLength = 50)] + public string LoginName { get; set; } + + [JsonProperty, Column(DbType = "int")] + public int? TradePolicy { get; set; } + + } + +} diff --git a/Binance.TradeRobot.Model/Db/代码生成/Exchangeapikey.cs b/Binance.TradeRobot.Model/Db/代码生成/Exchangeapikey.cs new file mode 100644 index 0000000..93f46a5 --- /dev/null +++ b/Binance.TradeRobot.Model/Db/代码生成/Exchangeapikey.cs @@ -0,0 +1,35 @@ +using FreeSql.DatabaseModel;using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; +using Newtonsoft.Json; +using FreeSql.DataAnnotations; + +namespace Binance.TradeRobot.Model.Db { + + [JsonObject(MemberSerialization.OptIn), Table(Name = "exchangeapikey", DisableSyncStructure = true)] + public partial class Exchangeapikey { + + [JsonProperty, Column(DbType = "bigint", IsPrimary = true)] + public long Id { get; set; } + + [JsonProperty, Column(DbType = "bigint")] + public long AccountId { get; set; } + + [JsonProperty, Column(StringLength = 100, IsNullable = false)] + public string APIKey { get; set; } + + [JsonProperty, Column(DbType = "datetime")] + public DateTime CreateTime { get; set; } + + [JsonProperty, Column(DbType = "bigint")] + public long? RobotId { get; set; } + + [JsonProperty, Column(StringLength = 100, IsNullable = false)] + public string SecretKey { get; set; } + + } + +} diff --git a/Binance.TradeRobot.Model/Db/代码生成/__重新生成.bat b/Binance.TradeRobot.Model/Db/代码生成/__重新生成.bat index 9a24191..90a629a 100644 --- a/Binance.TradeRobot.Model/Db/代码生成/__重新生成.bat +++ b/Binance.TradeRobot.Model/Db/代码生成/__重新生成.bat @@ -1 +1 @@ -FreeSql.Generator -Razor 1 -NameOptions 1,0,0,0 -NameSpace Binance.TradeRobot.Model.Db -DB "SqlServer,data source=18.179.56.42;initial catalog=Binance.TradeRobot.DB;User Id=sa;Password=kaicn1132+-;TrustServerCertificate=true;pooling=true;max pool size=2" -FileName "{name}.cs" +FreeSql.Generator -Razor 1 -NameOptions 1,0,0,0 -NameSpace Binance.TradeRobot.Model.Db -DB "MySql,data source=47.245.58.112;port=3306;user id=sa;password=rYn6re2AKhcDWcBi;initial catalog=tradedb;charset=utf8;sslmode=none;max pool size=2" -FileName "{name}.cs"