acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 13:47:15 +08:00
Code Issues Packages Releases Activity

refactor: 统一类型结构体至 types 目录

Browse Source
This commit is contained in:
耗子
2024-03-16 22:42:36 +08:00
parent 90ef29acc4
commit 1e8c4945d5
11 changed files with 55 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/http/controllers/plugins/constants.go
View File

@@ -1,39 +0,0 @@
package plugins
type PHPExtension struct {
Name string `json:"name"`
Slug string `json:"slug"`
Description string `json:"description"`
Installed bool `json:"installed"`
}
type LoadInfo struct {
Name string `json:"name"`
Value string `json:"value"`
}
type Fail2banJail struct {
Name string `json:"name"`
Enabled bool `json:"enabled"`
LogPath string `json:"log_path"`
MaxRetry int `json:"max_retry"`
FindTime int `json:"find_time"`
BanTime int `json:"ban_time"`
}
type S3fsMount struct {
ID int64 `json:"id"`
Path string `json:"path"`
Bucket string `json:"bucket"`
Url string `json:"url"`
}
type RsyncModule struct {
Name string `json:"name"`
Path string `json:"path"`
Comment string `json:"comment"`
ReadOnly bool `json:"read_only"`
AuthUser string `json:"auth_user"`
Secret string `json:"secret"`
HostsAllow string `json:"hosts_allow"`
}

9
app/http/controllers/plugins/fail2ban_controller.go
View File

