Model调整

Binance.SDK.Test/Binance.SDK.Test.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Binance.Net" Version="8.0.1" />
+  </ItemGroup>
+
+</Project>

Binance.SDK.Test/Program.cs

@@ -0,0 +1,27 @@
+using Binance.Net.Clients;
+using Binance.Net.Objects;
+using CryptoExchange.Net.Authentication;
+using System;
+
+namespace Binance.SDK.Test
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            var apiKey = "muiZ1IA2sPMQ2m0YFPubEvZepjzn2nxeuPHqQ6mejKVXljYDQTOIYbm22NlXxKcv";
+            var apiSecret = "3Clur3D1hDeZYhtVSJzPBiEBb7S0ktC8WpaRQ3F7ysQe55kbsPTBZ6U4X9XsX4Ww";
+            var client = new BinanceClient(new BinanceClientOptions()
+            {
+                UsdFuturesApiOptions = new BinanceApiClientOptions()
+                {
+                    BaseAddress = "https://fapi.binance.com",
+                    ApiCredentials = new ApiCredentials(apiKey, apiSecret)
+                }
+            });
+
+            var result = client.UsdFuturesApi.Account.GetBalancesAsync().Result;
+            Console.WriteLine(result);
+        }
+    }
+}

Binance.SDK/BinanceContractTest.cs

@@ -8,18 +8,7 @@ namespace Binance.SDK
     {
         public BinanceContractTest()
         {
-            var apiKey = "muiZ1IA2sPMQ2m0YFPubEvZepjzn2nxeuPHqQ6mejKVXljYDQTOIYbm22NlXxKcv";
-            var apiSecret = "3Clur3D1hDeZYhtVSJzPBiEBb7S0ktC8WpaRQ3F7ysQe55kbsPTBZ6U4X9XsX4Ww";
-            var client = new BinanceClient(new BinanceClientOptions()
-            {
-                UsdFuturesApiOptions = new BinanceApiClientOptions()
-                {
-                    BaseAddress = "https://fapi.binance.com",
-                    ApiCredentials = new ApiCredentials(apiKey, apiSecret)
-                }
-            });
            
-            var result = client.UsdFuturesApi.Trading.GetOrderAsync("ETHUSDT");
         }
     }
 }

Binance.TradeRobot.API.sln

@@ -16,7 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Binance.SDK", "Binance.SDK\Binance.SDK.csproj", "{8B84B654-82D9-42C0-AF0C-5C78CE916253}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Binance.SDK", "Binance.SDK\Binance.SDK.csproj", "{8B84B654-82D9-42C0-AF0C-5C78CE916253}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Binance.SDK.Test", "Binance.SDK.Test\Binance.SDK.Test.csproj", "{52E20E47-2605-48A8-B09C-1C61194502F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -44,6 +46,10 @@ Global
 		{8B84B654-82D9-42C0-AF0C-5C78CE916253}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B84B654-82D9-42C0-AF0C-5C78CE916253}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B84B654-82D9-42C0-AF0C-5C78CE916253}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52E20E47-2605-48A8-B09C-1C61194502F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52E20E47-2605-48A8-B09C-1C61194502F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52E20E47-2605-48A8-B09C-1C61194502F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52E20E47-2605-48A8-B09C-1C61194502F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Binance.TradeRobot.Model/Base/Enums.cs

