Merge remote-tracking branch 'origin/main' into multi-tenant

This commit is contained in:
TsMask
2024-08-17 18:25:43 +08:00
69 changed files with 3295 additions and 4634 deletions

View File

@@ -3,7 +3,7 @@ package result
import (
"fmt"
"be.ems/src/framework/constants/result"
constResult "be.ems/src/framework/constants/result"
)
// CodeMsg 响应结果
@@ -17,8 +17,8 @@ func CodeMsg(code int, msg string) map[string]any {
// 响应成功结果 map[string]any{}
func Ok(v map[string]any) map[string]any {
args := make(map[string]any)
args["code"] = result.CODE_SUCCESS
args["msg"] = result.MSG_SUCCESS
args["code"] = constResult.CODE_SUCCESS
args["msg"] = constResult.MSG_SUCCESS
// v合并到args
for key, value := range v {
args[key] = value
@@ -29,7 +29,7 @@ func Ok(v map[string]any) map[string]any {
// 响应成功结果信息
func OkMsg(msg string) map[string]any {
args := make(map[string]any)
args["code"] = result.CODE_SUCCESS
args["code"] = constResult.CODE_SUCCESS
args["msg"] = msg
return args
}
@@ -37,8 +37,8 @@ func OkMsg(msg string) map[string]any {
// 响应成功结果数据
func OkData(data any) map[string]any {
args := make(map[string]any)
args["code"] = result.CODE_SUCCESS
args["msg"] = result.MSG_SUCCESS
args["code"] = constResult.CODE_SUCCESS
args["msg"] = constResult.MSG_SUCCESS
args["data"] = data
return args
}
@@ -46,8 +46,8 @@ func OkData(data any) map[string]any {
// 响应失败结果 map[string]any{}
func Err(v map[string]any) map[string]any {
args := make(map[string]any)
args["code"] = result.CODE_ERROR
args["msg"] = result.MSG_ERROR
args["code"] = constResult.CODE_ERROR
args["msg"] = constResult.MSG_ERROR
// v合并到args
for key, value := range v {
args[key] = value
@@ -58,7 +58,7 @@ func Err(v map[string]any) map[string]any {
// 响应失败结果信息
func ErrMsg(msg string, fmt ...any) map[string]any {
args := make(map[string]any)
args["code"] = result.CODE_ERROR
args["code"] = constResult.CODE_ERROR
args["msg"] = msg
return args
}
@@ -66,7 +66,7 @@ func ErrMsg(msg string, fmt ...any) map[string]any {
// 响应失败结果信息
func ErrMsgFmt(msg string, args ...any) map[string]any {
argv := make(map[string]any)
argv["code"] = result.CODE_ERROR
argv["code"] = constResult.CODE_ERROR
argv["msg"] = fmt.Sprintf(msg, args...)
return argv
}
@@ -74,8 +74,8 @@ func ErrMsgFmt(msg string, args ...any) map[string]any {
// 响应失败结果数据
func ErrData(data any) map[string]any {
args := make(map[string]any)
args["code"] = result.CODE_ERROR
args["msg"] = result.MSG_ERROR
args["code"] = constResult.CODE_ERROR
args["msg"] = constResult.MSG_ERROR
args["data"] = data
return args
}