@@ -13,6 +13,7 @@ import (
"panel/internal"
"panel/internal/services"
"panel/pkg/tools"
"panel/types"
)
type Fail2banController struct {
@@ -89,7 +90,7 @@ func (r *Fail2banController) List(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusUnprocessableEntity, "Fail2ban 规则为空")
}
var jails []Fail2banJail
var jails []types.Fail2banJail
for i, jail := range jailList {
if i == 0 {
continue
@@ -106,7 +107,7 @@ func (r *Fail2banController) List(ctx http.Context) http.Response {
jailFindTime := regexp.MustCompile(`findtime = (.*)`).FindStringSubmatch(jailRaw)
jailBanTime := regexp.MustCompile(`bantime = (.*)`).FindStringSubmatch(jailRaw)
jails = append(jails, Fail2banJail{
jails = append(jails, types.Fail2banJail{
Name: jailName,
Enabled: jailEnabled,
LogPath: jailLogPath[1],
@@ -121,7 +122,7 @@ func (r *Fail2banController) List(ctx http.Context) http.Response {
if startIndex > len(jails) {
return controllers.Success(ctx, http.Json{
"total": 0,
"items": []Fail2banJail{},
"items": []types.Fail2banJail{},
})
}
if endIndex > len(jails) {
@@ -129,7 +130,7 @@ func (r *Fail2banController) List(ctx http.Context) http.Response {
}
pagedJails := jails[startIndex:endIndex]
if pagedJails == nil {
pagedJails = []Fail2banJail{}
pagedJails = []types.Fail2banJail{}
}
return controllers.Success(ctx, http.Json{

3
app/http/controllers/plugins/postgresql15_controller.go
View File

@@ -11,6 +11,7 @@ import (
"panel/internal"
"panel/internal/services"
"panel/pkg/tools"
"panel/types"
)
type Postgresql15Controller struct {
@@ -152,7 +153,7 @@ func (r *Postgresql15Controller) Load(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL空间占用失败")
}
data := []LoadInfo{
data := []types.NV{
{"启动时间", carbon.Parse(time).ToDateTimeString()},
{"进程 PID", pid},
{"进程数", process},

3
app/http/controllers/plugins/postgresql16_controller.go
View File

@@ -11,6 +11,7 @@ import (
"panel/internal"
"panel/internal/services"
"panel/pkg/tools"
"panel/types"
)
type Postgresql16Controller struct {
@@ -152,7 +153,7 @@ func (r *Postgresql16Controller) Load(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL空间占用失败")
}
data := []LoadInfo{
data := []types.NV{
{"启动时间", carbon.Parse(time).ToDateTimeString()},
{"进程 PID", pid},
{"进程数", process},

3
app/http/controllers/plugins/redis_controller.go
View File

@@ -7,6 +7,7 @@ import (
"panel/app/http/controllers"
"panel/pkg/tools"
"panel/types"
)
type RedisController struct {
@@ -103,7 +104,7 @@ func (r *RedisController) Load(ctx http.Context) http.Response {
}
}
data := []LoadInfo{
data := []types.NV{
{"TCP 端口", dataRaw["tcp_port"]},
{"已运行天数", dataRaw["uptime_in_days"]},
{"连接的客户端数", dataRaw["connected_clients"]},

11
app/http/controllers/plugins/rsync_controller.go
View File

@@ -12,6 +12,7 @@ import (
"panel/internal"
"panel/internal/services"
"panel/pkg/tools"
"panel/types"
)
type RsyncController struct {
@@ -119,9 +120,9 @@ func (r *RsyncController) List(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusInternalServerError, err.Error())
}
var modules []RsyncModule
var modules []types.RsyncModule
lines := strings.Split(config, "\n")
var currentModule *RsyncModule
var currentModule *types.RsyncModule
for _, line := range lines {
line = strings.TrimSpace(line)
@@ -135,7 +136,7 @@ func (r *RsyncController) List(ctx http.Context) http.Response {
modules = append(modules, *currentModule)
}
moduleName := line[1 : len(line)-1]
currentModule = &RsyncModule{
currentModule = &types.RsyncModule{
Name: moduleName,
}
} else if currentModule != nil {
@@ -173,7 +174,7 @@ func (r *RsyncController) List(ctx http.Context) http.Response {
if startIndex > len(modules) {
return controllers.Success(ctx, http.Json{
"total": 0,
"items": []RsyncModule{},
"items": []types.RsyncModule{},
})
}
if endIndex > len(modules) {
@@ -181,7 +182,7 @@ func (r *RsyncController) List(ctx http.Context) http.Response {
}
pagedModules := modules[startIndex:endIndex]
if pagedModules == nil {
pagedModules = []RsyncModule{}
pagedModules = []types.RsyncModule{}
}
return controllers.Success(ctx, http.Json{

17
app/http/controllers/plugins/s3fs_controller.go
View File

@@ -12,6 +12,7 @@ import (
"panel/internal"
"panel/internal/services"
"panel/pkg/tools"
"panel/types"
)
type S3fsController struct {
@@ -29,7 +30,7 @@ func (r *S3fsController) List(ctx http.Context) http.Response {
page := ctx.Request().QueryInt("page", 1)
limit := ctx.Request().QueryInt("limit", 10)
var s3fsList []S3fsMount
var s3fsList []types.S3fsMount
err := json.UnmarshalString(r.setting.Get("s3fs", "[]"), &s3fsList)
if err != nil {
return controllers.Error(ctx, http.StatusInternalServerError, "获取 S3fs 挂载失败")
@@ -40,7 +41,7 @@ func (r *S3fsController) List(ctx http.Context) http.Response {
if startIndex > len(s3fsList) {
return controllers.Success(ctx, http.Json{
"total": 0,
"items": []S3fsMount{},
"items": []types.S3fsMount{},
})
}
if endIndex > len(s3fsList) {
@@ -48,7 +49,7 @@ func (r *S3fsController) List(ctx http.Context) http.Response {
}
pagedS3fsList := s3fsList[startIndex:endIndex]
if pagedS3fsList == nil {
pagedS3fsList = []S3fsMount{}
pagedS3fsList = []types.S3fsMount{}
}
return controllers.Success(ctx, http.Json{
@@ -94,7 +95,7 @@ func (r *S3fsController) Add(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载目录必须为空")
}
var s3fsList []S3fsMount
var s3fsList []types.S3fsMount
err = json.UnmarshalString(r.setting.Get("s3fs", "[]"), &s3fsList)
if err != nil {
return controllers.Error(ctx, http.StatusInternalServerError, "获取 S3fs 挂载失败")
@@ -124,7 +125,7 @@ func (r *S3fsController) Add(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusInternalServerError, "挂载失败，请检查配置是否正确")
}
s3fsList = append(s3fsList, S3fsMount{
s3fsList = append(s3fsList, types.S3fsMount{
ID: id,
Path: path,
Bucket: bucket,
@@ -149,13 +150,13 @@ func (r *S3fsController) Delete(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载ID不能为空")
}
var s3fsList []S3fsMount
var s3fsList []types.S3fsMount
err := json.UnmarshalString(r.setting.Get("s3fs", "[]"), &s3fsList)
if err != nil {
return controllers.Error(ctx, http.StatusInternalServerError, "获取 S3fs 挂载失败")
}
var mount S3fsMount
var mount types.S3fsMount
for _, s := range s3fsList {
if cast.ToString(s.ID) == id {
mount = s
@@ -182,7 +183,7 @@ func (r *S3fsController) Delete(ctx http.Context) http.Response {
return controllers.Error(ctx, http.StatusInternalServerError, err.Error())
}
var newS3fsList []S3fsMount
var newS3fsList []types.S3fsMount
for _, s := range s3fsList {
if s.ID != mount.ID {
newS3fsList = append(newS3fsList, s)

11
internal/constants.go
View File

@@ -1,11 +0,0 @@
package internal
type NV struct {
Name string `json:"name"`
Value string `json:"value"`
}
type KV struct {
Key string `json:"key"`
Value string `json:"value"`
}

10
types/fail2ban.go Normal file
View File

@@ -0,0 +1,10 @@
package types
type Fail2banJail struct {
Name string `json:"name"`
Enabled bool `json:"enabled"`
LogPath string `json:"log_path"`
MaxRetry int `json:"max_retry"`
FindTime int `json:"find_time"`
BanTime int `json:"ban_time"`
}

11
types/rsync.go Normal file
View File

@@ -0,0 +1,11 @@
package types
type RsyncModule struct {
Name string `json:"name"`
Path string `json:"path"`
Comment string `json:"comment"`
ReadOnly bool `json:"read_only"`
AuthUser string `json:"auth_user"`
Secret string `json:"secret"`
HostsAllow string `json:"hosts_allow"`
}

8
types/s3fs.go Normal file
View File

@@ -0,0 +1,8 @@
package types
type S3fsMount struct {
ID int64 `json:"id"`
Path string `json:"path"`
Bucket string `json:"bucket"`
Url string `json:"url"`
}