@@ -4,20 +4,6 @@ namespace Binance.TradeRobot.Model.Base
 {
     public class Enums
     {
-        #region 基本
-        public enum BusinessType
-        {
-            /// <summary>
-            /// 现货
-            /// </summary>
-            Spot = 0,
-            /// <summary>
-            /// 合约
-            /// </summary>
-            Prep = 1
-        }
-
-        #endregion
 
         #region 用户资金
         /// <summary>
@@ -50,6 +36,25 @@ namespace Binance.TradeRobot.Model.Base
         #endregion
 
         #region 机器人
+        /// <summary>
+        /// 业务类型 币币=0,逐仓杠杆=1,U本位合约=2
+        /// </summary>
+        public enum BusinessType
+        {
+            /// <summary>
+            /// 币币
+            /// </summary>
+            Spot = 0,
+            /// <summary>
+            /// 逐仓杠杆
+            /// </summary>
+            Spot_Margin = 1,
+            /// <summary>
+            /// U本位合约
+            /// </summary>
+            UPrep = 2
+        }
+
         /// <summary>
         /// 机器人状态 Stop=0,Runing=1
         /// </summary>
@@ -58,6 +63,39 @@ namespace Binance.TradeRobot.Model.Base
             Stop = 0,
             Runing = 1
         }
+
+        /// <summary>
+        /// 交易策略 动量趋势v2=2,金字塔=11
+        /// </summary>
+        public enum TradePolicy
+        {
+            动量趋势v2 = 2,
+
+
+            金字塔 = 11
+        }
+
+        /// <summary>
+        /// 信号周期 1m=0,3m=1,5m=2,15m=3,30m=4,1h=5,2h=6,4h=7,6h=8,8h=9,12h=10,1d=11,3d=12,1w=13,1M=14
+        /// </summary>
+        public enum SignalPeriod
+        {
+            _1m,
+            _3m,
+            _5m,
+            _15m,
+            _30m,
+            _1h,
+            _2h,
+            _4h,
+            _6h,
+            _8h,
+            _12h,
+            _1d,
+            _3d,
+            _1w,
+            _1M
+        }
         #endregion
     }
 }

Binance.TradeRobot.Model/Binance.TradeRobot.Model.csproj

@@ -12,4 +12,8 @@
     <PackageReference Include="FreeSql" Version="3.0.100" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Dto\Request\Robot\" />
+  </ItemGroup>
+
 </Project>

Binance.TradeRobot.Model/Binance.TradeRobot.Model.xml

@@ -14,16 +14,6 @@
             错误代码
             </summary>
         </member>
-        <member name="F:Binance.TradeRobot.Model.Base.Enums.BusinessType.Spot">
-            <summary>
-            现货
-            </summary>
-        </member>
-        <member name="F:Binance.TradeRobot.Model.Base.Enums.BusinessType.Prep">
-            <summary>
-            合约
-            </summary>
-        </member>
         <member name="T:Binance.TradeRobot.Model.Base.Enums.CapitalChangeType">
             <summary>
             资金变更类型 追投=0,提现=1,转移=2
@@ -49,11 +39,46 @@
             资金方向 转入=0,转出=1
             </summary>
         </member>
+        <member name="T:Binance.TradeRobot.Model.Base.Enums.BusinessType">
+            <summary>
+            业务类型 现货-币币=0,现货-逐仓杠杆=1,U本位合约=2
+            </summary>
+        </member>
+        <member name="F:Binance.TradeRobot.Model.Base.Enums.BusinessType.Spot">
+            <summary>
+            现货-币币
+            </summary>
+        </member>
+        <member name="F:Binance.TradeRobot.Model.Base.Enums.BusinessType.Spot_Margin">
+            <summary>
+            现货-逐仓杠杆
+            </summary>
+        </member>
+        <member name="F:Binance.TradeRobot.Model.Base.Enums.BusinessType.UPrep">
+            <summary>
+            U本位合约
+            </summary>
+        </member>
         <member name="T:Binance.TradeRobot.Model.Base.Enums.RobotStatus">
             <summary>
             机器人状态 Stop=0,Runing=1
             </summary>
         </member>
+        <member name="T:Binance.TradeRobot.Model.Base.Enums.TradePolicy">
+            <summary>
+            交易策略 动量趋势v2=2,金字塔=11
+            </summary>
+        </member>
+        <member name="T:Binance.TradeRobot.Model.Base.Enums.SignalPeriod">
+            <summary>
+            信号周期 1m=0,3m=1,5m=2,15m=3,30m=4,1h=5,2h=6,4h=7,6h=8,8h=9,12h=10,1d=11,3d=12,1w=13,1M=14
+            </summary>
+        </member>
+        <member name="P:Binance.TradeRobot.Model.Db.Robot.RunningTime">
+            <summary>
+            运行时长(s)
+            </summary>
+        </member>
         <member name="P:Binance.TradeRobot.Model.Db.User.CostAmount">
             <summary>
             投资本金

