diff --git a/frontend/src/views/preference/BasicSettings.vue b/frontend/src/views/preference/BasicSettings.vue
index 4839015b..0cfe344a 100644
--- a/frontend/src/views/preference/BasicSettings.vue
+++ b/frontend/src/views/preference/BasicSettings.vue
@@ -42,6 +42,9 @@ const theme = inject('theme')
+
+
+
diff --git a/frontend/src/views/preference/GitSettings.vue b/frontend/src/views/preference/GitSettings.vue
deleted file mode 100644
index 5e3bdad2..00000000
--- a/frontend/src/views/preference/GitSettings.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/views/preference/Preference.vue b/frontend/src/views/preference/Preference.vue
index dac98d42..87251386 100644
--- a/frontend/src/views/preference/Preference.vue
+++ b/frontend/src/views/preference/Preference.vue
@@ -82,9 +82,6 @@ const activeKey = ref('1')
-
-
-
diff --git a/frontend/src/views/preference/typedef.ts b/frontend/src/views/preference/typedef.ts
index 3add651b..8fea3951 100644
--- a/frontend/src/views/preference/typedef.ts
+++ b/frontend/src/views/preference/typedef.ts
@@ -6,7 +6,8 @@ export interface IData {
start_cmd: string
http_challenge_port: string
github_proxy: string,
- email: string
+ email: string,
+ ca_dir: string
},
nginx_log: {
access_log_path: string
diff --git a/server/api/settings.go b/server/api/settings.go
index d1d2b966..f5901e05 100644
--- a/server/api/settings.go
+++ b/server/api/settings.go
@@ -1,48 +1,49 @@
package api
import (
- "github.com/0xJacky/Nginx-UI/server/settings"
- "github.com/gin-gonic/gin"
- "net/http"
+ "github.com/0xJacky/Nginx-UI/server/settings"
+ "github.com/gin-gonic/gin"
+ "net/http"
)
func GetSettings(c *gin.Context) {
- c.JSON(http.StatusOK, gin.H{
- "server": settings.ServerSettings,
- "nginx_log": settings.NginxLogSettings,
- "openai": settings.OpenAISettings,
- "git": settings.GitSettings,
- })
+ c.JSON(http.StatusOK, gin.H{
+ "server": settings.ServerSettings,
+ "nginx_log": settings.NginxLogSettings,
+ "openai": settings.OpenAISettings,
+ "git": settings.GitSettings,
+ })
}
func SaveSettings(c *gin.Context) {
- var json struct {
- Server settings.Server `json:"server"`
- NginxLog settings.NginxLog `json:"nginx_log"`
- Openai settings.OpenAI `json:"openai"`
- }
+ var json struct {
+ Server settings.Server `json:"server"`
+ NginxLog settings.NginxLog `json:"nginx_log"`
+ Openai settings.OpenAI `json:"openai"`
+ }
- if !BindAndValid(c, &json) {
- return
- }
+ if !BindAndValid(c, &json) {
+ return
+ }
- settings.Conf.Section("server").Key("Email").SetValue(json.Server.Email)
- settings.Conf.Section("server").Key("HTTPChallengePort").SetValue(json.Server.HTTPChallengePort)
- settings.Conf.Section("server").Key("GithubProxy").SetValue(json.Server.GithubProxy)
+ settings.Conf.Section("server").Key("Email").SetValue(json.Server.Email)
+ settings.Conf.Section("server").Key("HTTPChallengePort").SetValue(json.Server.HTTPChallengePort)
+ settings.Conf.Section("server").Key("GithubProxy").SetValue(json.Server.GithubProxy)
+ settings.Conf.Section("server").Key("CADir").SetValue(json.Server.CADir)
- settings.Conf.Section("nginx_log").Key("AccessLogPath").SetValue(json.NginxLog.AccessLogPath)
- settings.Conf.Section("nginx_log").Key("ErrorLogPath").SetValue(json.NginxLog.ErrorLogPath)
+ settings.Conf.Section("nginx_log").Key("AccessLogPath").SetValue(json.NginxLog.AccessLogPath)
+ settings.Conf.Section("nginx_log").Key("ErrorLogPath").SetValue(json.NginxLog.ErrorLogPath)
- settings.Conf.Section("openai").Key("Model").SetValue(json.Openai.Model)
- settings.Conf.Section("openai").Key("BaseUrl").SetValue(json.Openai.BaseUrl)
- settings.Conf.Section("openai").Key("Proxy").SetValue(json.Openai.Proxy)
- settings.Conf.Section("openai").Key("Token").SetValue(json.Openai.Token)
+ settings.Conf.Section("openai").Key("Model").SetValue(json.Openai.Model)
+ settings.Conf.Section("openai").Key("BaseUrl").SetValue(json.Openai.BaseUrl)
+ settings.Conf.Section("openai").Key("Proxy").SetValue(json.Openai.Proxy)
+ settings.Conf.Section("openai").Key("Token").SetValue(json.Openai.Token)
- err := settings.Save()
- if err != nil {
- ErrHandler(c, err)
- return
- }
+ err := settings.Save()
+ if err != nil {
+ ErrHandler(c, err)
+ return
+ }
- GetSettings(c)
+ GetSettings(c)
}