mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 18:35:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

refactor: replace api error handler with cosy err handler

Browse source
This commit is contained in:
Jacky 2025-03-29 20:33:48 +08:00
parent 4cb4695e7b
commit b469ca7961
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
37 changed files with 268 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/sites/advance.go
View file

@ -1,12 +1,12 @@
package sites
import (
"github.com/0xJacky/Nginx-UI/api"
"net/http"
"github.com/0xJacky/Nginx-UI/internal/nginx"
"github.com/0xJacky/Nginx-UI/query"
"github.com/gin-gonic/gin"
"github.com/uozi-tech/cosy"
"net/http"
)
func DomainEditByAdvancedMode(c *gin.Context) {
@ -25,14 +25,14 @@ func DomainEditByAdvancedMode(c *gin.Context) {
_, err := s.Where(s.Path.Eq(path)).FirstOrCreate()
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
_, err = s.Where(s.Path.Eq(path)).Update(s.Advanced, json.Advanced)
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}

12
api/sites/auto_cert.go
View file

@ -1,13 +1,13 @@
package sites
import (
"github.com/0xJacky/Nginx-UI/api"
"net/http"
"github.com/0xJacky/Nginx-UI/internal/helper"
"github.com/0xJacky/Nginx-UI/model"
"github.com/gin-gonic/gin"
"github.com/go-acme/lego/v4/certcrypto"
"github.com/uozi-tech/cosy"
"net/http"
)
func AddDomainToAutoCert(c *gin.Context) {
@ -27,7 +27,7 @@ func AddDomainToAutoCert(c *gin.Context) {
certModel, err := model.FirstOrCreateCert(name, helper.GetKeyType(json.KeyType))
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -40,7 +40,7 @@ func AddDomainToAutoCert(c *gin.Context) {
})
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -52,7 +52,7 @@ func RemoveDomainFromAutoCert(c *gin.Context) {
certModel, err := model.FirstCert(name)
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -61,7 +61,7 @@ func RemoveDomainFromAutoCert(c *gin.Context) {
})
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
c.JSON(http.StatusOK, nil)

6
api/sites/duplicate.go
View file

@ -1,11 +1,11 @@
package sites
import (
"github.com/0xJacky/Nginx-UI/api"
"net/http"
"github.com/0xJacky/Nginx-UI/internal/site"
"github.com/gin-gonic/gin"
"github.com/uozi-tech/cosy"
"net/http"
)
func DuplicateSite(c *gin.Context) {
@ -23,7 +23,7 @@ func DuplicateSite(c *gin.Context) {
err := site.Duplicate(src, json.Name)
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}

17
api/sites/list.go
View file

@ -1,7 +1,11 @@
package sites
import (
"github.com/0xJacky/Nginx-UI/api"
"net/http"
"os"
"path/filepath"
"strings"
"github.com/0xJacky/Nginx-UI/internal/config"
"github.com/0xJacky/Nginx-UI/internal/nginx"
"github.com/0xJacky/Nginx-UI/model"
@ -9,10 +13,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/samber/lo"
"github.com/spf13/cast"
"net/http"
"os"
"path/filepath"
"strings"
"github.com/uozi-tech/cosy"
)
func GetSiteList(c *gin.Context) {
@ -24,13 +25,13 @@ func GetSiteList(c *gin.Context) {
configFiles, err := os.ReadDir(nginx.GetConfPath("sites-available"))
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
enabledConfig, err := os.ReadDir(nginx.GetConfPath("sites-enabled"))
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -41,7 +42,7 @@ func GetSiteList(c *gin.Context) {
}
sites, err := sTx.Find()
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
sitesMap := lo.SliceToMap(sites, func(item *model.Site) (string, *model.Site) {

24
api/sites/site.go
View file

@ -1,7 +1,9 @@
package sites
import (
"github.com/0xJacky/Nginx-UI/api"
"net/http"
"os"
"github.com/0xJacky/Nginx-UI/internal/cert"
"github.com/0xJacky/Nginx-UI/internal/nginx"
"github.com/0xJacky/Nginx-UI/internal/site"
@ -12,8 +14,6 @@ import (
"github.com/uozi-tech/cosy"
"github.com/uozi-tech/cosy/logger"
"gorm.io/gorm/clause"
"net/http"
"os"
)
func GetSite(c *gin.Context) {
@ -36,7 +36,7 @@ func GetSite(c *gin.Context) {
g := query.ChatGPTLog
chatgpt, err := g.Where(g.Name.Eq(path)).FirstOrCreate()
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -47,7 +47,7 @@ func GetSite(c *gin.Context) {
s := query.Site
siteModel, err := s.Where(s.Path.Eq(path)).FirstOrCreate()
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -59,7 +59,7 @@ func GetSite(c *gin.Context) {
if siteModel.Advanced {
origContent, err := os.ReadFile(path)
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -78,7 +78,7 @@ func GetSite(c *gin.Context) {
nginxConfig, err := nginx.ParseNgxConfig(path)
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -126,7 +126,7 @@ func SaveSite(c *gin.Context) {
err := site.Save(name, json.Content, json.Overwrite, json.SiteCategoryID, json.SyncNodeIDs)
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -144,7 +144,7 @@ func RenameSite(c *gin.Context) {
err := site.Rename(oldName, json.NewName)
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -156,7 +156,7 @@ func RenameSite(c *gin.Context) {
func EnableSite(c *gin.Context) {
err := site.Enable(c.Param("name"))
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -168,7 +168,7 @@ func EnableSite(c *gin.Context) {
func DisableSite(c *gin.Context) {
err := site.Disable(c.Param("name"))
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}
@ -180,7 +180,7 @@ func DisableSite(c *gin.Context) {
func DeleteSite(c *gin.Context) {
err := site.Delete(c.Param("name"))
if err != nil {
api.ErrHandler(c, err)
cosy.ErrHandler(c, err)
return
}