Browse Source

fix(admin): Admin web title

lejianwen 11 months ago
parent
commit
63cf231bdc
4 changed files with 16 additions and 4 deletions
  1. 1 1
      conf/admin/hello.html
  2. 6 0
      http/controller/admin/config.go
  3. 8 2
      http/router/admin.go
  4. 1 1
      service/user.go

+ 1 - 1
conf/admin/hello.html

@@ -1 +1 @@
1
-### 👏👏👏 你好 ***{{username}}***, 欢迎使用 [RustDesk Api](https://github.com/lejianwen/rustdesk-api)
1
+### 👏👏👏 你好 ***{{username}}***, 欢迎使用 [RustDesk API](https://github.com/lejianwen/rustdesk-api)

+ 6 - 0
http/controller/admin/config.go

@@ -61,6 +61,12 @@ func (co *Config) AppConfig(c *gin.Context) {
61 61
 func (co *Config) AdminConfig(c *gin.Context) {
62 62
 
63 63
 	u := service.AllService.UserService.CurUser(c)
64
+	if u == nil || u.Id == 0 {
65
+		response.Success(c, &gin.H{
66
+			"title": global.Config.Admin.Title,
67
+		})
68
+		return
69
+	}
64 70
 	hello := global.Config.Admin.Hello
65 71
 	helloFile := global.Config.Admin.HelloFile
66 72
 	if helloFile != "" {

+ 8 - 2
http/router/admin.go

@@ -22,6 +22,9 @@ func Init(g *gin.Engine) {
22 22
 	adg := g.Group("/api/admin")
23 23
 	LoginBind(adg)
24 24
 	adg.POST("/user/register", (&admin.User{}).Register)
25
+
26
+	ConfigBind(adg)
27
+
25 28
 	adg.Use(middleware.AdminAuth())
26 29
 	//FileBind(adg)
27 30
 	UserBind(adg)
@@ -35,7 +38,6 @@ func Init(g *gin.Engine) {
35 38
 	AddressBookCollectionBind(adg)
36 39
 	AddressBookCollectionRuleBind(adg)
37 40
 	UserTokenBind(adg)
38
-	ConfigBind(adg)
39 41
 
40 42
 	//deprecated by ConfigBind
41 43
 	//rs := &admin.Rustdesk{}
@@ -221,9 +223,13 @@ func UserTokenBind(rg *gin.RouterGroup) {
221 223
 func ConfigBind(rg *gin.RouterGroup) {
222 224
 	aR := rg.Group("/config")
223 225
 	rs := &admin.Config{}
226
+
227
+	aR.GET("/admin", rs.AdminConfig)
228
+
229
+	aR.Use(middleware.AdminAuth())
224 230
 	aR.GET("/server", rs.ServerConfig)
225 231
 	aR.GET("/app", rs.AppConfig)
226
-	aR.GET("/admin", rs.AdminConfig)
232
+
227 233
 }
228 234
 
229 235
 /*

+ 1 - 1
service/user.go

@@ -280,7 +280,7 @@ func (us *UserService) UpdatePassword(u *model.User, password string) error {
280 280
 
281 281
 // IsAdmin 是否管理员
282 282
 func (us *UserService) IsAdmin(u *model.User) bool {
283
-	return *u.IsAdmin
283
+	return u != nil && *u.IsAdmin
284 284
 }
285 285
 
286 286
 // RouteNames