Binance.TradeRobot.Model/Db/Exchange/ExchangeAPIKey.cs

@@ -0,0 +1,31 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace Binance.TradeRobot.Model.Db
+{
+
+    [Table(DisableSyncStructure = true)]
+	public partial class ExchangeAPIKey {
+
+		[Column(IsPrimary = true)]
+		public long Id { get; set; }
+
+		/// <summary>
+		///  交易所账号Id
+		/// </summary>
+		public long AccountId { get; set; }
+
+		[Column(StringLength = 100, IsNullable = false)]
+		public string APIKey { get; set; }
+
+		[Column(InsertValueSql = "getdate()")]
+		public DateTime CreateTime { get; set; }
+
+		public long? RobotId { get; set; }
+
+		[Column(StringLength = 100, IsNullable = false)]
+		public string SecretKey { get; set; }
+
+	}
+
+}

Binance.TradeRobot.Model/Db/Exchange/ExchangeAccount.cs

@@ -0,0 +1,37 @@
+using Binance.TradeRobot.Model.Base;
+using FreeSql.DataAnnotations;
+using System;
+
+namespace Binance.TradeRobot.Model.Db
+{
+
+    [Table(DisableSyncStructure = true)]
+    public partial class ExchangeAccount
+    {
+
+        [Column(IsPrimary = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public int BusinessType { get; set; }
+
+        [Column(InsertValueSql = "getdate()")]
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 账号登录名
+        /// </summary>
+        [Column(StringLength = 50, IsNullable = false)]
+        public string LoginName { get; set; }
+
+        /// <summary>
+        /// 交易策略
+        /// </summary>
+        [Column(MapType = typeof(int))]
+        public Enums.TradePolicy TradePolicy { get; set; }
+
+    }
+
+}

Binance.TradeRobot.Model/Db/Policy/UPrep/PyramidPolicy.cs

@@ -0,0 +1,19 @@
+using Binance.TradeRobot.Model.Base;
+using FreeSql.DataAnnotations;
+
+namespace Binance.TradeRobot.Model.Db
+{
+    [Table(DisableSyncStructure = true)]
+    public partial class PyramidPolicy
+    {
+
+        [Column(IsPrimary = true)]
+        public long Id { get; set; }
+
+        [Column(MapType = typeof(int))]
+        public Enums.SignalPeriod SignalPeriod { get; set; }
+
+        public long RobotId { get; set; }
+    }
+
+}

Binance.TradeRobot.Model/Db/Robot/Robot.cs

@@ -0,0 +1,37 @@
+using Binance.TradeRobot.Model.Base;
+using FreeSql.DataAnnotations;
+using System;
+
+namespace Binance.TradeRobot.Model.Db
+{
+
+    [Table(DisableSyncStructure = true)]
+    public partial class Robot
+    {
+
+        [Column(IsPrimary = true)]
+        public long Id { get; set; }
+
+        [Column(InsertValueSql = "getdate()")]
+        public DateTime CreateTime { get; set; }
+
+        [Column(MapType = (typeof(int)))]
+        public Enums.TradePolicy TradePolicy { get; set; }
+
+        /// <summary>
+        /// 运行时长(s)
+        /// </summary>
+        public long RunningTime { get; set; } = 0;
+
+        [Column(MapType = (typeof(int)))]
+        public Enums.RobotStatus State { get; set; }
+
+        [Column(StringLength = 50, IsNullable = false)]
+        public string Symbol { get; set; }
+
+        [Column(MapType = (typeof(int)))]
+        public Enums.BusinessType BusinessType { get; set; }
+
+    }
+
+}

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=.;initial catalog=Binance.TradeRobot.DB;User Id=sa;Password=pc911103;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 "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"