diff --git a/.gitignore b/.gitignore index 8e94e23..b78585a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,4 @@ Thumbs.db /fs /run/* -/config/production +/deploy/config diff --git a/deploy/config/config.toml b/deploy/config/config.toml index 55048f3..d666d0e 100644 --- a/deploy/config/config.toml +++ b/deploy/config/config.toml @@ -12,29 +12,29 @@ keepAliveTimeout = "20s" # ping 超时 maxLifeTime = "2h" [etcd] -endpoints = ["10.255.172.128:7079"] +endpoints = ["10.6.0.17:7079"] username = "" password = "" [consul] -address = "10.255.172.128:8500" +address = "10.6.0.17:8500" [nats] -url = "nats://@10.255.172.128:7222" +url = "nats://@10.6.0.17:7222" [database.mysql] logMode = "info" # https://gorm.io/zh_CN/docs/connecting_to_the_database.html -mysql = { DSN = "root:123456@tcp(10.255.172.128:7306)/sig?charset=utf8&parseTime=True&loc=Local" } +mysql = { DSN = "root:123456@tcp(10.6.0.17:7306)/sig?charset=utf8&parseTime=True&loc=Local" } [database.postgres] logMode = "info" -postgres = { DSN = "host=10.255.172.128 port=5432 user=postgres password=123456 dbname=sig sslmode=disable TimeZone=Asia/Shanghai" } +postgres = { DSN = "host=10.6.0.17 port=5432 user=postgres password=123456 dbname=sig sslmode=disable TimeZone=Asia/Shanghai" } [database.clickhouse] # dsn = "clickhouse://user:password@192.168.0.137:9000/game?dial_timeout=10s&read_timeout=20s" -addr = "10.255.172.128:9000" +addr = "10.6.0.17:9000" database = "sig" username = "root" password = "123456" @@ -44,7 +44,7 @@ logsql = true logsqlCk = false [database.kvrocks] -addr = "10.255.172.128:7666" +addr = "10.6.0.17:7666" password = "" minIdleConns = 3 @@ -52,4 +52,4 @@ minIdleConns = 3 active = "victoriametrics" [tsdb.victoriametrics] -addr = "http://10.255.172.128:8428" +addr = "http://10.6.0.17:8428" diff --git a/deploy/config/exchange.toml b/deploy/config/exchange.toml index fedbaf5..195e27c 100644 --- a/deploy/config/exchange.toml +++ b/deploy/config/exchange.toml @@ -17,7 +17,8 @@ consumeBatch = 1024 consumeLater = 2000 # 时间到达later或者数据累计到batch触发consume # httpProxy = "" # httpProxy = "http://192.168.1.8:7890" -httpProxy = "http://10.255.183.209:7890" +# httpProxy = "http://10.255.183.209:7890" +httpProxy = "http://10.6.0.17:7890" # 模拟盘API交易地址如下: # REST:https://www.okx.com diff --git a/docker-compose.yml b/docker-compose.yml index 937cc8f..6aba2e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,6 @@ services: POSTGRES_DB: sig PGDATA: /var/lib/postgresql/data/pgdata volumes: - - "./config/mysql:/etc/mysql" - "./fs/postgres-data:/var/lib/postgresql/data" sig-vm: container_name: sig-vm