Skip to content

Commit 1ee5700

Browse files
0xJackyHintay
authored andcommitted
feat: add ca_dir settings in webui
1 parent b8b17d8 commit 1ee5700

File tree

5 files changed

+44
-66
lines changed

5 files changed

+44
-66
lines changed

frontend/src/views/preference/BasicSettings.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ const theme = inject('theme')
4242
<a-input v-model:value="data.server.github_proxy"
4343
:placeholder="$gettext('Chinese user: https://ghproxy.com/')"/>
4444
</a-form-item>
45+
<a-form-item :label="$gettext('CADir')">
46+
<a-input v-model:value="data.server.ca_dir"/>
47+
</a-form-item>
4548
</a-form>
4649
</template>
4750

frontend/src/views/preference/GitSettings.vue

Lines changed: 0 additions & 24 deletions
This file was deleted.

frontend/src/views/preference/Preference.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ const activeKey = ref('1')
8282
<a-tab-pane :tab="$gettext('OpenAI')" key="3">
8383
<open-a-i-settings/>
8484
</a-tab-pane>
85-
<a-tab-pane :tab="$gettext('Git')" key="4">
86-
<git-settings/>
87-
</a-tab-pane>
8885
</a-tabs>
8986
</div>
9087
<footer-tool-bar>

frontend/src/views/preference/typedef.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ export interface IData {
66
start_cmd: string
77
http_challenge_port: string
88
github_proxy: string,
9-
email: string
9+
email: string,
10+
ca_dir: string
1011
},
1112
nginx_log: {
1213
access_log_path: string

server/api/settings.go

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
package api
22

33
import (
4-
"github.com/0xJacky/Nginx-UI/server/settings"
5-
"github.com/gin-gonic/gin"
6-
"net/http"
4+
"github.com/0xJacky/Nginx-UI/server/settings"
5+
"github.com/gin-gonic/gin"
6+
"net/http"
77
)
88

99
func GetSettings(c *gin.Context) {
10-
c.JSON(http.StatusOK, gin.H{
11-
"server": settings.ServerSettings,
12-
"nginx_log": settings.NginxLogSettings,
13-
"openai": settings.OpenAISettings,
14-
"git": settings.GitSettings,
15-
})
10+
c.JSON(http.StatusOK, gin.H{
11+
"server": settings.ServerSettings,
12+
"nginx_log": settings.NginxLogSettings,
13+
"openai": settings.OpenAISettings,
14+
"git": settings.GitSettings,
15+
})
1616
}
1717

1818
func SaveSettings(c *gin.Context) {
19-
var json struct {
20-
Server settings.Server `json:"server"`
21-
NginxLog settings.NginxLog `json:"nginx_log"`
22-
Openai settings.OpenAI `json:"openai"`
23-
}
24-
25-
if !BindAndValid(c, &json) {
26-
return
27-
}
28-
29-
settings.Conf.Section("server").Key("Email").SetValue(json.Server.Email)
30-
settings.Conf.Section("server").Key("HTTPChallengePort").SetValue(json.Server.HTTPChallengePort)
31-
settings.Conf.Section("server").Key("GithubProxy").SetValue(json.Server.GithubProxy)
32-
33-
settings.Conf.Section("nginx_log").Key("AccessLogPath").SetValue(json.NginxLog.AccessLogPath)
34-
settings.Conf.Section("nginx_log").Key("ErrorLogPath").SetValue(json.NginxLog.ErrorLogPath)
35-
36-
settings.Conf.Section("openai").Key("Model").SetValue(json.Openai.Model)
37-
settings.Conf.Section("openai").Key("BaseUrl").SetValue(json.Openai.BaseUrl)
38-
settings.Conf.Section("openai").Key("Proxy").SetValue(json.Openai.Proxy)
39-
settings.Conf.Section("openai").Key("Token").SetValue(json.Openai.Token)
40-
41-
err := settings.Save()
42-
if err != nil {
43-
ErrHandler(c, err)
44-
return
45-
}
46-
47-
GetSettings(c)
19+
var json struct {
20+
Server settings.Server `json:"server"`
21+
NginxLog settings.NginxLog `json:"nginx_log"`
22+
Openai settings.OpenAI `json:"openai"`
23+
}
24+
25+
if !BindAndValid(c, &json) {
26+
return
27+
}
28+
29+
settings.Conf.Section("server").Key("Email").SetValue(json.Server.Email)
30+
settings.Conf.Section("server").Key("HTTPChallengePort").SetValue(json.Server.HTTPChallengePort)
31+
settings.Conf.Section("server").Key("GithubProxy").SetValue(json.Server.GithubProxy)
32+
settings.Conf.Section("server").Key("CADir").SetValue(json.Server.CADir)
33+
34+
settings.Conf.Section("nginx_log").Key("AccessLogPath").SetValue(json.NginxLog.AccessLogPath)
35+
settings.Conf.Section("nginx_log").Key("ErrorLogPath").SetValue(json.NginxLog.ErrorLogPath)
36+
37+
settings.Conf.Section("openai").Key("Model").SetValue(json.Openai.Model)
38+
settings.Conf.Section("openai").Key("BaseUrl").SetValue(json.Openai.BaseUrl)
39+
settings.Conf.Section("openai").Key("Proxy").SetValue(json.Openai.Proxy)
40+
settings.Conf.Section("openai").Key("Token").SetValue(json.Openai.Token)
41+
42+
err := settings.Save()
43+
if err != nil {
44+
ErrHandler(c, err)
45+
return
46+
}
47+
48+
GetSettings(c)
4849
}

0 commit comments

Comments
 (0)