merged

configs/basicConfig.json

@@ -1,42 +1,45 @@
 {
-	"test": {
-		"redis": {
-			"url": "localhost:6379",
-			"password": "",
-			"index": 3,
+  "test": {
+    "redis": {
+      "url": "localhost:6379",
+      "password": "",
+      "index": 3,
       "description": ""
-		},
-		"credentialReadOnly": {
-			"secretKey": "D6D74DF9DD60A25BE2B27CA71D8F814D",
-			"baseUrl": "https://aws.okx.com",
-			"okAccessKey": "fe468418-5e40-433f-8d04-04951286d417",
-			"okAccessPassphrase": "M4pw71Id",
+    },
+    "credentialReadOnly": {
+      "secretKey": "D6D74DF9DD60A25BE2B27CA71D8F814D",
+      "baseUrl": "https://aws.okx.com",
+      "okAccessKey": "fe468418-5e40-433f-8d04-04951286d417",
+      "okAccessPassphrase": "M4pw71Id",
       "env": "realPlate",
       "ctype": "readOnly"
-		},
-		"connect": {
-			"loginSubUrl": "/users/self/verify",
-			"wsPrivateBaseUrl": "wsaws.okx.com:8443/ws/v5/private",
-			"wsPublicBaseUrl": "wsaws.okx.com:8443/ws/v5/public",
-			"restBaseUrl": "https://aws.okx.com"
-		},
-    "threads ":{
+    },
+    "connect": {
+      "loginSubUrl": "/users/self/verify",
+      "wsPrivateBaseUrl": "wsaws.okx.com:8443/ws/v5/private",
+      "wsPublicBaseUrl": "wsaws.okx.com:8443/ws/v5/public",
+      "restBaseUrl": "https://aws.okx.com"
+    },
+    "threads ": {
       "maxLenTickerStream": 512,
       "maxLenCandleStream": 1280,
-      "maxCandles":7,
-      "asyncChannels":40,
-      "maxTickers":3,
+      "maxCandles": 7,
+      "asyncChannels": 40,
+      "maxTickers": 3,
       "restPeriod": 180,
       "waitWs": 120
     }
   },
-	"stage": {
-		"redis": {
-			"url": "localhost:6379",
-			"password": "",
-			"index": 0,
+  "stage": {
+    "redis": {
+      "url": "localhost:6379",
+      "password": "",
+      "index": 0,
       "description": ""
 		},
+		"sortedSet": {
+			"length": 3000
+		},
 		"credentialReadOnly": {
 			"secretKey": "D6D74DF9DD60A25BE2B27CA71D8F814D",
 			"baseUrl": "https://aws.okx.com",
@@ -44,19 +47,20 @@
 			"okAccessPassphrase": "M4pw71Id",
       "env": "realPlate",
       "ctype": "readOnly"
-		},
-		"connect": {
-			"loginSubUrl": "/users/self/verify",
-			"wsPrivateBaseUrl": "wsaws.okx.com:8443/ws/v5/private",
-			"wsPublicBaseUrl": "wsaws.okx.com:8443/ws/v5/public",
-			"restBaseUrl": "https://aws.okx.com"
-		},
-		"focusList": [
+    },
+    "connect": {
+      "loginSubUrl": "/users/self/verify",
+      "wsPrivateBaseUrl": "wsaws.okx.com:8443/ws/v5/private",
+      "wsPublicBaseUrl": "wsaws.okx.com:8443/ws/v5/public",
+      "restBaseUrl": "https://aws.okx.com"
+    },
+    "focusList": [
       "ETH-USDT",
       "BTC-USDT",
       "OKB-USDT",
       "DOGE-USDT",
       "SOL-USDT",
+      "TRUMP-USDT",
       "DYDX-USDT"
     ],
     "softCandleSegmentList": [{
@@ -100,7 +104,7 @@
 				"seg": "4H"
 			},
 			{
-				"startTime": "2021-12-04 18:00.000",
+				"startTime": "2024-05-27 06:00.000",
 				"enabled": true,
 				"seg": "6H"
 			},
@@ -126,34 +130,34 @@
 			}
 		]
   },
-	"production": {
-		"redis": {
-			"url": "localhost:6379",
-			"password": "",
-			"index": 5
-		},
-		"credentialReadOnly": {
-			"secretKey": "D6D74DF9DD60A25BE2B27CA71D8F814D",
-			"baseUrl": "https://aws.okx.com",
-			"okAccessKey": "fe468418-5e40-433f-8d04-04951286d417",
+  "production": {
+    "redis": {
+      "url": "localhost:6379",
+      "password": "",
+      "index": 5
+    },
+    "credentialReadOnly": {
+      "secretKey": "D6D74DF9DD60A25BE2B27CA71D8F814D",
+      "baseUrl": "https://aws.okx.com",
+      "okAccessKey": "fe468418-5e40-433f-8d04-04951286d417",
       "env": "realPlate",
-			"okAccessPassphrase": "M4pw71Id",
+      "okAccessPassphrase": "M4pw71Id",
       "ctype": "readOnly"
-		},
-		"credentialMutable": {
-			"secretKey": "49F354BBEEA3D917FF190F94525ACEB7",
-			"baseUrl": "https://aws.okx.com",
-			"okAccessKey": "98afba4e-531b-4ec7-af2e-16e270b6b576",
+    },
+    "credentialMutable": {
+      "secretKey": "49F354BBEEA3D917FF190F94525ACEB7",
+      "baseUrl": "https://aws.okx.com",
+      "okAccessKey": "98afba4e-531b-4ec7-af2e-16e270b6b576",
       "env": "realPlate",
-			"okAccessPassphrase": "jitbyw-kArrac-zydva2",
+      "okAccessPassphrase": "jitbyw-kArrac-zydva2",
       "ctype": "Mutable"
-		},
-		"connect": {
-			"userId": "169408628405739520",
-			"loginSubUrl": "/users/self/verify",
-			"wsPrivateBaseUrl": "wsaws.okx.com:8443/ws/v5/private",
-			"wsPublicBaseUrl": "wsaws.okx.com:8443/ws/v5/public",
-			"restBaseUrl": "https://aws.okx.com"
-		}
-	}
+    },
+    "connect": {
+      "userId": "169408628405739520",
+      "loginSubUrl": "/users/self/verify",
+      "wsPrivateBaseUrl": "wsaws.okx.com:8443/ws/v5/private",
+      "wsPublicBaseUrl": "wsaws.okx.com:8443/ws/v5/public",
+      "restBaseUrl": "https://aws.okx.com"
+    }
+  }
 }

go.mod

@@ -4,8 +4,8 @@ go 1.21
 
 require (
 	github.com/bitly/go-simplejson v0.5.0
-	github.com/phyer/core v0.2.16
-	github.com/phyer/v5sdkgo v0.1.4
+	github.com/phyer/core v0.2.18
+	github.com/phyer/v5sdkgo v0.1.5
 	github.com/sirupsen/logrus v1.9.3
 )
 

go.sum

@@ -45,10 +45,10 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c=
 github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/phyer/core v0.2.16 h1:ssuBoL3lKe1+JkDuOSLjLB/v+MLq4nh98gbmPyOMIRM=
-github.com/phyer/core v0.2.16/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg=
-github.com/phyer/v5sdkgo v0.1.4 h1:mAxxjPJVTYGuGDarqOcFGkzj5AgqbbzJGsnYmmsbapU=
-github.com/phyer/v5sdkgo v0.1.4/go.mod h1:QCMnQFQNizOvFRPKytv50fOg/MoxS44IFcQicc4NxOg=
+github.com/phyer/core v0.2.18 h1:kgAH4FSugwZisR1yIzq4Ru+qAU13/yQLNwCooEfzWq8=
+github.com/phyer/core v0.2.18/go.mod h1:XZdniJiiZPzOU8+QHPFRQWdvJa6m5Ilj5VClWWI0OQg=
+github.com/phyer/v5sdkgo v0.1.5 h1:lscP37ZMzVj/LJcmatYbJ7VvPXQZUgDX59Fghe2381g=
+github.com/phyer/v5sdkgo v0.1.5/go.mod h1:QCMnQFQNizOvFRPKytv50fOg/MoxS44IFcQicc4NxOg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=

main.go

@@ -209,14 +209,14 @@ func LoopAllCoinsList(mdura int, barPeriod string, rge int) {
 			var ct int
 			randVal := rand.Float64()
 			switch {
-			case randVal < 0.7:
-				// 70%的概率获取最近15%的数据
+			case randVal < 0.3:
+				// 30%的概率获取最近15%的数据
 				ct = rand.Intn(rge * 15 / 100)
-			case randVal < 0.9:
+			case randVal < 0.5:
 				// 20%的概率获取最近15%~55%的数据
 				ct = rand.Intn(rge*40/100) + (rge * 15 / 100)
 			default:
-				// 10%的概率获取最近55%~100%的数据
+				// 50%的概率获取最近55%~100%的数据
 				ct = rand.Intn(rge*45/100) + (rge * 55 / 100)
 			}
 
@@ -258,57 +258,57 @@ func main() {
 	// 全员5m
 	go func() {
 		logrus.Info("LoopAllCoinsList - 5m")
-		LoopAllCoinsList(360, "5m", 20)
+		LoopAllCoinsList(300, "5m", 10220)
 	}()
 	// 全员15m candle
 	go func() {
 		logrus.Info("LoopAllCoinsList - 15m")
-		LoopAllCoinsList(720, "15m", 30)
+		LoopAllCoinsList(300, "15m", 9430)
 	}()
 	// 全员30m candle
 	go func() {
 		logrus.Info("LoopAllCoinsList - 30m")
-		LoopAllCoinsList(1200, "30m", 50)
+		LoopAllCoinsList(300, "30m", 7350)
 	}()
 	// 全员1H candle
 	go func() {
 		logrus.Info("LoopAllCoinsList - 1H")
-		LoopAllCoinsList(1800, "1H", 60)
+		LoopAllCoinsList(300, "1H", 4300)
 	}()
 	// 全员2H candle
 	go func() {
 		logrus.Info("LoopAllCoinsList - 2H")
-		LoopAllCoinsList(2400, "2H", 80)
+		LoopAllCoinsList(300, "2H", 4080)
 	}()
 	// 全员4小时candle
 	go func() {
 		logrus.Info("LoopAllCoinsList - 4H")
-		LoopAllCoinsList(3000, "4H", 100)
+		LoopAllCoinsList(300, "4H", 4100)
 	}()
 	// 全员6小时candle
 	go func() {
 		logrus.Info("LoopAllCoinsList - 6H")
-		LoopAllCoinsList(3600, "6H", 120)
+		LoopAllCoinsList(360, "6H", 3120)
 	}()
 	// 全员12小时candle
 	go func() {
 		logrus.Info("LoopAllCoinsList - 12H")
-		LoopAllCoinsList(4200, "12H", 160)
+		LoopAllCoinsList(360, "12H", 3160)
 	}()
 	// 全员1Day candle & maX
 	go func() {
 		logrus.Info("LoopAllCoinsList - 1D")
-		LoopAllCoinsList(4800, "1D", 180)
+		LoopAllCoinsList(400, "1D", 2180)
 	}()
 	// 全员2Day candle & maX
 	go func() {
 		logrus.Info("LoopAllCoinsList - 2D")
-		LoopAllCoinsList(6000, "2D", 220)
+		LoopAllCoinsList(400, "2D", 1220)
 	}()
 	// 全员5Day candle & maX
 	go func() {
 		logrus.Info("LoopAllCoinsList - 5D")
-		LoopAllCoinsList(7200, "5D", 240)
+		LoopAllCoinsList(420, "5D", 1240)
 	}()
 	go func() {
 		LoopSaveCandle(&cr)