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

fix: lint

Browse Source
This commit is contained in:
耗子
2024-10-12 17:35:37 +08:00
parent 198bd39664
commit 6ec5ebb18d
37 changed files with 408 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/apps/fail2ban/service.go
View File

@@ -32,7 +32,7 @@ func NewService() *Service {
func (s *Service) List(w http.ResponseWriter, r *http.Request) {
raw, err := io.Read("/etc/fail2ban/jail.local")
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -81,7 +81,7 @@ func (s *Service) List(w http.ResponseWriter, r *http.Request) {
func (s *Service) Add(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Add](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
jailName := req.Name
@@ -95,7 +95,7 @@ func (s *Service) Add(w http.ResponseWriter, r *http.Request) {
raw, err := io.Read("/etc/fail2ban/jail.local")
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if (strings.Contains(raw, "["+jailName+"]") && jailType == "service") || (strings.Contains(raw, "["+jailWebsiteName+"]"+"-cc") && jailType == "website" && jailWebsiteMode == "cc") || (strings.Contains(raw, "["+jailWebsiteName+"]"+"-path") && jailType == "website" && jailWebsiteMode == "path") {
@@ -217,13 +217,13 @@ logpath = ` + logPath + `
func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Delete](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
raw, err := io.Read("/etc/fail2ban/jail.local")
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if !strings.Contains(raw, "["+req.Name+"]") {
@@ -251,7 +251,7 @@ func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
func (s *Service) BanList(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[BanList](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -296,7 +296,7 @@ func (s *Service) BanList(w http.ResponseWriter, r *http.Request) {
func (s *Service) Unban(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Unban](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -312,13 +312,13 @@ func (s *Service) Unban(w http.ResponseWriter, r *http.Request) {
func (s *Service) SetWhiteList(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[SetWhiteList](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
raw, err := io.Read("/etc/fail2ban/jail.local")
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
// 正则替换
@@ -346,7 +346,7 @@ func (s *Service) SetWhiteList(w http.ResponseWriter, r *http.Request) {
func (s *Service) GetWhiteList(w http.ResponseWriter, r *http.Request) {
raw, err := io.Read("/etc/fail2ban/jail.local")
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
reg := regexp.MustCompile(`ignoreip\s*=\s*(.*)\n`)

10
internal/apps/frp/service.go
View File

@@ -19,13 +19,13 @@ func NewService() *Service {
func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Name](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
config, err := io.Read(fmt.Sprintf("%s/server/frp/%s.toml", app.Root, req.Name))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -35,17 +35,17 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write(fmt.Sprintf("%s/server/frp/%s.toml", app.Root, req.Name), req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart(req.Name); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

8
internal/apps/gitea/service.go
View File

@@ -19,7 +19,7 @@ func NewService() *Service {
func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read(fmt.Sprintf("%s/server/gitea/app.ini", app.Root))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -29,17 +29,17 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write(fmt.Sprintf("%s/server/gitea/app.ini", app.Root), req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("gitea"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

12
internal/apps/mysql/service.go
View File

@@ -44,7 +44,7 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -150,7 +150,7 @@ func (s *Service) ErrorLog(w http.ResponseWriter, r *http.Request) {
// ClearErrorLog 清空错误日志
func (s *Service) ClearErrorLog(w http.ResponseWriter, r *http.Request) {
if _, err := shell.Execf("echo '' > %s/server/mysql/mysql-error.log", app.Root); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -171,7 +171,7 @@ func (s *Service) SlowLog(w http.ResponseWriter, r *http.Request) {
// ClearSlowLog 清空慢查询日志
func (s *Service) ClearSlowLog(w http.ResponseWriter, r *http.Request) {
if _, err := shell.Execf("echo '' > %s/server/mysql/mysql-slow.log", app.Root); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -197,7 +197,7 @@ func (s *Service) GetRootPassword(w http.ResponseWriter, r *http.Request) {
func (s *Service) SetRootPassword(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[SetRootPassword](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -206,12 +206,12 @@ func (s *Service) SetRootPassword(w http.ResponseWriter, r *http.Request) {
if err != nil {
// 尝试安全模式直接改密
if err = db.MySQLResetRootPassword(req.Password); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
} else {
if err = mysql.UserPassword("root", req.Password); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
}

4
internal/apps/openresty/service.go
View File

@@ -39,7 +39,7 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) SaveConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -68,7 +68,7 @@ func (s *Service) ErrorLog(w http.ResponseWriter, r *http.Request) {
func (s *Service) ClearErrorLog(w http.ResponseWriter, r *http.Request) {
if _, err := shell.Execf("echo '' > %s/%s", app.Root, "wwwlogs/openresty_error.log"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

26
internal/apps/php/service.go
View File

@@ -35,7 +35,7 @@ func NewService(version uint) *Service {
func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read(fmt.Sprintf("%s/server/php/%d/etc/php.ini", app.Root, s.version))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -45,12 +45,12 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write(fmt.Sprintf("%s/server/php/%d/etc/php.ini", app.Root, s.version), req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -60,7 +60,7 @@ func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) GetFPMConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read(fmt.Sprintf("%s/server/php/%d/etc/php-fpm.conf", app.Root, s.version))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -70,12 +70,12 @@ func (s *Service) GetFPMConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateFPMConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write(fmt.Sprintf("%s/server/php/%d/etc/php-fpm.conf", app.Root, s.version), req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -121,7 +121,7 @@ func (s *Service) SlowLog(w http.ResponseWriter, r *http.Request) {
func (s *Service) ClearErrorLog(w http.ResponseWriter, r *http.Request) {
if _, err := shell.Execf("echo '' > %s/server/php/%d/var/log/php-fpm.log", app.Root, s.version); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -130,7 +130,7 @@ func (s *Service) ClearErrorLog(w http.ResponseWriter, r *http.Request) {
func (s *Service) ClearSlowLog(w http.ResponseWriter, r *http.Request) {
if _, err := shell.Execf("echo '' > %s/server/php/%d/var/log/slow.log", app.Root, s.version); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -152,7 +152,7 @@ func (s *Service) ExtensionList(w http.ResponseWriter, r *http.Request) {
raw, err := shell.Execf("%s/server/php/%d/bin/php -m", app.Root, s.version)
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -174,7 +174,7 @@ func (s *Service) ExtensionList(w http.ResponseWriter, r *http.Request) {
func (s *Service) InstallExtension(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ExtensionSlug](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -195,7 +195,7 @@ func (s *Service) InstallExtension(w http.ResponseWriter, r *http.Request) {
task.Shell = cmd
task.Log = "/tmp/" + req.Slug + ".log"
if err = s.taskRepo.Push(task); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -205,7 +205,7 @@ func (s *Service) InstallExtension(w http.ResponseWriter, r *http.Request) {
func (s *Service) UninstallExtension(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ExtensionSlug](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -226,7 +226,7 @@ func (s *Service) UninstallExtension(w http.ResponseWriter, r *http.Request) {
task.Shell = cmd
task.Log = "/tmp/" + req.Slug + ".log"
if err = s.taskRepo.Push(task); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

14
internal/apps/phpmyadmin/service.go
View File

@@ -43,7 +43,7 @@ func (s *Service) Info(w http.ResponseWriter, r *http.Request) {
conf, err := io.Read(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
match := regexp.MustCompile(`listen\s+(\d+);`).FindStringSubmatch(conf)
@@ -61,13 +61,13 @@ func (s *Service) Info(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdatePort(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdatePort](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
conf, err := io.Read(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
conf = regexp.MustCompile(`listen\s+(\d+);`).ReplaceAllString(conf, "listen "+cast.ToString(req.Port)+";")
@@ -82,7 +82,7 @@ func (s *Service) UpdatePort(w http.ResponseWriter, r *http.Request) {
Protocol: "tcp",
}, firewall.OperationAdd)
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -98,7 +98,7 @@ func (s *Service) UpdatePort(w http.ResponseWriter, r *http.Request) {
func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -108,12 +108,12 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root), req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

16
internal/apps/podman/service.go
View File

@@ -17,7 +17,7 @@ func NewService() *Service {
func (s *Service) GetRegistryConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read("/etc/containers/registries.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -27,17 +27,17 @@ func (s *Service) GetRegistryConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateRegistryConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write("/etc/containers/registries.conf", req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("podman"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -47,7 +47,7 @@ func (s *Service) UpdateRegistryConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) GetStorageConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read("/etc/containers/storage.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -57,17 +57,17 @@ func (s *Service) GetStorageConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateStorageConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write("/etc/containers/storage.conf", req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("podman"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

6
internal/apps/postgresql/service.go
View File

@@ -35,7 +35,7 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -68,7 +68,7 @@ func (s *Service) GetUserConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateUserConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -144,7 +144,7 @@ func (s *Service) Log(w http.ResponseWriter, r *http.Request) {
// ClearLog 清空日志
func (s *Service) ClearLog(w http.ResponseWriter, r *http.Request) {
if _, err := shell.Execf("rm -rf %s/server/postgresql/logs/postgresql-*.log", app.Root); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

26
internal/apps/pureftpd/service.go
View File

@@ -58,7 +58,7 @@ func (s *Service) List(w http.ResponseWriter, r *http.Request) {
func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Create](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -79,11 +79,11 @@ func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
return
}
if _, err = shell.Execf(`yes '%s' | pure-pw useradd '%s' -u www -g www -d '%s'`, req.Password, req.Username, req.Path); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if _, err = shell.Execf("pure-pw mkdb"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -94,16 +94,16 @@ func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Delete](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf("pure-pw userdel '%s' -m", req.Username); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if _, err = shell.Execf("pure-pw mkdb"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -114,16 +114,16 @@ func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
func (s *Service) ChangePassword(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ChangePassword](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf(`yes '%s' | pure-pw passwd '%s' -m`, req.Password, req.Username); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if _, err = shell.Execf("pure-pw mkdb"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -145,12 +145,12 @@ func (s *Service) GetPort(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdatePort(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdatePort](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf(`sed -i "s/Bind.*/Bind 0.0.0.0,%d/g" %s/server/pure-ftpd/etc/pure-ftpd.conf`, req.Port, app.Root); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -160,12 +160,12 @@ func (s *Service) UpdatePort(w http.ResponseWriter, r *http.Request) {
Protocol: "tcp",
}, firewall.OperationAdd)
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("pure-ftpd"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

8
internal/apps/redis/service.go
View File

@@ -68,7 +68,7 @@ func (s *Service) Load(w http.ResponseWriter, r *http.Request) {
func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read(fmt.Sprintf("%s/server/redis/redis.conf", app.Root))
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -78,17 +78,17 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write(fmt.Sprintf("%s/server/redis/redis.conf", app.Root), req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("redis"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

42
internal/apps/rsync/service.go
View File

@@ -24,7 +24,7 @@ func NewService() *Service {
func (s *Service) List(w http.ResponseWriter, r *http.Request) {
config, err := io.Read("/etc/rsyncd.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -89,13 +89,13 @@ func (s *Service) List(w http.ResponseWriter, r *http.Request) {
func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Create](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
config, err := io.Read("/etc/rsyncd.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if strings.Contains(config, "["+req.Name+"]") {
@@ -115,16 +115,16 @@ secrets file = /etc/rsyncd.secrets
`
if err = io.WriteAppend("/etc/rsyncd.conf", conf); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.WriteAppend("/etc/rsyncd.secrets", fmt.Sprintf(`%s:%s\n`, req.AuthUser, req.Secret)); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("rsyncd"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -134,13 +134,13 @@ secrets file = /etc/rsyncd.secrets
func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Delete](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
config, err := io.Read("/etc/rsyncd.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if !strings.Contains(config, "["+req.Name+"]") {
@@ -155,18 +155,18 @@ func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
if len(match) == 2 {
authUser := match[1]
if _, err = shell.Execf(`sed -i '/^%s:.*$/d' /etc/rsyncd.secrets`, authUser); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
}
if err = io.Write("/etc/rsyncd.conf", config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("rsyncd"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -176,13 +176,13 @@ func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
func (s *Service) Update(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Update](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
config, err := io.Read("/etc/rsyncd.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if !strings.Contains(config, "["+req.Name+"]") {
@@ -207,22 +207,22 @@ secrets file = /etc/rsyncd.secrets
if len(match) == 2 {
authUser := match[1]
if _, err = shell.Execf(`sed -i '/^%s:.*$/d' /etc/rsyncd.secrets`, authUser); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
}
if err = io.Write("/etc/rsyncd.conf", config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.WriteAppend("/etc/rsyncd.secrets", fmt.Sprintf(`%s:%s\n`, req.AuthUser, req.Secret)); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("rsyncd"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -232,7 +232,7 @@ secrets file = /etc/rsyncd.secrets
func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
config, err := io.Read("/etc/rsyncd.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -242,17 +242,17 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Write("/etc/rsyncd.conf", req.Config, 0644); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = systemctl.Restart("rsyncd"); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

14
internal/apps/s3fs/service.go
View File

@@ -52,7 +52,7 @@ func (s *Service) List(w http.ResponseWriter, r *http.Request) {
func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Create](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -99,7 +99,7 @@ func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
return
}
if _, err = shell.Execf(`echo 's3fs#%s %s fuse _netdev,allow_other,nonempty,url=%s,passwd_file=/etc/passwd-s3fs-%s 0 0' >> /etc/fstab`, req.Bucket, req.Path, req.URL, cast.ToString(id)); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if mountCheck, err := shell.Execf("mount -a"); err != nil {
@@ -137,7 +137,7 @@ func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Delete](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -165,15 +165,15 @@ func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
}
if _, err = shell.Execf(`fusermount -u '%s'`, mount.Path); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if _, err = shell.Execf(`umount '%s'`, mount.Path); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if _, err = shell.Execf(`sed -i 's@^s3fs#%s\s%s.*$@@g' /etc/fstab`, mount.Bucket, mount.Path); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
if mountCheck, err := shell.Execf("mount -a"); err != nil {
@@ -181,7 +181,7 @@ func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
return
}
if err = io.Remove("/etc/passwd-s3fs-" + cast.ToString(mount.ID)); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

50
internal/apps/supervisor/service.go
View File

@@ -51,7 +51,7 @@ func (s *Service) Log(w http.ResponseWriter, r *http.Request) {
// ClearLog 清空日志
func (s *Service) ClearLog(w http.ResponseWriter, r *http.Request) {
if _, err := shell.Execf(`echo "" > /var/log/supervisor/supervisord.log`); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -69,7 +69,7 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -80,7 +80,7 @@ func (s *Service) GetConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -91,7 +91,7 @@ func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -107,7 +107,7 @@ func (s *Service) UpdateConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) Processes(w http.ResponseWriter, r *http.Request) {
out, err := shell.Execf(`supervisorctl status | awk '{print $1}'`)
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -146,12 +146,12 @@ func (s *Service) Processes(w http.ResponseWriter, r *http.Request) {
func (s *Service) StartProcess(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ProcessName](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf(`supervisorctl start %s`, req.Process); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -162,12 +162,12 @@ func (s *Service) StartProcess(w http.ResponseWriter, r *http.Request) {
func (s *Service) StopProcess(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ProcessName](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf(`supervisorctl stop %s`, req.Process); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -178,12 +178,12 @@ func (s *Service) StopProcess(w http.ResponseWriter, r *http.Request) {
func (s *Service) RestartProcess(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ProcessName](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf(`supervisorctl restart %s`, req.Process); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -194,7 +194,7 @@ func (s *Service) RestartProcess(w http.ResponseWriter, r *http.Request) {
func (s *Service) ProcessLog(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ProcessName](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -223,7 +223,7 @@ func (s *Service) ProcessLog(w http.ResponseWriter, r *http.Request) {
func (s *Service) ClearProcessLog(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ProcessName](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -240,7 +240,7 @@ func (s *Service) ClearProcessLog(w http.ResponseWriter, r *http.Request) {
}
if _, err = shell.Execf(`echo "" > '%s'`, logPath); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -251,7 +251,7 @@ func (s *Service) ClearProcessLog(w http.ResponseWriter, r *http.Request) {
func (s *Service) ProcessConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ProcessName](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -263,7 +263,7 @@ func (s *Service) ProcessConfig(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -274,7 +274,7 @@ func (s *Service) ProcessConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateProcessConfig(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[UpdateProcessConfig](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -285,7 +285,7 @@ func (s *Service) UpdateProcessConfig(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -300,7 +300,7 @@ func (s *Service) UpdateProcessConfig(w http.ResponseWriter, r *http.Request) {
func (s *Service) CreateProcess(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[CreateProcess](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -324,7 +324,7 @@ stdout_logfile_maxbytes=2MB
}
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -339,12 +339,12 @@ stdout_logfile_maxbytes=2MB
func (s *Service) DeleteProcess(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[ProcessName](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf(`supervisorctl stop '%s'`, req.Process); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -356,7 +356,7 @@ func (s *Service) DeleteProcess(w http.ResponseWriter, r *http.Request) {
return
}
if err = io.Remove(`/etc/supervisord.d/` + req.Process + `.conf`); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
} else {
@@ -366,13 +366,13 @@ func (s *Service) DeleteProcess(w http.ResponseWriter, r *http.Request) {
return
}
if err = io.Remove(`/etc/supervisor/conf.d/` + req.Process + `.conf`); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
}
if err = io.Remove(logPath); err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
_, _ = shell.Execf(`supervisorctl reread`)

34
internal/apps/toolbox/service.go
View File

@@ -27,7 +27,7 @@ func NewService() *Service {
func (s *Service) GetDNS(w http.ResponseWriter, r *http.Request) {
raw, err := io.Read("/etc/resolv.conf")
if err != nil {
service.Error(w, http.StatusInternalServerError, err.Error())
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}
match := regexp.MustCompile(`nameserver\s+(\S+)`).FindAllStringSubmatch(raw, -1)
@@ -48,7 +48,7 @@ func (s *Service) GetDNS(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateDNS(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[DNS](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -111,21 +111,21 @@ func (s *Service) GetSWAP(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateSWAP(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[SWAP](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if io.Exists(filepath.Join(app.Root, "swap")) {
if _, err = shell.Execf("swapoff '%s'", filepath.Join(app.Root, "swap")); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf("rm -f '%s'", filepath.Join(app.Root, "swap")); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf(`sed -i '%s/d' /etc/fstab`, filepath.Join(app.Root, "swap")); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
}
@@ -145,16 +145,16 @@ func (s *Service) UpdateSWAP(w http.ResponseWriter, r *http.Request) {
btrfsCheck, _ := shell.Execf("df -T %s | awk '{print $2}' | tail -n 1", app.Root)
if strings.Contains(btrfsCheck, "btrfs") {
if _, err = shell.Execf("btrfs filesystem mkswapfile --size %dM --uuid clear %s", req.Size, filepath.Join(app.Root, "swap")); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
} else {
if _, err = shell.Execf("dd if=/dev/zero of=%s bs=1M count=%d", filepath.Join(app.Root, "swap"), req.Size); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf("mkswap -f '%s'", filepath.Join(app.Root, "swap")); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = io.Chmod(filepath.Join(app.Root, "swap"), 0600); err != nil {
@@ -163,11 +163,11 @@ func (s *Service) UpdateSWAP(w http.ResponseWriter, r *http.Request) {
}
}
if _, err = shell.Execf("swapon '%s'", filepath.Join(app.Root, "swap")); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf("echo '%s swap swap defaults 0 0' >> /etc/fstab", filepath.Join(app.Root, "swap")); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
}
@@ -214,12 +214,12 @@ func (s *Service) GetTimezone(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateTimezone(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Timezone](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if _, err = shell.Execf("timedatectl set-timezone '%s'", req.Timezone); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -230,7 +230,7 @@ func (s *Service) UpdateTimezone(w http.ResponseWriter, r *http.Request) {
func (s *Service) GetHosts(w http.ResponseWriter, r *http.Request) {
hosts, err := io.Read("/etc/hosts")
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -241,7 +241,7 @@ func (s *Service) GetHosts(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateHosts(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Hosts](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -257,7 +257,7 @@ func (s *Service) UpdateHosts(w http.ResponseWriter, r *http.Request) {
func (s *Service) UpdateRootPassword(w http.ResponseWriter, r *http.Request) {
req, err := service.Bind[Password](r)
if err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -268,7 +268,7 @@ func (s *Service) UpdateRootPassword(w http.ResponseWriter, r *http.Request) {
req.Password = strings.ReplaceAll(req.Password, `'`, `\'`)
if _, err = shell.Execf(`yes '%s' | passwd root`, req.Password); err != nil {
service.Error(w, http.StatusUnprocessableEntity, err.Error())
service.Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}

20
internal/service/app.go
View File

@@ -94,12 +94,12 @@ func (s *AppService) Install(w http.ResponseWriter, r *http.Request) {
func (s *AppService) Uninstall(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.AppSlug](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.appRepo.UnInstall(req.Slug); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -109,12 +109,12 @@ func (s *AppService) Uninstall(w http.ResponseWriter, r *http.Request) {
func (s *AppService) Update(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.AppSlug](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.appRepo.Update(req.Slug); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -124,12 +124,12 @@ func (s *AppService) Update(w http.ResponseWriter, r *http.Request) {
func (s *AppService) UpdateShow(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.AppUpdateShow](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.appRepo.UpdateShow(req.Slug, req.Show); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -139,19 +139,19 @@ func (s *AppService) UpdateShow(w http.ResponseWriter, r *http.Request) {
func (s *AppService) IsInstalled(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.AppSlug](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
app, err := s.appRepo.Get(req.Slug)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
installed, err := s.appRepo.IsInstalled(req.Slug)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -163,7 +163,7 @@ func (s *AppService) IsInstalled(w http.ResponseWriter, r *http.Request) {
func (s *AppService) UpdateCache(w http.ResponseWriter, r *http.Request) {
if err := s.appRepo.UpdateCache(); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

38
internal/service/cert.go
View File

@@ -94,13 +94,13 @@ func (s *CertService) Algorithms(w http.ResponseWriter, r *http.Request) {
func (s *CertService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.Paginate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
certs, total, err := s.certRepo.List(req.Page, req.Limit)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -113,13 +113,13 @@ func (s *CertService) List(w http.ResponseWriter, r *http.Request) {
func (s *CertService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CertCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
cert, err := s.certRepo.Create(req)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -129,12 +129,12 @@ func (s *CertService) Create(w http.ResponseWriter, r *http.Request) {
func (s *CertService) Update(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CertUpdate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.certRepo.Update(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -144,13 +144,13 @@ func (s *CertService) Update(w http.ResponseWriter, r *http.Request) {
func (s *CertService) Get(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
cert, err := s.certRepo.Get(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -160,13 +160,13 @@ func (s *CertService) Get(w http.ResponseWriter, r *http.Request) {
func (s *CertService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
err = s.certRepo.Delete(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -176,13 +176,13 @@ func (s *CertService) Delete(w http.ResponseWriter, r *http.Request) {
func (s *CertService) Obtain(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
cert, err := s.certRepo.Get(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -193,7 +193,7 @@ func (s *CertService) Obtain(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -203,13 +203,13 @@ func (s *CertService) Obtain(w http.ResponseWriter, r *http.Request) {
func (s *CertService) Renew(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
_, err = s.certRepo.Renew(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -219,13 +219,13 @@ func (s *CertService) Renew(w http.ResponseWriter, r *http.Request) {
func (s *CertService) ManualDNS(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
dns, err := s.certRepo.ManualDNS(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -235,13 +235,13 @@ func (s *CertService) ManualDNS(w http.ResponseWriter, r *http.Request) {
func (s *CertService) Deploy(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CertDeploy](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
err = s.certRepo.Deploy(req.ID, req.WebsiteID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

20
internal/service/cert_account.go
View File

@@ -23,13 +23,13 @@ func NewCertAccountService() *CertAccountService {
func (s *CertAccountService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.Paginate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
certDNS, total, err := s.certAccountRepo.List(req.Page, req.Limit)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -42,13 +42,13 @@ func (s *CertAccountService) List(w http.ResponseWriter, r *http.Request) {
func (s *CertAccountService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CertAccountCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
account, err := s.certAccountRepo.Create(req)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -58,12 +58,12 @@ func (s *CertAccountService) Create(w http.ResponseWriter, r *http.Request) {
func (s *CertAccountService) Update(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CertAccountUpdate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.certAccountRepo.Update(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -73,13 +73,13 @@ func (s *CertAccountService) Update(w http.ResponseWriter, r *http.Request) {
func (s *CertAccountService) Get(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
account, err := s.certAccountRepo.Get(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -89,12 +89,12 @@ func (s *CertAccountService) Get(w http.ResponseWriter, r *http.Request) {
func (s *CertAccountService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.certAccountRepo.Delete(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

20
internal/service/cert_dns.go
View File

@@ -23,13 +23,13 @@ func NewCertDNSService() *CertDNSService {
func (s *CertDNSService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.Paginate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
certDNS, total, err := s.certDNSRepo.List(req.Page, req.Limit)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -42,13 +42,13 @@ func (s *CertDNSService) List(w http.ResponseWriter, r *http.Request) {
func (s *CertDNSService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CertDNSCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
certDNS, err := s.certDNSRepo.Create(req)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -58,12 +58,12 @@ func (s *CertDNSService) Create(w http.ResponseWriter, r *http.Request) {
func (s *CertDNSService) Update(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CertDNSUpdate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.certDNSRepo.Update(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -73,13 +73,13 @@ func (s *CertDNSService) Update(w http.ResponseWriter, r *http.Request) {
func (s *CertDNSService) Get(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
certDNS, err := s.certDNSRepo.Get(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -89,12 +89,12 @@ func (s *CertDNSService) Get(w http.ResponseWriter, r *http.Request) {
func (s *CertDNSService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.certDNSRepo.Delete(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

58
internal/service/container.go
View File

@@ -25,7 +25,7 @@ func NewContainerService() *ContainerService {
func (s *ContainerService) List(w http.ResponseWriter, r *http.Request) {
containers, err := s.containerRepo.ListAll()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
}
paged, total := Paginate(r, containers)
@@ -59,7 +59,7 @@ func (s *ContainerService) Search(w http.ResponseWriter, r *http.Request) {
name := strings.Fields(r.FormValue("name"))
containers, err := s.containerRepo.ListByNames(name)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -72,13 +72,13 @@ func (s *ContainerService) Search(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
id, err := s.containerRepo.Create(req)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -88,12 +88,12 @@ func (s *ContainerService) Create(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Remove(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Remove(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -103,12 +103,12 @@ func (s *ContainerService) Remove(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Start(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Start(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -118,12 +118,12 @@ func (s *ContainerService) Start(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Stop(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Stop(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -133,12 +133,12 @@ func (s *ContainerService) Stop(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Restart(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Restart(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -148,12 +148,12 @@ func (s *ContainerService) Restart(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Pause(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Pause(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -163,12 +163,12 @@ func (s *ContainerService) Pause(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Unpause(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Unpause(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -178,13 +178,13 @@ func (s *ContainerService) Unpause(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Inspect(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
container, err := s.containerRepo.Inspect(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -194,12 +194,12 @@ func (s *ContainerService) Inspect(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Kill(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Kill(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -209,12 +209,12 @@ func (s *ContainerService) Kill(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Rename(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerRename](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerRepo.Rename(req.ID, req.Name); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -224,13 +224,13 @@ func (s *ContainerService) Rename(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Stats(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
stats, err := s.containerRepo.Stats(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -240,13 +240,13 @@ func (s *ContainerService) Stats(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Exist(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
exist, err := s.containerRepo.Exist(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -256,13 +256,13 @@ func (s *ContainerService) Exist(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Logs(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
logs, err := s.containerRepo.Logs(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -271,7 +271,7 @@ func (s *ContainerService) Logs(w http.ResponseWriter, r *http.Request) {
func (s *ContainerService) Prune(w http.ResponseWriter, r *http.Request) {
if err := s.containerRepo.Prune(); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

20
internal/service/container_image.go
View File

@@ -25,7 +25,7 @@ func NewContainerImageService() *ContainerImageService {
func (s *ContainerImageService) List(w http.ResponseWriter, r *http.Request) {
images, err := s.containerImageRepo.List()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -53,13 +53,13 @@ func (s *ContainerImageService) List(w http.ResponseWriter, r *http.Request) {
func (s *ContainerImageService) Exist(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerImageID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
exist, err := s.containerImageRepo.Exist(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -69,12 +69,12 @@ func (s *ContainerImageService) Exist(w http.ResponseWriter, r *http.Request) {
func (s *ContainerImageService) Pull(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerImagePull](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerImageRepo.Pull(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -84,12 +84,12 @@ func (s *ContainerImageService) Pull(w http.ResponseWriter, r *http.Request) {
func (s *ContainerImageService) Remove(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerImageID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerImageRepo.Remove(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -99,13 +99,13 @@ func (s *ContainerImageService) Remove(w http.ResponseWriter, r *http.Request) {
func (s *ContainerImageService) Inspect(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerImageID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
inspect, err := s.containerImageRepo.Inspect(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -114,7 +114,7 @@ func (s *ContainerImageService) Inspect(w http.ResponseWriter, r *http.Request)
func (s *ContainerImageService) Prune(w http.ResponseWriter, r *http.Request) {
if err := s.containerImageRepo.Prune(); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

28
internal/service/container_network.go
View File

@@ -24,7 +24,7 @@ func NewContainerNetworkService() *ContainerNetworkService {
func (s *ContainerNetworkService) List(w http.ResponseWriter, r *http.Request) {
networks, err := s.containerNetworkRepo.List()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -70,13 +70,13 @@ func (s *ContainerNetworkService) List(w http.ResponseWriter, r *http.Request) {
func (s *ContainerNetworkService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerNetworkCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
id, err := s.containerNetworkRepo.Create(req)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -86,12 +86,12 @@ func (s *ContainerNetworkService) Create(w http.ResponseWriter, r *http.Request)
func (s *ContainerNetworkService) Remove(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerNetworkID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerNetworkRepo.Remove(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -101,13 +101,13 @@ func (s *ContainerNetworkService) Remove(w http.ResponseWriter, r *http.Request)
func (s *ContainerNetworkService) Exist(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerNetworkID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
exist, err := s.containerNetworkRepo.Exist(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -117,13 +117,13 @@ func (s *ContainerNetworkService) Exist(w http.ResponseWriter, r *http.Request)
func (s *ContainerNetworkService) Inspect(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerNetworkID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
network, err := s.containerNetworkRepo.Inspect(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -133,12 +133,12 @@ func (s *ContainerNetworkService) Inspect(w http.ResponseWriter, r *http.Request
func (s *ContainerNetworkService) Connect(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerNetworkConnect](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerNetworkRepo.Connect(req.Network, req.Container); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -148,12 +148,12 @@ func (s *ContainerNetworkService) Connect(w http.ResponseWriter, r *http.Request
func (s *ContainerNetworkService) Disconnect(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerNetworkConnect](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerNetworkRepo.Disconnect(req.Network, req.Container); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -162,7 +162,7 @@ func (s *ContainerNetworkService) Disconnect(w http.ResponseWriter, r *http.Requ
func (s *ContainerNetworkService) Prune(w http.ResponseWriter, r *http.Request) {
if err := s.containerNetworkRepo.Prune(); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

20
internal/service/container_volume.go
View File

@@ -24,7 +24,7 @@ func NewContainerVolumeService() *ContainerVolumeService {
func (s *ContainerVolumeService) List(w http.ResponseWriter, r *http.Request) {
volumes, err := s.containerVolumeRepo.List()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -61,13 +61,13 @@ func (s *ContainerVolumeService) List(w http.ResponseWriter, r *http.Request) {
func (s *ContainerVolumeService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerVolumeCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
volume, err := s.containerVolumeRepo.Create(req)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -78,13 +78,13 @@ func (s *ContainerVolumeService) Create(w http.ResponseWriter, r *http.Request)
func (s *ContainerVolumeService) Exist(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerVolumeID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
exist, err := s.containerVolumeRepo.Exist(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -94,12 +94,12 @@ func (s *ContainerVolumeService) Exist(w http.ResponseWriter, r *http.Request) {
func (s *ContainerVolumeService) Remove(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerVolumeID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.containerVolumeRepo.Remove(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -109,13 +109,13 @@ func (s *ContainerVolumeService) Remove(w http.ResponseWriter, r *http.Request)
func (s *ContainerVolumeService) Inspect(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ContainerVolumeID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
volume, err := s.containerVolumeRepo.Inspect(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -124,7 +124,7 @@ func (s *ContainerVolumeService) Inspect(w http.ResponseWriter, r *http.Request)
func (s *ContainerVolumeService) Prune(w http.ResponseWriter, r *http.Request) {
if err := s.containerVolumeRepo.Prune(); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

28
internal/service/cron.go
View File

@@ -23,13 +23,13 @@ func NewCronService() *CronService {
func (s *CronService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.Paginate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
cron, total, err := s.cronRepo.List(req.Page, req.Limit)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -42,12 +42,12 @@ func (s *CronService) List(w http.ResponseWriter, r *http.Request) {
func (s *CronService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CronCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.cronRepo.Create(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -57,12 +57,12 @@ func (s *CronService) Create(w http.ResponseWriter, r *http.Request) {
func (s *CronService) Update(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CronUpdate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.cronRepo.Update(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -72,13 +72,13 @@ func (s *CronService) Update(w http.ResponseWriter, r *http.Request) {
func (s *CronService) Get(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
cron, err := s.cronRepo.Get(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -88,12 +88,12 @@ func (s *CronService) Get(w http.ResponseWriter, r *http.Request) {
func (s *CronService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.cronRepo.Delete(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -103,12 +103,12 @@ func (s *CronService) Delete(w http.ResponseWriter, r *http.Request) {
func (s *CronService) Status(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.CronStatus](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.cronRepo.Status(req.ID, req.Status); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -118,13 +118,13 @@ func (s *CronService) Status(w http.ResponseWriter, r *http.Request) {
func (s *CronService) Log(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
log, err := s.cronRepo.Log(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

70
internal/service/file.go
View File

@@ -31,18 +31,18 @@ func NewFileService() *FileService {
func (s *FileService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileCreate](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if !req.Dir {
if _, err = shell.Execf("touch %s", req.Path); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
} else {
if err = io.Mkdir(req.Path, 0755); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
}
@@ -54,13 +54,13 @@ func (s *FileService) Create(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Content(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
fileInfo, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if fileInfo.IsDir() {
@@ -74,7 +74,7 @@ func (s *FileService) Content(w http.ResponseWriter, r *http.Request) {
content, err := io.Read(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -84,18 +84,18 @@ func (s *FileService) Content(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Save(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileSave](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
fileInfo, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Write(req.Path, req.Content, fileInfo.Mode()); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -106,12 +106,12 @@ func (s *FileService) Save(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Remove(req.Path); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -121,12 +121,12 @@ func (s *FileService) Delete(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Upload(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileUpload](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Write(req.Path, string(req.File), 0755); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -137,7 +137,7 @@ func (s *FileService) Upload(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Move(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileMove](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -146,7 +146,7 @@ func (s *FileService) Move(w http.ResponseWriter, r *http.Request) {
}
if err = io.Mv(req.Source, req.Target); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -156,7 +156,7 @@ func (s *FileService) Move(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Copy(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileCopy](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -165,7 +165,7 @@ func (s *FileService) Copy(w http.ResponseWriter, r *http.Request) {
}
if err = io.Cp(req.Source, req.Target); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -175,13 +175,13 @@ func (s *FileService) Copy(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Download(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
info, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if info.IsDir() {
@@ -201,13 +201,13 @@ func (s *FileService) RemoteDownload(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Info(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
info, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -224,23 +224,23 @@ func (s *FileService) Info(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Permission(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePermission](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
// 解析成8进制
mode, err := strconv.ParseUint(req.Mode, 8, 64)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Chmod(req.Path, stdos.FileMode(mode)); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Chown(req.Path, req.Owner, req.Group); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -250,18 +250,18 @@ func (s *FileService) Permission(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Compress(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileCompress](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
format, err := io.FormatArchiveByPath(req.File)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Compress(req.Paths, req.File, format); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -272,18 +272,18 @@ func (s *FileService) Compress(w http.ResponseWriter, r *http.Request) {
func (s *FileService) UnCompress(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileUnCompress](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
format, err := io.FormatArchiveByPath(req.File)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.UnCompress(req.File, req.Path, format); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -294,7 +294,7 @@ func (s *FileService) UnCompress(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Search(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileSearch](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -309,7 +309,7 @@ func (s *FileService) Search(w http.ResponseWriter, r *http.Request) {
return nil
})
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -319,13 +319,13 @@ func (s *FileService) Search(w http.ResponseWriter, r *http.Request) {
func (s *FileService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
fileInfoList, err := io.ReadDir(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

66
internal/service/file_windows.go
View File

@@ -31,18 +31,18 @@ func NewFileService() *FileService {
func (s *FileService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileCreate](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if !req.Dir {
if _, err = shell.Execf("touch %s", req.Path); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
} else {
if err = io.Mkdir(req.Path, 0755); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
}
@@ -54,13 +54,13 @@ func (s *FileService) Create(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Content(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
fileInfo, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if fileInfo.IsDir() {
@@ -74,7 +74,7 @@ func (s *FileService) Content(w http.ResponseWriter, r *http.Request) {
content, err := io.Read(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -84,18 +84,18 @@ func (s *FileService) Content(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Save(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileSave](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
fileInfo, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Write(req.Path, req.Content, fileInfo.Mode()); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -106,12 +106,12 @@ func (s *FileService) Save(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Remove(req.Path); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -121,12 +121,12 @@ func (s *FileService) Delete(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Upload(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileUpload](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Write(req.Path, string(req.File), 0755); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -137,7 +137,7 @@ func (s *FileService) Upload(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Move(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileMove](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -146,7 +146,7 @@ func (s *FileService) Move(w http.ResponseWriter, r *http.Request) {
}
if err = io.Mv(req.Source, req.Target); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -156,7 +156,7 @@ func (s *FileService) Move(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Copy(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileCopy](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -165,7 +165,7 @@ func (s *FileService) Copy(w http.ResponseWriter, r *http.Request) {
}
if err = io.Cp(req.Source, req.Target); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -175,13 +175,13 @@ func (s *FileService) Copy(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Download(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
info, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if info.IsDir() {
@@ -200,13 +200,13 @@ func (s *FileService) RemoteDownload(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Info(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
info, err := io.FileInfo(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -223,23 +223,23 @@ func (s *FileService) Info(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Permission(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePermission](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
// 解析成8进制
mode, err := strconv.ParseUint(req.Mode, 8, 64)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Chmod(req.Path, stdos.FileMode(mode)); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Chown(req.Path, req.Owner, req.Group); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -249,12 +249,12 @@ func (s *FileService) Permission(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Compress(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileCompress](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.Compress(req.Paths, req.File, io.Zip); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -265,12 +265,12 @@ func (s *FileService) Compress(w http.ResponseWriter, r *http.Request) {
func (s *FileService) UnCompress(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileUnCompress](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
if err = io.UnCompress(req.File, req.Path, io.Zip); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -281,7 +281,7 @@ func (s *FileService) UnCompress(w http.ResponseWriter, r *http.Request) {
func (s *FileService) Search(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FileSearch](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -296,7 +296,7 @@ func (s *FileService) Search(w http.ResponseWriter, r *http.Request) {
return nil
})
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -306,13 +306,13 @@ func (s *FileService) Search(w http.ResponseWriter, r *http.Request) {
func (s *FileService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FilePath](r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
fileInfoList, err := io.ReadDir(req.Path)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

16
internal/service/firewall.go
View File

@@ -24,7 +24,7 @@ func NewFirewallService() *FirewallService {
func (s *FirewallService) GetStatus(w http.ResponseWriter, r *http.Request) {
running, err := s.firewall.Status()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -34,7 +34,7 @@ func (s *FirewallService) GetStatus(w http.ResponseWriter, r *http.Request) {
func (s *FirewallService) UpdateStatus(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FirewallStatus](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -51,7 +51,7 @@ func (s *FirewallService) UpdateStatus(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -61,7 +61,7 @@ func (s *FirewallService) UpdateStatus(w http.ResponseWriter, r *http.Request) {
func (s *FirewallService) GetRules(w http.ResponseWriter, r *http.Request) {
rules, err := s.firewall.ListRule()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -76,12 +76,12 @@ func (s *FirewallService) GetRules(w http.ResponseWriter, r *http.Request) {
func (s *FirewallService) CreateRule(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FirewallCreateRule](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.firewall.Port(firewall.FireInfo{Port: req.Port, Protocol: req.Protocol}, "add"); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -91,12 +91,12 @@ func (s *FirewallService) CreateRule(w http.ResponseWriter, r *http.Request) {
func (s *FirewallService) DeleteRule(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.FirewallCreateRule](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.firewall.Port(firewall.FireInfo{Port: req.Port, Protocol: req.Protocol}, "remove"); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

2
internal/service/info.go
View File

@@ -314,7 +314,7 @@ func (s *InfoService) Update(w http.ResponseWriter, r *http.Request) {
types.Status = types.StatusUpgrade
if err = s.settingRepo.UpdatePanel(ver, url, checksum); err != nil {
types.Status = types.StatusFailed
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

12
internal/service/monitor.go
View File

@@ -26,7 +26,7 @@ func NewMonitorService() *MonitorService {
func (s *MonitorService) GetSetting(w http.ResponseWriter, r *http.Request) {
setting, err := s.monitorRepo.GetSetting()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -36,12 +36,12 @@ func (s *MonitorService) GetSetting(w http.ResponseWriter, r *http.Request) {
func (s *MonitorService) UpdateSetting(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.MonitorSetting](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.monitorRepo.UpdateSetting(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -50,7 +50,7 @@ func (s *MonitorService) UpdateSetting(w http.ResponseWriter, r *http.Request) {
func (s *MonitorService) Clear(w http.ResponseWriter, r *http.Request) {
if err := s.monitorRepo.Clear(); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -60,13 +60,13 @@ func (s *MonitorService) Clear(w http.ResponseWriter, r *http.Request) {
func (s *MonitorService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.MonitorList](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
monitors, err := s.monitorRepo.List(time.UnixMilli(req.Start), time.UnixMilli(req.End))
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

12
internal/service/safe.go
View File

@@ -23,7 +23,7 @@ func NewSafeService() *SafeService {
func (s *SafeService) GetSSH(w http.ResponseWriter, r *http.Request) {
port, status, err := s.safeRepo.GetSSH()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
Success(w, chix.M{
@@ -35,12 +35,12 @@ func (s *SafeService) GetSSH(w http.ResponseWriter, r *http.Request) {
func (s *SafeService) UpdateSSH(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SafeUpdateSSH](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.safeRepo.UpdateSSH(req.Port, req.Status); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -50,7 +50,7 @@ func (s *SafeService) UpdateSSH(w http.ResponseWriter, r *http.Request) {
func (s *SafeService) GetPingStatus(w http.ResponseWriter, r *http.Request) {
status, err := s.safeRepo.GetPingStatus()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -60,12 +60,12 @@ func (s *SafeService) GetPingStatus(w http.ResponseWriter, r *http.Request) {
func (s *SafeService) UpdatePingStatus(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SafeUpdatePingStatus](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.safeRepo.UpdatePingStatus(req.Status); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

6
internal/service/setting.go
View File

@@ -22,7 +22,7 @@ func NewSettingService() *SettingService {
func (s *SettingService) Get(w http.ResponseWriter, r *http.Request) {
setting, err := s.settingRepo.GetPanelSetting(r.Context())
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -32,13 +32,13 @@ func (s *SettingService) Get(w http.ResponseWriter, r *http.Request) {
func (s *SettingService) Update(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.PanelSetting](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
restart := false
if restart, err = s.settingRepo.UpdatePanelSetting(r.Context(), req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

8
internal/service/ssh.go
View File

@@ -29,7 +29,7 @@ func NewSSHService() *SSHService {
func (s *SSHService) GetInfo(w http.ResponseWriter, r *http.Request) {
info, err := s.sshRepo.GetInfo()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -39,12 +39,12 @@ func (s *SSHService) GetInfo(w http.ResponseWriter, r *http.Request) {
func (s *SSHService) UpdateInfo(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SSHUpdateInfo](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.sshRepo.UpdateInfo(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
}
@@ -52,7 +52,7 @@ func (s *SSHService) UpdateInfo(w http.ResponseWriter, r *http.Request) {
func (s *SSHService) Session(w http.ResponseWriter, r *http.Request) {
info, err := s.sshRepo.GetInfo()
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

16
internal/service/systemctl.go
View File

@@ -18,7 +18,7 @@ func NewSystemctlService() *SystemctlService {
func (s *SystemctlService) Status(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -34,7 +34,7 @@ func (s *SystemctlService) Status(w http.ResponseWriter, r *http.Request) {
func (s *SystemctlService) IsEnabled(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -50,7 +50,7 @@ func (s *SystemctlService) IsEnabled(w http.ResponseWriter, r *http.Request) {
func (s *SystemctlService) Enable(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -65,7 +65,7 @@ func (s *SystemctlService) Enable(w http.ResponseWriter, r *http.Request) {
func (s *SystemctlService) Disable(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -80,7 +80,7 @@ func (s *SystemctlService) Disable(w http.ResponseWriter, r *http.Request) {
func (s *SystemctlService) Restart(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -95,7 +95,7 @@ func (s *SystemctlService) Restart(w http.ResponseWriter, r *http.Request) {
func (s *SystemctlService) Reload(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -110,7 +110,7 @@ func (s *SystemctlService) Reload(w http.ResponseWriter, r *http.Request) {
func (s *SystemctlService) Start(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -125,7 +125,7 @@ func (s *SystemctlService) Start(w http.ResponseWriter, r *http.Request) {
func (s *SystemctlService) Stop(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.SystemctlService](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}

12
internal/service/task.go
View File

@@ -30,13 +30,13 @@ func (s *TaskService) Status(w http.ResponseWriter, r *http.Request) {
func (s *TaskService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.Paginate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
tasks, total, err := s.taskRepo.List(req.Page, req.Limit)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -49,13 +49,13 @@ func (s *TaskService) List(w http.ResponseWriter, r *http.Request) {
func (s *TaskService) Get(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
task, err := s.taskRepo.Get(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -70,13 +70,13 @@ func (s *TaskService) Get(w http.ResponseWriter, r *http.Request) {
func (s *TaskService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
err = s.taskRepo.Delete(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

6
internal/service/user.go
View File

@@ -25,19 +25,19 @@ func NewUserService() *UserService {
func (s *UserService) Login(w http.ResponseWriter, r *http.Request) {
sess, err := app.Session.GetSession(r)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
req, err := Bind[request.UserLogin](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
user, err := s.repo.CheckPassword(req.Username, req.Password)
if err != nil {
Error(w, http.StatusForbidden, err.Error())
Error(w, http.StatusForbidden, "%v", err)
return
}

44
internal/service/website.go
View File

@@ -28,12 +28,12 @@ func NewWebsiteService() *WebsiteService {
func (s *WebsiteService) GetDefaultConfig(w http.ResponseWriter, r *http.Request) {
index, err := io.Read(filepath.Join(app.Root, "server/openresty/html/index.html"))
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
stop, err := io.Read(filepath.Join(app.Root, "server/openresty/html/stop.html"))
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -46,12 +46,12 @@ func (s *WebsiteService) GetDefaultConfig(w http.ResponseWriter, r *http.Request
func (s *WebsiteService) UpdateDefaultConfig(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.WebsiteDefaultConfig](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.websiteRepo.UpdateDefaultConfig(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -61,13 +61,13 @@ func (s *WebsiteService) UpdateDefaultConfig(w http.ResponseWriter, r *http.Requ
func (s *WebsiteService) List(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.Paginate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
websites, total, err := s.websiteRepo.List(req.Page, req.Limit)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -80,7 +80,7 @@ func (s *WebsiteService) List(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) Create(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.WebsiteCreate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
@@ -90,7 +90,7 @@ func (s *WebsiteService) Create(w http.ResponseWriter, r *http.Request) {
}
if _, err = s.websiteRepo.Create(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -100,13 +100,13 @@ func (s *WebsiteService) Create(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) Get(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
config, err := s.websiteRepo.Get(req.ID)
if err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -116,12 +116,12 @@ func (s *WebsiteService) Get(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) Update(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.WebsiteUpdate](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.websiteRepo.Update(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -131,12 +131,12 @@ func (s *WebsiteService) Update(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) Delete(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.WebsiteDelete](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.websiteRepo.Delete(req); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -146,12 +146,12 @@ func (s *WebsiteService) Delete(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) ClearLog(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.websiteRepo.ClearLog(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -161,12 +161,12 @@ func (s *WebsiteService) ClearLog(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) UpdateRemark(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.WebsiteUpdateRemark](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.websiteRepo.UpdateRemark(req.ID, req.Remark); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -176,12 +176,12 @@ func (s *WebsiteService) UpdateRemark(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) ResetConfig(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.ID](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.websiteRepo.ResetConfig(req.ID); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}
@@ -191,12 +191,12 @@ func (s *WebsiteService) ResetConfig(w http.ResponseWriter, r *http.Request) {
func (s *WebsiteService) UpdateStatus(w http.ResponseWriter, r *http.Request) {
req, err := Bind[request.WebsiteUpdateStatus](r)
if err != nil {
Error(w, http.StatusUnprocessableEntity, err.Error())
Error(w, http.StatusUnprocessableEntity, "%v", err)
return
}
if err = s.websiteRepo.UpdateStatus(req.ID, req.Status); err != nil {
Error(w, http.StatusInternalServerError, err.Error())
Error(w, http.StatusInternalServerError, "%v", err)
return
}

4
pkg/firewall/firewall.go
View File

@@ -161,7 +161,7 @@ func (r *Firewall) RichRules(rule FireInfo, operation Operation) error {
ruleStr.WriteString(rule.Strategy)
_, err := shell.Execf("firewall-cmd --zone=public --%s-rich-rule '%s' --permanent", operation, ruleStr.String())
if err != nil {
return fmt.Errorf("%s rich rules (%s) failed, err: %s", operation, ruleStr.String(), err.Error())
return fmt.Errorf("%s rich rules (%s) failed, err: %v", operation, ruleStr.String(), err)
}
}
@@ -185,7 +185,7 @@ func (r *Firewall) PortForward(info Forward, operation Operation) error {
_, err := shell.Execf(ruleStr.String()) // nolint: govet
if err != nil {
return fmt.Errorf("%s port forward failed, err: %s", operation, err.Error())
return fmt.Errorf("%s port forward failed, err: %v", operation, err)
}
_, err = shell.Execf("firewall-cmd --reload")