Commit 8fa1f3ad authored by 贾浩@五瓣科技's avatar 贾浩@五瓣科技

update env

parent 9ea2814f
...@@ -2,6 +2,7 @@ package dao ...@@ -2,6 +2,7 @@ package dao
import ( import (
"fmt" "fmt"
"os"
"sdk_api/config" "sdk_api/config"
dbModel "sdk_api/model/db" dbModel "sdk_api/model/db"
"time" "time"
...@@ -55,9 +56,13 @@ func New(_c *config.Config) (dao *Dao, err error) { ...@@ -55,9 +56,13 @@ func New(_c *config.Config) (dao *Dao, err error) {
sqlDB.SetMaxOpenConns(_c.PGSQL.MaxConn) sqlDB.SetMaxOpenConns(_c.PGSQL.MaxConn)
sqlDB.SetMaxIdleConns(_c.PGSQL.MaxIdleConn) sqlDB.SetMaxIdleConns(_c.PGSQL.MaxIdleConn)
sqlDB.SetConnMaxIdleTime(time.Hour) sqlDB.SetConnMaxIdleTime(time.Hour)
err = dao.db.AutoMigrate(&dbModel.User{}, &dbModel.Active{}, &dbModel.ChatGroup{})
if err != nil { migrate := os.Getenv("MIGRATE")
return if migrate == "true" {
err = dao.db.AutoMigrate(&dbModel.User{}, &dbModel.Active{}, &dbModel.ChatGroup{})
if err != nil {
return
}
} }
err = dao.addTestGroup() err = dao.addTestGroup()
......
...@@ -12,7 +12,8 @@ services: ...@@ -12,7 +12,8 @@ services:
depends_on: depends_on:
aon-db: aon-db:
condition: service_healthy condition: service_healthy
environment:
- MIGRATE=${MIGRATE:-false}
volumes: volumes:
- ./conf/tg-messenger/config.toml:/config.toml - ./conf/tg-messenger/config.toml:/config.toml
- ./conf/tg-messenger/db.crt:/app/db.crt - ./conf/tg-messenger/db.crt:/app/db.crt
...@@ -31,7 +32,8 @@ services: ...@@ -31,7 +32,8 @@ services:
depends_on: depends_on:
aon-db: aon-db:
condition: service_healthy condition: service_healthy
environment:
- MIGRATE=${MIGRATE:-false}
volumes: volumes:
- ./conf/tg-messenger/config.toml:/config.toml - ./conf/tg-messenger/config.toml:/config.toml
- ./conf/tg-messenger/db.crt:/app/db.crt - ./conf/tg-messenger/db.crt:/app/db.crt
......
...@@ -29,7 +29,6 @@ func (m *Messenger) Start() { ...@@ -29,7 +29,6 @@ func (m *Messenger) Start() {
u.Timeout = 60 u.Timeout = 60
updates := m.bot.GetUpdatesChan(u) updates := m.bot.GetUpdatesChan(u)
log.WithField("updates", len(updates)).Debug("updates")
for update := range updates { for update := range updates {
if update.Message == nil || if update.Message == nil ||
update.Message.IsCommand() { update.Message.IsCommand() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment