mei/goodBaby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(gateway): 优化gateway相关功能
Quality check / Web UI (push) Successful in 9m19s
Details

Browse Source
This commit is contained in:
mei
2026-09-12 15:32:27 +08:00
parent 0d89b7fe8f
commit 9b656cebee
84 changed files with 2769 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/rainyun/accountConfigChecker.go
+2 -11
View File
@@ -1,7 +1,6 @@
package rainyun
import (
"encoding/json"
"fmt"
"github.com/ssdomei232/goodBaby/internal/meta"
@@ -16,7 +15,7 @@ func (v *RainyunAccountConfigValidator) GetType() string { return AccountType }
func (v *RainyunAccountConfigValidator) Validate(config string) error {
// 解析配置
cfg, err := parseAccount(config)
cfg, err := ParseAccountConfig(config)
if err != nil {
return err
}
@@ -28,16 +27,8 @@ func (v *RainyunAccountConfigValidator) Validate(config string) error {
return nil
}
func parseAccount(config string) (*RainyunAccount, error) {
var cfg RainyunAccount
if err := json.Unmarshal([]byte(config), &cfg); err != nil {
return nil, fmt.Errorf("解析雨云账号配置失败: %v", err)
}
return &cfg, nil
}
func (v *RainyunAccountConfigValidator) Test(config string) error {
cfg, err := parseAccount(config)
cfg, err := ParseAccountConfig(config)
if err != nil {
return err
}
drivers/rainyun/model.go
+6
View File
@@ -8,6 +8,12 @@ const (
RuleTypeRunAway = "rainyun-runaway"
)
// pageSize 拉取云服务器列表时每页的条数
const pageSize = 20
// runAwayConfirmText 跑路规则要求用户输入的免责声明
const runAwayConfirmText = "我已知晓"
type RainyunWorkOrderRule struct {
Title string `json:"title"`
Msg string `json:"msg"`
drivers/rainyun/rainyun.go
+114 -88
View File
@@ -6,121 +6,147 @@ import (
"strings"
"github.com/ssdomei232/goodBaby/internal/retry"
"github.com/ssdomei232/goodBaby/model"
rain "github.com/ssdomei232/rainyun-go-sdk/v2/rainyun/common"
"github.com/ssdomei232/rainyun-go-sdk/v2/rainyun/rcs"
"github.com/ssdomei232/rainyun-go-sdk/v2/rainyun/rgs"
"github.com/ssdomei232/rainyun-go-sdk/v2/rainyun/workorder"
)
func SendRainyunWorkorderMsg(ctx context.Context, rule *model.Rule) error {
rainyunConfig, err := getRainyunConfigFromRule(rule)
if err != nil {
return err
// SendWorkOrder 用给定账号发送一条雨云工单
func SendWorkOrder(ctx context.Context, account *RainyunAccount, config *RainyunWorkOrderRule) error {
if err := retry.Do(ctx, func() error {
return createWorkOrder(account, config)
}); err != nil {
return fmt.Errorf("发送雨云工单失败: %w", err)
}
rainyunAccount, err := getRainyunAccountFromRule(rule)
if err != nil {
return err
}
err = retry.Do(ctx, func() error {
return sendRainyunWorkorderMsg(rainyunConfig, rainyunAccount)
})
if err != nil {
return err
}
return nil
}
func sendRainyunWorkorderMsg(rainyunRuleConfig *RainyunWorkOrderRule, rainyunAccount *RainyunAccount) error {
client := rain.NewClient(rainyunAccount.APIKey)
workorderClient := workorder.Client{Client: client}
// createWorkOrder 调用一次工单接口
func createWorkOrder(account *RainyunAccount, config *RainyunWorkOrderRule) error {
workorderClient := workorder.Client{Client: rain.NewClient(account.APIKey)}
_, err := workorderClient.CreateWorkOrder(&workorder.CreateWorkerorderRequest{
Content: rainyunRuleConfig.Msg,
Content: config.Msg,
IsAuthed: false,
IsUrgent: 1,
Title: rainyunRuleConfig.Title,
Title: config.Title,
Type: "reward",
})
if err != nil {
return err
}
return nil
return err
}
func RainyunRunAway(ctx context.Context, rule *model.Rule) error {
rainyunAccount, err := getRainyunAccountFromRule(rule)
// RunAway 重装账号下所有云服务器(一键跑路)
func RunAway(ctx context.Context, account *RainyunAccount) error {
client := rain.NewClient(account.APIKey)
rcsFails, rcsTotal, err := reinstallAllRcs(ctx, client)
if err != nil {
return err
}
client := rain.NewClient(rainyunAccount.APIKey)
var fails []string
total := 0
// 重装所有RCS
rcsClient := rcs.Client{Client: client}
options := rain.EncodingStandardQueryParameters(1, 20)
rcsList, err := rcsClient.GetRcsList(options)
rgsFails, rgsTotal, err := reinstallAllRgs(ctx, client)
if err != nil {
return err
}
if rcsList.Data.TotalRecords == 0 {
return nil
} else if rcsList.Data.TotalRecords > 20 {
rcsTotal := rcsList.Data.TotalRecords
options := rain.EncodingStandardQueryParameters(1, rcsTotal)
rcsList, err = rcsClient.GetRcsList(options)
if err != nil {
return err
}
}
for _, rcs := range rcsList.Data.Records {
total++
err := retry.Do(context.Background(), func() error {
return reinstallOneRCS(rcs.ID, &rcsClient)
})
if err != nil {
fails = append(fails, fmt.Sprintf("RCS %d: %v", rcs.ID, err))
}
}
// 重装所有RGS
rgsClient := rgs.Client{Client: client}
rgsOptions := rain.EncodingStandardQueryParameters(1, 20)
rgsList, err := rgsClient.GetRgsList(rgsOptions)
if err != nil {
return err
}
if rgsList.Data.TotalRecords == 0 {
return nil
} else if rgsList.Data.TotalRecords > 20 {
rgsTotal := rgsList.Data.TotalRecords
rgsOptions := rain.EncodingStandardQueryParameters(1, rgsTotal)
rgsList, err = rgsClient.GetRgsList(rgsOptions)
if err != nil {
return err
}
}
for _, rgs := range rgsList.Data.Records {
total++
err := retry.Do(context.Background(), func() error {
return reinstallOneRGS(rgs.ID, &rgsClient)
})
if err != nil {
fails = append(fails, fmt.Sprintf("RGS %d: %v", rgs.ID, err))
}
}
fails := append(rcsFails, rgsFails...)
total := rcsTotal + rgsTotal
if len(fails) > 0 {
return fmt.Errorf("%d/%d 台云服务器重装失败: %s", len(fails), total, strings.Join(fails, "; "))
}
return nil
}
// reinstallAllRcs 重装全部 RCS，返回失败信息与云服务器总数
func reinstallAllRcs(ctx context.Context, client *rain.Client) ([]string, int, error) {
rcsClient := rcs.Client{Client: client}
ids, err := listRcsIDs(&rcsClient)
if err != nil {
return nil, 0, err
}
var fails []string
for _, id := range ids {
if err := retry.Do(ctx, func() error {
return reinstallOneRCS(id, &rcsClient)
}); err != nil {
fails = append(fails, fmt.Sprintf("RCS %d: %v", id, err))
}
}
return fails, len(ids), nil
}
// reinstallAllRgs 重装全部 RGS，返回失败信息与云服务器总数
func reinstallAllRgs(ctx context.Context, client *rain.Client) ([]string, int, error) {
rgsClient := rgs.Client{Client: client}
ids, err := listRgsIDs(&rgsClient)
if err != nil {
return nil, 0, err
}
var fails []string
for _, id := range ids {
if err := retry.Do(ctx, func() error {
return reinstallOneRGS(id, &rgsClient)
}); err != nil {
fails = append(fails, fmt.Sprintf("RGS %d: %v", id, err))
}
}
return fails, len(ids), nil
}
// listRcsIDs 取账号下全部 RCS 的 ID，超过一页时重新按总数拉取
func listRcsIDs(client *rcs.Client) ([]int, error) {
first, err := client.GetRcsList(rain.EncodingStandardQueryParameters(1, pageSize))
if err != nil {
return nil, err
}
ids := make([]int, 0, len(first.Data.Records))
for _, server := range first.Data.Records {
ids = append(ids, server.ID)
}
if first.Data.TotalRecords <= pageSize {
return ids, nil
}
all, err := client.GetRcsList(rain.EncodingStandardQueryParameters(1, first.Data.TotalRecords))
if err != nil {
return nil, err
}
ids = ids[:0]
for _, server := range all.Data.Records {
ids = append(ids, server.ID)
}
return ids, nil
}
// listRgsIDs 取账号下全部 RGS 的 ID，超过一页时重新按总数拉取
func listRgsIDs(client *rgs.Client) ([]int, error) {
first, err := client.GetRgsList(rain.EncodingStandardQueryParameters(1, pageSize))
if err != nil {
return nil, err
}
ids := make([]int, 0, len(first.Data.Records))
for _, server := range first.Data.Records {
ids = append(ids, server.ID)
}
if first.Data.TotalRecords <= pageSize {
return ids, nil
}
all, err := client.GetRgsList(rain.EncodingStandardQueryParameters(1, first.Data.TotalRecords))
if err != nil {
return nil, err
}
ids = ids[:0]
for _, server := range all.Data.Records {
ids = append(ids, server.ID)
}
return ids, nil
}
drivers/rainyun/ruleConfigChecker.go
+7 -8
View File
@@ -1,7 +1,6 @@
package rainyun
import (
"encoding/json"
"fmt"
"github.com/ssdomei232/goodBaby/internal/meta"
@@ -15,9 +14,9 @@ func (v *RainyunWorkorderRuleValidator) GetType() string {
}
func (v *RainyunWorkorderRuleValidator) Validate(configJSON string) error {
var config RainyunWorkOrderRule
if err := json.Unmarshal([]byte(configJSON), &config); err != nil {
return fmt.Errorf("解析雨云规则配置失败: %v", err)
config, err := ParseWorkOrderConfig(configJSON)
if err != nil {
return err
}
if config.Title == "" {
@@ -51,12 +50,12 @@ func (v *RainyunRunAwayRuleValidator) GetType() string {
}
func (v *RainyunRunAwayRuleValidator) Validate(configJSON string) error {
var config RainyunRunAwayRule
if err := json.Unmarshal([]byte(configJSON), &config); err != nil {
return fmt.Errorf("解析雨云规则配置失败: %v", err)
config, err := ParseRunAwayConfig(configJSON)
if err != nil {
return err
}
if config.IK != "我已知晓" {
if config.IK != runAwayConfirmText {
return fmt.Errorf("请输入正确内容")
}
drivers/rainyun/runner.go
+29 -8
View File
@@ -2,22 +2,30 @@ package rainyun
import (
"context"
"log"
"fmt"
"github.com/ssdomei232/goodBaby/model"
)
// RainyunExecutor 雨云执行器
// RainyunWorkorderExecutor 雨云工单执行器
type RainyunWorkorderExecutor struct{}
func (e *RainyunWorkorderExecutor) GetType() string {
return RuleTypeWorkOrder
}
func (e *RainyunWorkorderExecutor) Execute(ctx context.Context, rule *model.Rule) error {
log.Printf("执行雨云工单规则: %s", rule.Name)
func (e *RainyunWorkorderExecutor) Execute(ctx context.Context, task *model.RuleTask) error {
account, err := ParseAccountConfig(task.AccountConfig())
if err != nil {
return err
}
return SendRainyunWorkorderMsg(ctx, rule)
config, err := ParseWorkOrderConfig(task.Rule.ConfigJson)
if err != nil {
return err
}
return SendWorkOrder(ctx, account, config)
}
// RainyunRunAwayExecutor 雨云跑路执行器
@@ -27,7 +35,20 @@ func (e *RainyunRunAwayExecutor) GetType() string {
return RuleTypeRunAway
}
func (e *RainyunRunAwayExecutor) Execute(ctx context.Context, rule *model.Rule) error {
log.Printf("执行雨云跑路规则: %s", rule.Name)
return RainyunRunAway(ctx, rule)
func (e *RainyunRunAwayExecutor) Execute(ctx context.Context, task *model.RuleTask) error {
account, err := ParseAccountConfig(task.AccountConfig())
if err != nil {
return err
}
// 跑路规则只要求用户填一句免责声明，执行时重新校验一次
config, err := ParseRunAwayConfig(task.Rule.ConfigJson)
if err != nil {
return err
}
if config.IK != runAwayConfirmText {
return fmt.Errorf("请输入正确内容")
}
return RunAway(ctx, account)
}
drivers/rainyun/tool.go
+35 -30
View File
@@ -4,31 +4,43 @@ import (
"encoding/json"
"fmt"
"github.com/ssdomei232/goodBaby/handler/db"
"github.com/ssdomei232/goodBaby/model"
"github.com/ssdomei232/rainyun-go-sdk/v2/rainyun/public"
"github.com/ssdomei232/rainyun-go-sdk/v2/rainyun/rcs"
"github.com/ssdomei232/rainyun-go-sdk/v2/rainyun/rgs"
)
// 从 Rule 中获取 RainyunConfig
func getRainyunConfigFromRule(rule *model.Rule) (*RainyunWorkOrderRule, error) {
var rainyunConfig RainyunWorkOrderRule
if err := json.Unmarshal([]byte(rule.ConfigJson), &rainyunConfig); err != nil {
return nil, fmt.Errorf("解析Rainyun规则配置失败: %w", err)
// ParseAccountConfig 解析雨云账号配置
func ParseAccountConfig(config string) (*RainyunAccount, error) {
if config == "" {
return nil, fmt.Errorf("解析雨云账号配置失败: 规则没有关联账号")
}
return &rainyunConfig, nil
var account RainyunAccount
if err := json.Unmarshal([]byte(config), &account); err != nil {
return nil, fmt.Errorf("解析雨云账号配置失败: %v", err)
}
return &account, nil
}
// 从 Rule 中获取 RainyunAccount
func getRainyunAccountFromRule(rule *model.Rule) (*RainyunAccount, error) {
var rainyunAccount RainyunAccount
if err := db.LoadAccountConfig(rule.AccountID, &rainyunAccount); err != nil {
return nil, err
// ParseWorkOrderConfig 解析雨云工单规则配置
func ParseWorkOrderConfig(configJSON string) (*RainyunWorkOrderRule, error) {
var config RainyunWorkOrderRule
if err := json.Unmarshal([]byte(configJSON), &config); err != nil {
return nil, fmt.Errorf("解析雨云工单规则配置失败: %v", err)
}
return &rainyunAccount, nil
return &config, nil
}
// ParseRunAwayConfig 解析雨云跑路规则配置
func ParseRunAwayConfig(configJSON string) (*RainyunRunAwayRule, error) {
var config RainyunRunAwayRule
if err := json.Unmarshal([]byte(configJSON), &config); err != nil {
return nil, fmt.Errorf("解析雨云跑路规则配置失败: %v", err)
}
return &config, nil
}
// reinstallOneRCS 重装一台 RCS
func reinstallOneRCS(rcsID int, rcsClient *rcs.Client) error {
rcsDetail, err := rcsClient.GetRcsDetails(rcsID)
if err != nil {
@@ -42,20 +54,17 @@ func reinstallOneRCS(rcsID int, rcsClient *rcs.Client) error {
for _, os := range rcsOSList.Data {
if os.Region == rcsDetail.Data.Data.Node.Region && os.OsType == "linux" {
rcsReinstallRequest := &rcs.ReinstallRcsRequest{
_, err := rcsClient.ReinstallRcs(rcsID, &rcs.ReinstallRcsRequest{
OsID: os.ID,
ResetOsd: true,
}
_, err := rcsClient.ReinstallRcs(rcsID, rcsReinstallRequest)
if err != nil {
return err
}
break
})
return err
}
}
return nil
return fmt.Errorf("没有找到可用的 linux 镜像")
}
// reinstallOneRGS 重装一台 RGS
func reinstallOneRGS(rgsID int, rgsClient *rgs.Client) error {
rgsDetail, err := rgsClient.GetRgsDetails(rgsID)
if err != nil {
@@ -69,16 +78,12 @@ func reinstallOneRGS(rgsID int, rgsClient *rgs.Client) error {
for _, os := range rgsOSList.Data {
if os.Region == rgsDetail.Data.Data.Node.Region && os.OsType == "linux" {
rgsReinstallRequest := &rcs.ReinstallRcsRequest{
_, err := rgsClient.Reinstallgs(rgsID, &rcs.ReinstallRcsRequest{
OsID: os.ID,
ResetOsd: true,
}
_, err := rgsClient.Reinstallgs(rgsID, rgsReinstallRequest)
if err != nil {
return err
}
break
})
return err
}
}
return nil
return fmt.Errorf("没有找到可用的 linux 镜像")
}