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

fix: config sync issues #685

Browse source
This commit is contained in:
Jacky 2024-11-04 12:26:49 +08:00
parent e6e1876c54
commit e4a5ba5b87
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
10 changed files with 114 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/config/get.go
View file

@ -10,6 +10,7 @@ import (
"github.com/sashabaranov/go-openai"
"net/http"
"os"
"path/filepath"
)
type APIConfigResp struct {
@ -19,30 +20,30 @@ type APIConfigResp struct {
}
func GetConfig(c *gin.Context) {
name := c.Param("name")
relativePath := c.Param("path")
path := nginx.GetConfPath("/", name)
if !helper.IsUnderDirectory(path, nginx.GetConfPath()) {
absPath := nginx.GetConfPath(relativePath)
if !helper.IsUnderDirectory(absPath, nginx.GetConfPath()) {
c.JSON(http.StatusForbidden, gin.H{
"message": "path is not under the nginx conf path",
})
return
}
stat, err := os.Stat(path)
stat, err := os.Stat(absPath)
if err != nil {
api.ErrHandler(c, err)
return
}
content, err := os.ReadFile(path)
content, err := os.ReadFile(absPath)
if err != nil {
api.ErrHandler(c, err)
return
}
q := query.Config
g := query.ChatGPTLog
chatgpt, err := g.Where(g.Name.Eq(path)).FirstOrCreate()
chatgpt, err := g.Where(g.Name.Eq(absPath)).FirstOrCreate()
if err != nil {
api.ErrHandler(c, err)
return
@ -52,7 +53,7 @@ func GetConfig(c *gin.Context) {
chatgpt.Content = make([]openai.ChatCompletionMessage, 0)
}
cfg, err := q.Where(q.Filepath.Eq(path)).FirstOrInit()
cfg, err := q.Where(q.Filepath.Eq(absPath)).FirstOrInit()
if err != nil {
api.ErrHandler(c, err)
return
@ -63,8 +64,9 @@ func GetConfig(c *gin.Context) {
Name: stat.Name(),
Content: string(content),
ChatGPTMessages: chatgpt.Content,
FilePath: path,
FilePath: absPath,
ModifiedAt: stat.ModTime(),
Dir: filepath.Dir(relativePath),
},
SyncNodeIds: cfg.SyncNodeIds,
SyncOverwrite: cfg.SyncOverwrite,

67
api/config/modify.go
View file

@ -11,6 +11,7 @@ import (
"github.com/sashabaranov/go-openai"
"net/http"
"os"
"path/filepath"
"time"
)
@ -19,11 +20,9 @@ type EditConfigJson struct {
}
func EditConfig(c *gin.Context) {
name := c.Param("name")
relativePath := c.Param("path")
var json struct {
Name string `json:"name" binding:"required"`
Filepath string `json:"filepath" binding:"required"`
NewFilepath string `json:"new_filepath" binding:"required"`
Content string `json:"content"`
SyncOverwrite bool `json:"sync_overwrite"`
SyncNodeIds []uint64 `json:"sync_node_ids"`
@ -32,22 +31,8 @@ func EditConfig(c *gin.Context) {
return
}
path := json.Filepath
if !helper.IsUnderDirectory(path, nginx.GetConfPath()) {
c.JSON(http.StatusForbidden, gin.H{
"message": "filepath is not under the nginx conf path",
})
return
}
if !helper.IsUnderDirectory(json.NewFilepath, nginx.GetConfPath()) {
c.JSON(http.StatusForbidden, gin.H{
"message": "new filepath is not under the nginx conf path",
})
return
}
if !helper.FileExists(path) {
absPath := nginx.GetConfPath(relativePath)
if !helper.FileExists(absPath) {
c.JSON(http.StatusNotFound, gin.H{
"message": "file not found",
})
@ -55,14 +40,14 @@ func EditConfig(c *gin.Context) {
}
content := json.Content
origContent, err := os.ReadFile(path)
origContent, err := os.ReadFile(absPath)
if err != nil {
api.ErrHandler(c, err)
return
}
if content != "" && content != string(origContent) {
err = os.WriteFile(path, []byte(content), 0644)
err = os.WriteFile(absPath, []byte(content), 0644)
if err != nil {
api.ErrHandler(c, err)
return
@ -70,17 +55,15 @@ func EditConfig(c *gin.Context) {
}
q := query.Config
cfg, err := q.Where(q.Filepath.Eq(json.Filepath)).FirstOrCreate()
cfg, err := q.Where(q.Filepath.Eq(absPath)).FirstOrCreate()
if err != nil {
api.ErrHandler(c, err)
return
}
_, err = q.Where(q.Filepath.Eq(json.Filepath)).
Select(q.Name, q.Filepath, q.SyncNodeIds, q.SyncOverwrite).
_, err = q.Where(q.Filepath.Eq(absPath)).
Select(q.SyncNodeIds, q.SyncOverwrite).
Updates(&model.Config{
Name: json.Name,
Filepath: json.NewFilepath,
SyncNodeIds: json.SyncNodeIds,
SyncOverwrite: json.SyncOverwrite,
})
@ -89,27 +72,12 @@ func EditConfig(c *gin.Context) {
return
}
// use the new values
cfg.SyncNodeIds = json.SyncNodeIds
cfg.SyncOverwrite = json.SyncOverwrite
g := query.ChatGPTLog
// handle rename
if path != json.NewFilepath {
if helper.FileExists(json.NewFilepath) {
c.JSON(http.StatusNotAcceptable, gin.H{
"message": "File exists",
})
return
}
err := os.Rename(json.Filepath, json.NewFilepath)
if err != nil {
api.ErrHandler(c, err)
return
}
// update ChatGPT record
_, _ = g.Where(g.Name.Eq(json.NewFilepath)).Delete()
_, _ = g.Where(g.Name.Eq(path)).Update(g.Name, json.NewFilepath)
}
err = config.SyncToRemoteServer(cfg, json.NewFilepath)
err = config.SyncToRemoteServer(cfg, absPath)
if err != nil {
api.ErrHandler(c, err)
return
@ -123,7 +91,7 @@ func EditConfig(c *gin.Context) {
return
}
chatgpt, err := g.Where(g.Name.Eq(json.NewFilepath)).FirstOrCreate()
chatgpt, err := g.Where(g.Name.Eq(absPath)).FirstOrCreate()
if err != nil {
api.ErrHandler(c, err)
return
@ -134,10 +102,11 @@ func EditConfig(c *gin.Context) {
}
c.JSON(http.StatusOK, config.Config{
Name: name,
Name: filepath.Base(absPath),
Content: content,
ChatGPTMessages: chatgpt.Content,
FilePath: json.NewFilepath,
FilePath: absPath,
ModifiedAt: time.Now(),
Dir: filepath.Dir(relativePath),
})
}

9
api/config/rename.go
View file

@ -5,11 +5,13 @@ import (
"github.com/0xJacky/Nginx-UI/internal/config"
"github.com/0xJacky/Nginx-UI/internal/helper"
"github.com/0xJacky/Nginx-UI/internal/nginx"
"github.com/0xJacky/Nginx-UI/model"
"github.com/0xJacky/Nginx-UI/query"
"github.com/gin-gonic/gin"
"github.com/uozi-tech/cosy/logger"
"net/http"
"os"
"strings"
)
func Rename(c *gin.Context) {
@ -77,7 +79,10 @@ func Rename(c *gin.Context) {
_, _ = g.Where(g.Name.Like(origFullPath+"%")).Update(g.Name, g.Name.Replace(origFullPath, newFullPath))
}
_, err = q.Where(q.Filepath.Eq(origFullPath)).Update(q.Filepath, newFullPath)
_, err = q.Where(q.Filepath.Eq(origFullPath)).Updates(&model.Config{
Filepath: newFullPath,
Name: json.NewName,
})
if err != nil {
api.ErrHandler(c, err)
return
@ -92,6 +97,6 @@ func Rename(c *gin.Context) {
}
c.JSON(http.StatusOK, gin.H{
"message": "ok",
"path": strings.TrimLeft(newFullPath, nginx.GetConfPath()),
})
}

4
api/config/router.go
View file

@ -9,9 +9,9 @@ func InitRouter(r *gin.RouterGroup) {
r.GET("config_base_path", GetBasePath)
r.GET("configs", GetConfigs)
r.GET("configs/*name", GetConfig)
r.GET("configs/*path", GetConfig)
r.POST("configs", AddConfig)
r.POST("configs/*name", EditConfig)
r.POST("configs/*path", EditConfig)
o := r.Group("", middleware.RequireSecureSession())
{