Skip to content

Commit 584cbd7

Browse files
HintayHintay
committed
Clean codes.
1 parent 8303519 commit 584cbd7

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

‎server/api/cert.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package api
22

33
import (
44
"encoding/json"
5-
tool2 "github.com/0xJacky/Nginx-UI/server/tool"
5+
"github.com/0xJacky/Nginx-UI/server/tool"
66
"github.com/gin-gonic/gin"
77
"github.com/gorilla/websocket"
88
"log"
@@ -13,7 +13,7 @@ import (
1313
func CertInfo(c *gin.Context) {
1414
domain := c.Param("domain")
1515

16-
key := tool2.GetCertInfo(domain)
16+
key := tool.GetCertInfo(domain)
1717

1818
c.JSON(http.StatusOK, gin.H{
1919
"subject_name": key.Subject.CommonName,
@@ -55,7 +55,7 @@ func IssueCert(c *gin.Context) {
5555
if string(message) == "go" {
5656
var m []byte
5757

58-
err = tool2.IssueCert(domain)
58+
err = tool.IssueCert(domain)
5959
if err != nil {
6060
m, err = json.Marshal(gin.H{
6161
"status": "error",
@@ -78,7 +78,7 @@ func IssueCert(c *gin.Context) {
7878
return
7979
}
8080

81-
sslCertificatePath := tool2.GetNginxConfPath("ssl/" + domain + "/fullchain.cer")
81+
sslCertificatePath := tool.GetNginxConfPath("ssl/" + domain + "/fullchain.cer")
8282
_, err = os.Stat(sslCertificatePath)
8383

8484
if err != nil {
@@ -104,7 +104,7 @@ func IssueCert(c *gin.Context) {
104104
return
105105
}
106106

107-
sslCertificateKeyPath := tool2.GetNginxConfPath("ssl/" + domain + "/" + domain + ".key")
107+
sslCertificateKeyPath := tool.GetNginxConfPath("ssl/" + domain + "/" + domain + ".key")
108108
_, err = os.Stat(sslCertificateKeyPath)
109109

110110
if err != nil {

‎server/api/config.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package api
22

33
import (
4-
tool2 "github.com/0xJacky/Nginx-UI/server/tool"
4+
"github.com/0xJacky/Nginx-UI/server/tool"
55
"github.com/gin-gonic/gin"
66
"io/ioutil"
77
"log"
@@ -19,7 +19,7 @@ func GetConfigs(c *gin.Context) {
1919
"modify": "time",
2020
}
2121

22-
configFiles, err := ioutil.ReadDir(tool2.GetNginxConfPath("/"))
22+
configFiles, err := ioutil.ReadDir(tool.GetNginxConfPath("/"))
2323

2424
if err != nil {
2525
ErrHandler(c, err)
@@ -40,7 +40,7 @@ func GetConfigs(c *gin.Context) {
4040
}
4141
}
4242

43-
configs = tool2.Sort(orderBy, sort, mySort[orderBy], configs)
43+
configs = tool.Sort(orderBy, sort, mySort[orderBy], configs)
4444

4545
c.JSON(http.StatusOK, gin.H{
4646
"configs": configs,
@@ -49,7 +49,7 @@ func GetConfigs(c *gin.Context) {
4949

5050
func GetConfig(c *gin.Context) {
5151
name := c.Param("name")
52-
path := filepath.Join(tool2.GetNginxConfPath("/"), name)
52+
path := filepath.Join(tool.GetNginxConfPath("/"), name)
5353

5454
content, err := ioutil.ReadFile(path)
5555

@@ -80,7 +80,7 @@ func AddConfig(c *gin.Context) {
8080
name := request.Name
8181
content := request.Content
8282

83-
path := filepath.Join(tool2.GetNginxConfPath("/"), name)
83+
path := filepath.Join(tool.GetNginxConfPath("/"), name)
8484

8585
log.Println(path)
8686
if _, err = os.Stat(path); err == nil {
@@ -98,7 +98,7 @@ func AddConfig(c *gin.Context) {
9898
}
9999
}
100100

101-
output := tool2.ReloadNginx()
101+
output := tool.ReloadNginx()
102102

103103
if output != "" {
104104
c.JSON(http.StatusInternalServerError, gin.H{
@@ -126,7 +126,7 @@ func EditConfig(c *gin.Context) {
126126
ErrHandler(c, err)
127127
return
128128
}
129-
path := filepath.Join(tool2.GetNginxConfPath("/"), name)
129+
path := filepath.Join(tool.GetNginxConfPath("/"), name)
130130
content := request.Content
131131

132132
origContent, err := ioutil.ReadFile(path)
@@ -144,7 +144,7 @@ func EditConfig(c *gin.Context) {
144144
}
145145
}
146146

147-
output := tool2.ReloadNginx()
147+
output := tool.ReloadNginx()
148148

149149
if output != "" {
150150
c.JSON(http.StatusInternalServerError, gin.H{

‎server/api/domain.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package api
22

33
import (
44
"github.com/0xJacky/Nginx-UI/server/model"
5-
tool2 "github.com/0xJacky/Nginx-UI/server/tool"
5+
"github.com/0xJacky/Nginx-UI/server/tool"
66
"github.com/gin-gonic/gin"
77
"io/ioutil"
88
"net/http"
@@ -20,14 +20,14 @@ func GetDomains(c *gin.Context) {
2020
"modify": "time",
2121
}
2222

23-
configFiles, err := ioutil.ReadDir(tool2.GetNginxConfPath("sites-available"))
23+
configFiles, err := ioutil.ReadDir(tool.GetNginxConfPath("sites-available"))
2424

2525
if err != nil {
2626
ErrHandler(c, err)
2727
return
2828
}
2929

30-
enabledConfig, err := ioutil.ReadDir(filepath.Join(tool2.GetNginxConfPath("sites-enabled")))
30+
enabledConfig, err := ioutil.ReadDir(filepath.Join(tool.GetNginxConfPath("sites-enabled")))
3131

3232
enabledConfigMap := make(map[string]bool)
3333
for i := range enabledConfig {
@@ -53,7 +53,7 @@ func GetDomains(c *gin.Context) {
5353
}
5454
}
5555

56-
configs = tool2.Sort(orderBy, sort, mySort[orderBy], configs)
56+
configs = tool.Sort(orderBy, sort, mySort[orderBy], configs)
5757

5858
c.JSON(http.StatusOK, gin.H{
5959
"configs": configs,
@@ -62,10 +62,10 @@ func GetDomains(c *gin.Context) {
6262

6363
func GetDomain(c *gin.Context) {
6464
name := c.Param("name")
65-
path := filepath.Join(tool2.GetNginxConfPath("sites-available"), name)
65+
path := filepath.Join(tool.GetNginxConfPath("sites-available"), name)
6666

6767
enabled := true
68-
if _, err := os.Stat(filepath.Join(tool2.GetNginxConfPath("sites-enabled"), name)); os.IsNotExist(err) {
68+
if _, err := os.Stat(filepath.Join(tool.GetNginxConfPath("sites-enabled"), name)); os.IsNotExist(err) {
6969
enabled = false
7070
}
7171

@@ -98,26 +98,26 @@ func EditDomain(c *gin.Context) {
9898
name := c.Param("name")
9999
request := make(gin.H)
100100
err = c.BindJSON(&request)
101-
path := filepath.Join(tool2.GetNginxConfPath("sites-available"), name)
101+
path := filepath.Join(tool.GetNginxConfPath("sites-available"), name)
102102

103103
err = ioutil.WriteFile(path, []byte(request["content"].(string)), 0644)
104104
if err != nil {
105105
ErrHandler(c, err)
106106
return
107107
}
108108

109-
enabledConfigFilePath := filepath.Join(tool2.GetNginxConfPath("sites-enabled"), name)
109+
enabledConfigFilePath := filepath.Join(tool.GetNginxConfPath("sites-enabled"), name)
110110
if _, err = os.Stat(enabledConfigFilePath); err == nil {
111111
// 测试配置文件
112-
err = tool2.TestNginxConf(enabledConfigFilePath)
112+
err = tool.TestNginxConf(enabledConfigFilePath)
113113
if err != nil {
114114
c.JSON(http.StatusInternalServerError, gin.H{
115115
"message": err.Error(),
116116
})
117117
return
118118
}
119119

120-
output := tool2.ReloadNginx()
120+
output := tool.ReloadNginx()
121121

122122
if output != "" {
123123
c.JSON(http.StatusInternalServerError, gin.H{
@@ -131,8 +131,8 @@ func EditDomain(c *gin.Context) {
131131
}
132132

133133
func EnableDomain(c *gin.Context) {
134-
configFilePath := filepath.Join(tool2.GetNginxConfPath("sites-available"), c.Param("name"))
135-
enabledConfigFilePath := filepath.Join(tool2.GetNginxConfPath("sites-enabled"), c.Param("name"))
134+
configFilePath := filepath.Join(tool.GetNginxConfPath("sites-available"), c.Param("name"))
135+
enabledConfigFilePath := filepath.Join(tool.GetNginxConfPath("sites-enabled"), c.Param("name"))
136136

137137
_, err := os.Stat(configFilePath)
138138

@@ -149,7 +149,7 @@ func EnableDomain(c *gin.Context) {
149149
}
150150

151151
// 测试配置文件，不通过则撤回启用
152-
err = tool2.TestNginxConf(enabledConfigFilePath)
152+
err = tool.TestNginxConf(enabledConfigFilePath)
153153
if err != nil {
154154
_ = os.Remove(enabledConfigFilePath)
155155
c.JSON(http.StatusInternalServerError, gin.H{
@@ -158,7 +158,7 @@ func EnableDomain(c *gin.Context) {
158158
return
159159
}
160160

161-
output := tool2.ReloadNginx()
161+
output := tool.ReloadNginx()
162162

163163
if output != "" {
164164
c.JSON(http.StatusInternalServerError, gin.H{
@@ -173,7 +173,7 @@ func EnableDomain(c *gin.Context) {
173173
}
174174

175175
func DisableDomain(c *gin.Context) {
176-
enabledConfigFilePath := filepath.Join(tool2.GetNginxConfPath("sites-enabled"), c.Param("name"))
176+
enabledConfigFilePath := filepath.Join(tool.GetNginxConfPath("sites-enabled"), c.Param("name"))
177177

178178
_, err := os.Stat(enabledConfigFilePath)
179179

@@ -189,7 +189,7 @@ func DisableDomain(c *gin.Context) {
189189
return
190190
}
191191

192-
output := tool2.ReloadNginx()
192+
output := tool.ReloadNginx()
193193

194194
if output != "" {
195195
c.JSON(http.StatusInternalServerError, gin.H{
@@ -206,8 +206,8 @@ func DisableDomain(c *gin.Context) {
206206
func DeleteDomain(c *gin.Context) {
207207
var err error
208208
name := c.Param("name")
209-
availablePath := filepath.Join(tool2.GetNginxConfPath("sites-available"), name)
210-
enabledPath := filepath.Join(tool2.GetNginxConfPath("sites-enabled"), name)
209+
availablePath := filepath.Join(tool.GetNginxConfPath("sites-available"), name)
210+
enabledPath := filepath.Join(tool.GetNginxConfPath("sites-enabled"), name)
211211

212212
if _, err = os.Stat(availablePath); os.IsNotExist(err) {
213213
c.JSON(http.StatusNotFound, gin.H{

‎server/api/user.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package api
22

33
import (
44
"errors"
5-
model2 "github.com/0xJacky/Nginx-UI/server/model"
5+
"github.com/0xJacky/Nginx-UI/server/model"
66
"github.com/gin-gonic/gin"
77
"github.com/spf13/cast"
88
"golang.org/x/crypto/bcrypt"
99
"net/http"
1010
)
1111

1212
func GetUsers(c *gin.Context) {
13-
curd := model2.NewCurd(&model2.Auth{})
13+
curd := model.NewCurd(&model.Auth{})
1414

15-
var list []model2.Auth
15+
var list []model.Auth
1616
err := curd.GetList(&list)
1717

1818
if err != nil {
@@ -25,10 +25,10 @@ func GetUsers(c *gin.Context) {
2525
}
2626

2727
func GetUser(c *gin.Context) {
28-
curd := model2.NewCurd(&model2.Auth{})
28+
curd := model.NewCurd(&model.Auth{})
2929
id := c.Param("id")
3030

31-
var user model2.Auth
31+
var user model.Auth
3232
err := curd.First(&user, id)
3333

3434
if err != nil {
@@ -49,7 +49,7 @@ func AddUser(c *gin.Context) {
4949
if !ok {
5050
return
5151
}
52-
curd := model2.NewCurd(&model2.Auth{})
52+
curd := model.NewCurd(&model.Auth{})
5353

5454
pwd, err := bcrypt.GenerateFromPassword([]byte(json.Password), bcrypt.DefaultCost)
5555
if err != nil {
@@ -58,7 +58,7 @@ func AddUser(c *gin.Context) {
5858
}
5959
json.Password = string(pwd)
6060

61-
user := model2.Auth{
61+
user := model.Auth{
6262
Name: json.Name,
6363
Password: json.Password,
6464
}
@@ -80,9 +80,9 @@ func EditUser(c *gin.Context) {
8080
if !ok {
8181
return
8282
}
83-
curd := model2.NewCurd(&model2.Auth{})
83+
curd := model.NewCurd(&model.Auth{})
8484

85-
var user, edit model2.Auth
85+
var user, edit model.Auth
8686

8787
err := curd.First(&user, c.Param("id"))
8888

@@ -120,8 +120,8 @@ func DeleteUser(c *gin.Context) {
120120
ErrHandler(c, errors.New("不允许删除默认账户"))
121121
return
122122
}
123-
curd := model2.NewCurd(&model2.Auth{})
124-
err := curd.Delete(&model2.Auth{}, "id", id)
123+
curd := model.NewCurd(&model.Auth{})
124+
err := curd.Delete(&model.Auth{}, "id", id)
125125
if err != nil {
126126
ErrHandler(c, err)
127127
return

0 commit comments

Comments
 (0)