Commit 2889bfd4 authored by brent's avatar brent

add whitelist

parent 0f82b0ef
...@@ -12,6 +12,7 @@ import ( ...@@ -12,6 +12,7 @@ import (
"fmt" "fmt"
"github.com/beego/beego/orm" "github.com/beego/beego/orm"
"github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/core/logs"
"github.com/odysseus/cache/model"
"net/http" "net/http"
"sort" "sort"
"strconv" "strconv"
...@@ -1492,7 +1493,6 @@ func (server *TaskController) UpdateTaskType() { ...@@ -1492,7 +1493,6 @@ func (server *TaskController) UpdateTaskType() {
Username: appRequest.TaskTypeIn.Username, Username: appRequest.TaskTypeIn.Username,
Password: appRequest.TaskTypeIn.Password, Password: appRequest.TaskTypeIn.Password,
Category: appRequest.TaskTypeIn.Category, Category: appRequest.TaskTypeIn.Category,
CreatedTime: timestamp,
UpdatedTime: timestamp, UpdatedTime: timestamp,
} }
...@@ -1545,6 +1545,32 @@ func (server *TaskController) UpdateTaskType() { ...@@ -1545,6 +1545,32 @@ func (server *TaskController) UpdateTaskType() {
// server.respond(models.BusinessFailed, "填加 task type 失败") // server.respond(models.BusinessFailed, "填加 task type 失败")
// return // return
//} //}
task := model.TaskType{
ID: int64(dbType.Id),
BaseModel: dbType.BaseModel,
Model: dbType.Model,
Desc: dbType.Desc,
Price: price,
PublicKey: dbType.PublicKey,
Complexity: int64(dbType.Complexity),
HardwareRequire: string(hardwareRequire),
ImageId: dbType.ImageId,
ImageUrl: dbType.ImageUrl,
Type: int(dbType.Type),
Kind: dbType.Kind,
Cmd: string(cmd),
Workload: int64(dbType.Workload),
ApiPath: dbType.ApiPath,
ImageName: dbType.ImageName,
SignUrl: dbType.SignUrl,
Username: dbType.Username,
Password: dbType.Password,
CreatedTime: appRequest.TaskTypeIn.CreatedTime,
UpdatedTime: dbType.UpdatedTime,
}
odysseus.SetTaskDataToRedis(&task)
odysseus.PublichTaskUpdate(dbType.ApiPath) odysseus.PublichTaskUpdate(dbType.ApiPath)
server.respond(http.StatusOK, "修改 task type 成功") server.respond(http.StatusOK, "修改 task type 成功")
} }
......
{"/Users/brent/Documents/wubanWork/ai_developer_admin/controllers":1709619166614368556} {"/Users/brent/Documents/wubanWork/ai_developer_admin/controllers":1709621001721511850}
\ No newline at end of file \ No newline at end of file
...@@ -29,7 +29,7 @@ func Start() { ...@@ -29,7 +29,7 @@ func Start() {
//defer loopCronTask.Stop() //defer loopCronTask.Stop()
startHeatKey() startHeatKey()
startDebit() startDebit()
startRegistBackend() //startRegistBackend()
} }
func startHeatKey() { func startHeatKey() {
...@@ -187,7 +187,7 @@ func startDebit() { ...@@ -187,7 +187,7 @@ func startDebit() {
} }
func startRegistBackend() { func startRegistBackend() {
spec := "@every 1h" spec := "@every 1m"
registryTask.AddFunc(spec, func() { registryTask.AddFunc(spec, func() {
logs.Debug("startRegistBackend") logs.Debug("startRegistBackend")
registry.RegistryBackend() registry.RegistryBackend()
......
...@@ -58,6 +58,10 @@ func GetUserBalance(id int64) (int64, error) { ...@@ -58,6 +58,10 @@ func GetUserBalance(id int64) (int64, error) {
return user.Balance, err return user.Balance, err
} }
func SetTaskDataToRedis(task *model.TaskType) error {
return syncinfo.SetTaskDataToRedis(task)
}
func GetTaskType(id int64) (*model.TaskType, error) { func GetTaskType(id int64) (*model.TaskType, error) {
return syncinfo.GetTaskWithId(id) return syncinfo.GetTaskWithId(id)
} }
......
...@@ -7,7 +7,6 @@ import ( ...@@ -7,7 +7,6 @@ import (
"github.com/odysseus/service-registry/query" "github.com/odysseus/service-registry/query"
registor "github.com/odysseus/service-registry/registry" registor "github.com/odysseus/service-registry/registry"
"os" "os"
"time"
) )
var querier *query.ServiceQuerier var querier *query.ServiceQuerier
...@@ -75,6 +74,6 @@ func (d backendService) DetailInfo() (json.RawMessage, error) { ...@@ -75,6 +74,6 @@ func (d backendService) DetailInfo() (json.RawMessage, error) {
func RegistryBackend() { func RegistryBackend() {
r := registor.NewRegistry(redisParam, backendService{}) r := registor.NewRegistry(redisParam, backendService{})
r.Start() r.Start()
time.Sleep(time.Second * 5) //time.Sleep(time.Second * 5)
r.Stop() //r.Stop()
} }
...@@ -3,6 +3,7 @@ package main ...@@ -3,6 +3,7 @@ package main
import ( import (
"ai_developer_admin/libs/cronjob" "ai_developer_admin/libs/cronjob"
"ai_developer_admin/libs/mysql" "ai_developer_admin/libs/mysql"
"ai_developer_admin/libs/registry"
_ "ai_developer_admin/routers" _ "ai_developer_admin/routers"
"fmt" "fmt"
beego "github.com/beego/beego/v2/server/web" beego "github.com/beego/beego/v2/server/web"
...@@ -63,6 +64,8 @@ func main() { ...@@ -63,6 +64,8 @@ func main() {
//postgres.Query("") //postgres.Query("")
beego.Run() beego.Run()
registry.RegistryBackend()
//id, err := snowflake.NextId() //id, err := snowflake.NextId()
//if err != nil { //if err != nil {
// logs.Debug("dates = ", err.Error()) // logs.Debug("dates = ", err.Error())
......
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