Sfoglia il codice sorgente

"QueryTraderMenu"接口优化

Simon Zhou 5 anni fa
parent
commit
df8bc36cd6
4 ha cambiato i file con 24 aggiunte e 10 eliminazioni
  1. 10 2
      controllers/common/table.go
  2. 3 1
      global/e/code.go
  3. 10 6
      global/e/msg.go
  4. 1 1
      routers/router.go

+ 10 - 2
controllers/common/table.go

@@ -82,7 +82,7 @@ func QueryTraderMenu(c *gin.Context) {
 	// 获取请求参数
 	var req QueryTraderMenuReq
 	if err := appG.C.ShouldBindQuery(&req); err != nil {
-		logger.GetLogger().Errorf("QueryPreasleApply failed: %s", err.Error())
+		logger.GetLogger().Errorf("QueryTraderMenu failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
 		return
 	}
@@ -91,14 +91,22 @@ func QueryTraderMenu(c *gin.Context) {
 	// 获取行情报价牌分类菜单
 	if datas, err := getQuoteMenu(req.LoginID); err == nil {
 		queryTraderMenuRsp.QuoteMenu = datas
+	} else {
+		logger.GetLogger().Errorf("QueryTraderMenu failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_QUOTEMENU_FAIL, nil)
+		return
 	}
 	// 获取功能菜单
 	if datas, err := getOperationMenu(); err == nil {
 		queryTraderMenuRsp.OperationMenu = datas
+	} else {
+		logger.GetLogger().Errorf("QueryTraderMenu failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_OPERATIONMENU_FAIL, nil)
+		return
 	}
 
 	// 查询成功
-	logger.GetLogger().Infof("QueryPreasleApply successed: %v", queryTraderMenuRsp)
+	logger.GetLogger().Infof("QueryTraderMenu successed: %v", queryTraderMenuRsp)
 	appG.Response(http.StatusOK, e.SUCCESS, queryTraderMenuRsp)
 }
 

+ 3 - 1
global/e/code.go

@@ -8,7 +8,9 @@ const (
 	ERROR_AUTH_CHECK_TOKEN_MISSING = 20001
 	ERROR_AUTH_CHECK_TOKEN_FAIL    = 20002
 
-	ERROR_QUERY_FAIL = 30001
+	ERROR_QUERY_FAIL               = 30001
+	ERROR_QUERY_QUOTEMENU_FAIL     = 30002
+	ERROR_QUERY_OPERATIONMENU_FAIL = 30003
 
 	ERROR_UPLOAD_SAVE_IMAGE_FAIL    = 40001
 	ERROR_UPLOAD_CHECK_IMAGE_FAIL   = 40002

+ 10 - 6
global/e/msg.go

@@ -2,12 +2,16 @@ package e
 
 // MsgFlags 接口返回信息
 var MsgFlags = map[int]string{
-	SUCCESS:                         "ok",
-	ERROR:                           "fail",
-	INVALID_PARAMS:                  "请求参数错误",
-	ERROR_AUTH_CHECK_TOKEN_MISSING:  "Token缺失",
-	ERROR_AUTH_CHECK_TOKEN_FAIL:     "Token鉴权失败",
-	ERROR_QUERY_FAIL:                "查询失败",
+	SUCCESS:                        "ok",
+	ERROR:                          "fail",
+	INVALID_PARAMS:                 "请求参数错误",
+	ERROR_AUTH_CHECK_TOKEN_MISSING: "Token缺失",
+	ERROR_AUTH_CHECK_TOKEN_FAIL:    "Token鉴权失败",
+
+	ERROR_QUERY_FAIL:               "查询失败",
+	ERROR_QUERY_QUOTEMENU_FAIL:     "查询交易端行情报价牌分类菜单失败",
+	ERROR_QUERY_OPERATIONMENU_FAIL: "查询交易端功能菜单失败",
+
 	ERROR_UPLOAD_SAVE_IMAGE_FAIL:    "保存图片失败",
 	ERROR_UPLOAD_CHECK_IMAGE_FAIL:   "检查图片失败",
 	ERROR_UPLOAD_CHECK_IMAGE_FORMAT: "校验图片错误,图片格式或大小有问题",

+ 1 - 1
routers/router.go

@@ -47,7 +47,7 @@ func InitRouter() *gin.Engine {
 	}
 	// ************************ 通用功能 ************************
 	commonR := apiR.Group("Common")
-	commonR.Use()
+	commonR.Use(token.Auth())
 	{
 		commonR.GET("/QueryTraderMenu", common.QueryTraderMenu)
 	}