wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-lwl/consul' into test

This commit is contained in:
lwl0608 2024-05-17 10:44:54 +08:00
parent 52d3f0604c 38eebe5b35
commit 930e39e500
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/mix/controller/init.go
View File

@ -54,9 +54,8 @@ import (
func Init(r *gin.Engine) { func Init(r *gin.Engine) {
r.HandleMethodNotAllowed = true r.HandleMethodNotAllowed = true
// websocket长链接 r.GET("/", HelloWorld)
r.GET("/", ServeFile) r.POST("/", HelloWorld)
r.GET("/ws", HandleWs)
// healthcheck // healthcheck
r.GET("/healthcheck", Healthcheck) r.GET("/healthcheck", Healthcheck)

8
app/mix/dao/mysql.go
View File

@ -108,7 +108,7 @@ func NewMysql(cfg *conf.ConfigSt) (mysql *Mysql, err error) {
mysql.dbVas, err = mysqldb.NewMysqlDB(cfg.MixMysql, DatabaseVas) mysql.dbVas, err = mysqldb.NewMysqlDB(cfg.MixMysql, DatabaseVas)
if err != nil { if err != nil {
logger.Error("NewMysqlDB fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMongo), DatabaseVas, err) logger.Error("NewMysqlDB fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMysql), DatabaseVas, err)
return return
} }
mysql.dbVas.SetMaxOpenConns(20) mysql.dbVas.SetMaxOpenConns(20)
@ -116,13 +116,13 @@ func NewMysql(cfg *conf.ConfigSt) (mysql *Mysql, err error) {
err = mysql.dbVas.Ping() err = mysql.dbVas.Ping()
if err != nil { if err != nil {
logger.Error("MysqlDB ping fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMongo), DatabaseVas, err) logger.Error("MysqlDB ping fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMysql), DatabaseVas, err)
return return
} }
mysql.dbXxlJob, err = mysqldb.NewMysqlDB(cfg.MixMysql, DatabaseXxlJob) mysql.dbXxlJob, err = mysqldb.NewMysqlDB(cfg.MixMysql, DatabaseXxlJob)
if err != nil { if err != nil {
logger.Error("NewMysqlDB fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMongo), DatabaseXxlJob, err) logger.Error("NewMysqlDB fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMysql), DatabaseXxlJob, err)
return return
} }
mysql.dbXxlJob.SetMaxOpenConns(20) mysql.dbXxlJob.SetMaxOpenConns(20)
@ -130,7 +130,7 @@ func NewMysql(cfg *conf.ConfigSt) (mysql *Mysql, err error) {
err = mysql.dbXxlJob.Ping() err = mysql.dbXxlJob.Ping()
if err != nil { if err != nil {
logger.Error("MysqlDB ping fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMongo), DatabaseXxlJob, err) logger.Error("MysqlDB ping fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMysql), DatabaseXxlJob, err)
return return
} }