Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-02-04 12:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ feat: 展示排序 close #29

Browse Source
This commit is contained in:
naiba
2021-01-08 21:04:50 +08:00
parent 35766e590d
commit 347bb7faa0
14 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/dashboard/controller/common_page.go
View File

@@ -27,7 +27,7 @@ func (cp *commonPage) home(c *gin.Context) {
dao.ServerLock.RLock()
defer dao.ServerLock.RUnlock()
data := gin.H{
"Servers": dao.ServerList,
"Servers": dao.SortedServerList,
"CustomCode": dao.Conf.Site.CustomCode,
}
u, ok := c.Get(model.CtxKeyAuthorizedUser)
@@ -54,7 +54,7 @@ func (cp *commonPage) ws(c *gin.Context) {
defer conn.Close()
for {
dao.ServerLock.RLock()
err = conn.WriteJSON(dao.ServerList)
err = conn.WriteJSON(dao.SortedServerList)
dao.ServerLock.RUnlock()
if err != nil {
break

28
cmd/dashboard/controller/member_api.go
View File

@@ -56,7 +56,8 @@ func (ma *memberAPI) delete(c *gin.Context) {
defer dao.ServerLock.Unlock()
err = dao.DB.Delete(&model.Server{}, "id = ?", id).Error
if err == nil {
delete(dao.ServerList, strconv.FormatUint(id, 10))
delete(dao.ServerList, id)
dao.ReSortServer()
}
case "notification":
err = dao.DB.Delete(&model.Notification{}, "id = ?", id).Error
@@ -82,9 +83,10 @@ func (ma *memberAPI) delete(c *gin.Context) {
}
type serverForm struct {
ID uint64
Name string `binding:"required"`
Secret string
ID uint64
Name string `binding:"required"`
DisplayIndex int
Secret string
}
func (ma *memberAPI) addOrEditServer(c *gin.Context) {
@@ -97,14 +99,15 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
defer dao.ServerLock.Unlock()
s.Name = sf.Name
s.Secret = sf.Secret
s.DisplayIndex = sf.DisplayIndex
s.ID = sf.ID
}
if sf.ID == 0 {
s.Secret = com.MD5(fmt.Sprintf("%s%s%d", time.Now(), sf.Name, admin.ID))
s.Secret = s.Secret[:10]
err = dao.DB.Create(&s).Error
} else {
err = dao.DB.Save(&s).Error
if sf.ID == 0 {
s.Secret = com.MD5(fmt.Sprintf("%s%s%d", time.Now(), sf.Name, admin.ID))
s.Secret = s.Secret[:10]
err = dao.DB.Create(&s).Error
} else {
err = dao.DB.Save(&s).Error
}
}
if err != nil {
c.JSON(http.StatusOK, model.Response{
@@ -115,7 +118,8 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
}
s.Host = &model.Host{}
s.State = &model.State{}
dao.ServerList[fmt.Sprintf("%d", s.ID)] = &s
dao.ServerList[s.ID] = &s
dao.ReSortServer()
c.JSON(http.StatusOK, model.Response{
Code: http.StatusOK,
})

2
cmd/dashboard/controller/member_page.go
View File

@@ -32,7 +32,7 @@ func (mp *memberPage) server(c *gin.Context) {
defer dao.ServerLock.RUnlock()
c.HTML(http.StatusOK, "dashboard/server", mygin.CommonEnvironment(c, gin.H{
"Title": "服务器管理",
"Servers": dao.ServerList,
"Servers": dao.SortedServerList,
}))
}