yxh пре 6 година
родитељ
комит
d779d21b74
4 измењених фајлова са 14 додато и 14 уклоњено
  1. 1 1
      app/controller/admin/public.go
  2. 9 9
      boot/boot.go
  3. 3 1
      library/response/response.go
  4. 1 3
      router/router.go

+ 1 - 1
app/controller/admin/public.go

@@ -11,5 +11,5 @@ type Public struct{}
 
 func (p *Public) Verify(r *ghttp.Request) {
 	idKeyC, base64stringC := utils.GetVerifyImg()
-	response.RJson(r, 200, "ok", g.MapStrStr{"idKeyC": idKeyC, "base64stringC": base64stringC})
+	response.SusJson(true, r, "ok", g.MapStrStr{"idKeyC": idKeyC, "base64stringC": base64stringC})
 }

+ 9 - 9
boot/boot.go

@@ -10,21 +10,21 @@ var AdminGfToken *gtoken.GfToken
 
 func init() {
 	g.Server().SetPort(8200)
-	g.Server().AddStaticPath("/public", g.Cfg().Get("server.ServerRoot").(string))
+	g.Server().AddStaticPath("/public", g.Cfg().GetString("server.ServerRoot"))
 	// 设置并启动后台gtoken处理
 	initAdminGfToken()
 }
 
 func initAdminGfToken() {
 	AdminGfToken = &gtoken.GfToken{
-		CacheMode:        int8(g.Cfg().Get("gToken.CacheMode").(float64)),
-		CacheKey:         g.Cfg().Get("gToken.CacheKey").(string),
-		Timeout:          int(g.Cfg().Get("gToken.Timeout").(float64)),
-		MaxRefresh:       int(g.Cfg().Get("gToken.MaxRefresh").(float64)),
-		TokenDelimiter:   g.Cfg().Get("gToken.TokenDelimiter").(string),
-		EncryptKey:       []byte(g.Cfg().Get("gToken.EncryptKey").(string)),
-		AuthFailMsg:      g.Cfg().Get("gToken.AuthFailMsg").(string),
-		MultiLogin:       g.Cfg().Get("gToken.MultiLogin").(bool),
+		CacheMode:        g.Cfg().GetInt8("gToken.CacheMode"),
+		CacheKey:         g.Cfg().GetString("gToken.CacheKey"),
+		Timeout:          g.Cfg().GetInt("gToken.Timeout"),
+		MaxRefresh:       g.Cfg().GetInt("gToken.MaxRefresh"),
+		TokenDelimiter:   g.Cfg().GetString("gToken.TokenDelimiter"),
+		EncryptKey:       g.Cfg().GetBytes("gToken.EncryptKey"),
+		AuthFailMsg:      g.Cfg().GetString("gToken.AuthFailMsg"),
+		MultiLogin:       g.Cfg().GetBool("gToken.MultiLogin"),
 		LoginPath:        "/sysLogin/login",
 		LoginBeforeFunc:  utils.AdminLogin,
 		LogoutPath:       "/sysLogin/logout",

+ 3 - 1
library/response/response.go

@@ -23,7 +23,9 @@ func JsonExit(r *ghttp.Request, code int, msg string, data ...interface{}) {
 // data: 请求结果,根据不同接口返回结果的数据结构不同;
 func RJson(r *ghttp.Request, code int, msg string, data ...interface{}) {
 	responseData := interface{}(nil)
-	responseData = data
+	if len(data) > 0 {
+		responseData = data[0]
+	}
 	r.Response.WriteJson(g.Map{
 		"code": code,
 		"msg":  msg,

+ 1 - 3
router/router.go

@@ -8,10 +8,8 @@ import (
 // 统一路由注册.
 func init() {
 	s := g.Server()
-	s.BindMiddleware("/sysLogin/login", MiddlewareCORS)
-	s.BindMiddleware("/sysLogin/logout", MiddlewareCORS)
+	s.Use(MiddlewareCORS)
 	group := s.Group("/")
-	group.Middleware(MiddlewareCORS)
 	sysLoginGroup := group.Group("/sysLogin")
 	sysLoginGroup.ALL("/public", new(admin.Public))
 	systemGroup := group.Group("/system")