yhl452493373/frpc-panel
1
0
Fork 0
mirror of https://github.com/yhl452493373/frpc-panel.git synced 2026-04-04 06:17:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

add convert json to toml by toml.js

Browse Source
This commit is contained in:
杨黄林
2023-12-29 19:31:55 +08:00
parent 91c15936ee
commit 83ad03eca3
7 changed files with 8590 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
pkg/server/controller/controller.go
View File

@@ -3,8 +3,10 @@ package controller
import (
"bytes"
"fmt"
v1 "github.com/fatedier/frp/pkg/config/v1"
ginI18n "github.com/gin-contrib/i18n"
"github.com/gin-gonic/gin"
"github.com/pelletier/go-toml/v2"
"github.com/vaughan0/go-ini"
"log"
"net/http"
@@ -199,7 +201,8 @@ func (c *HandleController) MakeAddProxyFunc() func(context *gin.Context) {
func (c *HandleController) MakeUpdateProxyFunc() func(context *gin.Context) {
return func(context *gin.Context) {
proxy := ini.Section{}
proxyType := context.Query("type")
proxy := v1.NewProxyConfigurerByType(v1.ProxyType(proxyType))
response := OperationResponse{
Success: true,
@@ -207,6 +210,12 @@ func (c *HandleController) MakeUpdateProxyFunc() func(context *gin.Context) {
Message: "proxy update success",
}
var b = make([]byte, context.Request.ContentLength)
context.Request.Body.Read(b)
var s = string(b)
log.Print(s)
toml.Unmarshal(b, &proxy)
err := context.BindJSON(&proxy)
if err != nil {
response.Success = false
@@ -217,52 +226,56 @@ func (c *HandleController) MakeUpdateProxyFunc() func(context *gin.Context) {
return
}
oldName := proxy[OldNameKey]
name := proxy[NameKey]
context.JSON(200, &response)
if trimString(oldName) == "" || trimString(name) == "" {
response.Success = false
response.Code = ParamError
response.Message = fmt.Sprintf("proxy add failed, proxy name invalid")
log.Printf(response.Message)
context.JSON(http.StatusOK, &response)
return
}
if _, exist := clientProxies[oldName]; !exist {
response.Success = false
response.Code = ProxyNotExist
response.Message = fmt.Sprintf("proxy update failed, proxy not exist")
log.Printf(response.Message)
context.JSON(http.StatusOK, &response)
return
}
if oldName != name {
if _, exist := clientProxies[name]; exist {
response.Success = false
response.Code = ProxyExist
response.Message = fmt.Sprintf("proxy update failed, proxy exist")
log.Printf(response.Message)
context.JSON(http.StatusOK, &response)
return
}
}
delete(clientProxies, oldName)
clientProxies[name] = proxy
res := c.UpdateFrpcConfig()
if !res.Success {
response.Success = false
response.Code = res.Code
response.Message = fmt.Sprintf("user update failed, error : %v", res.Message)
log.Printf(response.Message)
context.JSON(http.StatusOK, &response)
return
}
context.JSON(http.StatusOK, &response)
//proxy.GetBaseConfig()
//
//oldName := proxy[OldNameKey]
//name := proxy[NameKey]
//
//if trimString(oldName) == "" || trimString(name) == "" {
// response.Success = false
// response.Code = ParamError
// response.Message = fmt.Sprintf("proxy add failed, proxy name invalid")
// log.Printf(response.Message)
// context.JSON(http.StatusOK, &response)
// return
//}
//
//if _, exist := clientProxies[oldName]; !exist {
// response.Success = false
// response.Code = ProxyNotExist
// response.Message = fmt.Sprintf("proxy update failed, proxy not exist")
// log.Printf(response.Message)
// context.JSON(http.StatusOK, &response)
// return
//}
//
//if oldName != name {
// if _, exist := clientProxies[name]; exist {
// response.Success = false
// response.Code = ProxyExist
// response.Message = fmt.Sprintf("proxy update failed, proxy exist")
// log.Printf(response.Message)
// context.JSON(http.StatusOK, &response)
// return
// }
//}
//
//delete(clientProxies, oldName)
//clientProxies[name] = proxy
//
//res := c.UpdateFrpcConfig()
//if !res.Success {
// response.Success = false
// response.Code = res.Code
// response.Message = fmt.Sprintf("user update failed, error : %v", res.Message)
// log.Printf(response.Message)
// context.JSON(http.StatusOK, &response)
// return
//}
//
//context.JSON(http.StatusOK, &response)
}
}