1、新增 记录 进程搜索
2、增加未绑定分组搜索 3、缺失机器号提示
This commit is contained in:
@ -2,6 +2,7 @@ package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
@ -17,12 +18,16 @@ import (
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/router"
|
||||
"go-admin/app/admin/service"
|
||||
"go-admin/app/jobs"
|
||||
"go-admin/common/database"
|
||||
"go-admin/common/enums"
|
||||
"go-admin/common/global"
|
||||
"go-admin/common/helper"
|
||||
common "go-admin/common/middleware"
|
||||
"go-admin/common/middleware/handler"
|
||||
"go-admin/common/storage"
|
||||
@ -91,6 +96,9 @@ func run() error {
|
||||
Handler: sdk.Runtime.GetEngine(),
|
||||
}
|
||||
|
||||
//初始化redis连接
|
||||
helper.InitDefaultRedis(ext.ExtConfig.Redis.Addr, ext.ExtConfig.Redis.Password, ext.ExtConfig.Redis.Db)
|
||||
|
||||
go func() {
|
||||
jobs.InitJob()
|
||||
jobs.Setup(sdk.Runtime.GetDb())
|
||||
@ -114,6 +122,8 @@ func run() error {
|
||||
}
|
||||
}
|
||||
|
||||
initConfig()
|
||||
|
||||
go func() {
|
||||
// 服务连接
|
||||
if config.SslConfig.Enable {
|
||||
@ -176,11 +186,37 @@ func initRouter() {
|
||||
if config.SslConfig.Enable {
|
||||
r.Use(handler.TlsHandler())
|
||||
}
|
||||
//r.Use(middleware.Metrics())
|
||||
r.Use(common.Sentinel()).
|
||||
Use(common.RequestId(pkg.TrafficKey)).
|
||||
//r.Use(middleware.Metrics()
|
||||
//Use(common.Sentinel()).
|
||||
r.Use(common.RequestId(pkg.TrafficKey)).
|
||||
Use(api.SetRequestLogger)
|
||||
|
||||
common.InitMiddleware(r)
|
||||
|
||||
}
|
||||
|
||||
func initConfig() {
|
||||
var db *gorm.DB
|
||||
dbs := sdk.Runtime.GetDb()
|
||||
|
||||
for _, item := range dbs {
|
||||
db = item
|
||||
break
|
||||
}
|
||||
|
||||
configs := make([]models.SysConfig, 0)
|
||||
db.Model(models.SysConfig{}).Find(&configs)
|
||||
for _, config := range configs {
|
||||
key := fmt.Sprintf(enums.Config, config.ConfigKey)
|
||||
cacheContent, _ := json.Marshal(config)
|
||||
|
||||
if err := helper.DefaultRedis.SetString(key, string(cacheContent)); err != nil {
|
||||
log.Errorf("set redis key %s error, %s", key, err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
keywordService := service.MmKeyword{}
|
||||
keywordService.Orm = db
|
||||
|
||||
keywordService.ReloadMachineCache(false)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user