diff --git a/pkg/serverconfigs/http_request_scripts_config.go b/pkg/serverconfigs/http_request_scripts_config.go index 5e86de0..f2cd6b5 100644 --- a/pkg/serverconfigs/http_request_scripts_config.go +++ b/pkg/serverconfigs/http_request_scripts_config.go @@ -3,20 +3,20 @@ package serverconfigs type HTTPRequestScriptsConfig struct { - OnInitScript *JSScriptConfig `yaml:"onInitScript" json:"onInitScript"` // 接收到请求之后 - OnRequestScript *JSScriptConfig `yaml:"onRequestScript" json:"onRequestScript"` // 准备转发请求之前 + InitGroup *ScriptGroupConfig `yaml:"initGroup" json:"initGroup"` + RequestGroup *ScriptGroupConfig `yaml:"requestGroup" json:"requestGroup"` } func (this *HTTPRequestScriptsConfig) Init() error { - if this.OnInitScript != nil { - err := this.OnInitScript.Init() + if this.InitGroup != nil { + err := this.InitGroup.Init() if err != nil { return err } } - if this.OnRequestScript != nil { - err := this.OnRequestScript.Init() + if this.RequestGroup != nil { + err := this.RequestGroup.Init() if err != nil { return err } @@ -26,8 +26,6 @@ func (this *HTTPRequestScriptsConfig) Init() error { } func (this *HTTPRequestScriptsConfig) IsEmpty() bool { - if (this.OnInitScript == nil || !this.OnInitScript.IsOn) && (this.OnRequestScript == nil || !this.OnRequestScript.IsOn) { - return true - } - return false + return (this.InitGroup == nil || this.InitGroup.IsEmpty()) && + (this.RequestGroup == nil || this.RequestGroup.IsEmpty()) } diff --git a/pkg/serverconfigs/js_script_config.go b/pkg/serverconfigs/js_script_config.go deleted file mode 100644 index 9cda8db..0000000 --- a/pkg/serverconfigs/js_script_config.go +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package serverconfigs - -type JSScriptConfig struct { - IsPrior bool `yaml:"isPrior" json:"isPrior"` - IsOn bool `yaml:"isOn" json:"isOn"` - Code string `yaml:"code" json:"code"` -} - -func (this *JSScriptConfig) Init() error { - return nil -} diff --git a/pkg/serverconfigs/script_config.go b/pkg/serverconfigs/script_config.go new file mode 100644 index 0000000..04ad38d --- /dev/null +++ b/pkg/serverconfigs/script_config.go @@ -0,0 +1,14 @@ +// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. + +package serverconfigs + +type ScriptConfig struct { + IsPrior bool `yaml:"isPrior" json:"isPrior"` + IsOn bool `yaml:"isOn" json:"isOn"` + + Code string `yaml:"code" json:"code"` +} + +func (this *ScriptConfig) Init() error { + return nil +} diff --git a/pkg/serverconfigs/script_group_config.go b/pkg/serverconfigs/script_group_config.go new file mode 100644 index 0000000..547bec2 --- /dev/null +++ b/pkg/serverconfigs/script_group_config.go @@ -0,0 +1,30 @@ +// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. + +package serverconfigs + +type ScriptGroupConfig struct { + IsOn bool `yaml:"isOn" json:"isOn"` + IsPrior bool `yaml:"isPrior" json:"isPrior"` + Scripts []*ScriptConfig `yaml:"scripts" json:"scripts"` + + isEmpty bool +} + +func (this *ScriptGroupConfig) Init() error { + this.isEmpty = true + + for _, script := range this.Scripts { + err := script.Init() + if err != nil { + return err + } + if script.IsOn { + this.isEmpty = false + } + } + return nil +} + +func (this *ScriptGroupConfig) IsEmpty() bool { + return this.isEmpty +} diff --git a/pkg/systemconfigs/admin_module.go b/pkg/systemconfigs/admin_module.go index b57c82a..8d88a85 100644 --- a/pkg/systemconfigs/admin_module.go +++ b/pkg/systemconfigs/admin_module.go @@ -1,6 +1,6 @@ package systemconfigs -// 用户模块权限 +// AdminModule 管理用户模块权限 type AdminModule struct { Code string `json:"code"` // 模块代号 AllowAll bool `json:"allowAll"` // 允许所有的动作 diff --git a/pkg/systemconfigs/database_config.go b/pkg/systemconfigs/database_config.go index 4026c59..f048758 100644 --- a/pkg/systemconfigs/database_config.go +++ b/pkg/systemconfigs/database_config.go @@ -1,6 +1,6 @@ package systemconfigs -// 数据库相关配置 +// DatabaseConfig 数据库相关配置 type DatabaseConfig struct { ServerAccessLog struct { Clean struct { diff --git a/pkg/systemconfigs/log_config.go b/pkg/systemconfigs/log_config.go index 4d5b348..2e67539 100644 --- a/pkg/systemconfigs/log_config.go +++ b/pkg/systemconfigs/log_config.go @@ -2,7 +2,7 @@ package systemconfigs import "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" -// 默认日志配置 +// DefaultLogConfig 默认日志配置 func DefaultLogConfig() *LogConfig { return &LogConfig{ CanDelete: false, @@ -16,7 +16,7 @@ func DefaultLogConfig() *LogConfig { } } -// 操作日志相关配置 +// LogConfig 操作日志相关配置 type LogConfig struct { CanDelete bool `json:"canDelete"` // 是否可删除 CanClean bool `json:"canClean"` // 是否可清理 diff --git a/pkg/systemconfigs/user_ui_config.go b/pkg/systemconfigs/user_ui_config.go index e1a7144..76edd7d 100644 --- a/pkg/systemconfigs/user_ui_config.go +++ b/pkg/systemconfigs/user_ui_config.go @@ -1,6 +1,6 @@ package systemconfigs -// 用户界面相关配置 +// UserUIConfig 用户界面相关配置 type UserUIConfig struct { ProductName string `json:"productName"` // 产品名 UserSystemName string `json:"userSystemName"` // 管理员系统名称