Kaynağa Gözat

admin项目调整错误输出

wangxingcheng 3 yıl önce
ebeveyn
işleme
be5c93b964

+ 5 - 4
opms_admin/app/handler/auth.go

@@ -2,18 +2,19 @@ package handler
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/admin/user_def"
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/service"
 	"dashoo.cn/opms_libary/gtoken"
 	"dashoo.cn/opms_libary/micro_srv"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/encoding/gjson"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
 	"github.com/gogf/gf/util/gconv"
 
+	"dashoo.cn/micro/app/service"
+
 	"dashoo.cn/common_definition/auth"
 )
 
@@ -42,7 +43,7 @@ func (h *AuthHandler) Login(ctx context.Context, req *user_def.LoginReq, rsp *co
 		return gerror.New("系统异常,请重新尝试")
 	}
 	userInfo, err := userService.Login(req.UserName, req.Password)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	loginLogService, _ := service.NewLoginLogService(ctx)
 	loginLogService.Invoke(ctx, req.UserName, rsp.Msg)
 	if err != nil {
@@ -65,7 +66,7 @@ func (h *AuthHandler) LogOut(ctx context.Context, req interface{}, rsp *comm_def
 		return NoParamsErr
 	}
 	tokenResp := gtoken.GFToken.RemoveToken(token)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}

+ 11 - 10
opms_admin/app/handler/dept.go

@@ -2,14 +2,15 @@ package handler
 
 import (
 	"context"
-	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
-	"dashoo.cn/opms_libary/myerrors"
 	"errors"
+
+	"dashoo.cn/common_definition/comm_def"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
 )
 
 type DeptHandler struct{}
@@ -22,7 +23,7 @@ func (h *DeptHandler) GetList(ctx context.Context, req *model.SysDeptSearchParam
 		return errors.New("系统异常,请重新尝试")
 	}
 	list, err := deptService.GetList(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = list
 	return nil
 }
@@ -43,7 +44,7 @@ func (h *DeptHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rs
 		g.Log().Error(err)
 		return err
 	}
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = entity
 	return nil
 }
@@ -61,7 +62,7 @@ func (h *DeptHandler) Create(ctx context.Context, req *model.SysDeptReq, rsp *co
 		return gerror.New("系统异常,请重新尝试")
 	}
 	err = deptService.Create(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -84,7 +85,7 @@ func (h *DeptHandler) UpdateById(ctx context.Context, req *model.UpdateSysDeptRe
 	}
 
 	err = deptService.UpdateById(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -97,7 +98,7 @@ func (h *DeptHandler) DeleteById(ctx context.Context, req *comm_def.IdReq, rsp *
 	}
 
 	err = deptService.DeleteById(int(req.Id))
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -110,7 +111,7 @@ func (h *DeptHandler) GetDeptTree(ctx context.Context, nullParams interface{}, r
 	}
 	//获取正常状态部门数据
 	list, err := deptService.GetList(&model.SysDeptSearchParams{Status: "10"})
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	treeList := deptService.GetDeptListTree(0, list)
 	rsp.Data = treeList
 	return nil

+ 27 - 26
opms_admin/app/handler/dict.go

@@ -2,12 +2,13 @@ package handler
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
 )
 
 type DictHandler struct{}
@@ -16,12 +17,12 @@ type DictHandler struct{}
 func (h *DictHandler) GetDictTypeList(ctx context.Context, req *model.ListSysDictTypeReq, rsp *comm_def.CommonMsg) error {
 	// 参数校验
 	dictService, err := service.NewDictTypeService(ctx)
-	if flag, err, _, _ := myerrors.CheckError(err); flag {
-		return err
-	}
+	//if flag, err, _, _ := myerrors.CheckError(err); flag {
+	//	return err
+	//}
 
 	total, list, err := dictService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -36,12 +37,12 @@ func (h *DictHandler) GetDictTypeEntity(ctx context.Context, req *comm_def.IdReq
 		return NoParamsErr
 	}
 	dictService, err := service.NewDictTypeService(ctx)
-	if flag, err, _, _ := myerrors.CheckError(err); flag {
-		return err
-	}
+	//if flag, err, _, _ := myerrors.CheckError(err); flag {
+	//	return err
+	//}
 
 	data, err := dictService.GetDictById(req.Id)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+//	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -56,12 +57,12 @@ func (h *DictHandler) CreateDictType(ctx context.Context, req *model.SysDictType
 		return err
 	}
 	dictService, err := service.NewDictTypeService(ctx)
-	if flag, err, _, _ := myerrors.CheckError(err); flag {
-		return err
-	}
+	//if flag, err, _, _ := myerrors.CheckError(err); flag {
+	//	return err
+	//}
 
 	err = dictService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return err
 }
 
@@ -72,12 +73,12 @@ func (h *DictHandler) UpdateDictType(ctx context.Context, req *model.SysDictType
 		return err
 	}
 	dictService, err := service.NewDictTypeService(ctx)
-	if flag, err, _, _ := myerrors.CheckError(err); flag {
-		return err
-	}
+	//if flag, err, _, _ := myerrors.CheckError(err); flag {
+	//	return err
+	//}
 
 	err = dictService.UpdateById(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return err
 }
 
@@ -93,7 +94,7 @@ func (h *DictHandler) DeleteDictTypeByIds(ctx context.Context, req *comm_def.Ids
 	}
 
 	err = dictService.Delete(req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return err
 }
 
@@ -106,7 +107,7 @@ func (h *DictHandler) GetDictDataList(ctx context.Context, req *model.SelectDict
 		return err
 	}
 	total, list, err := dictService.GetDictDataList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -126,7 +127,7 @@ func (h *DictHandler) GetDictDataEntity(ctx context.Context, req *comm_def.IdReq
 	}
 
 	data, err := dictService.GetDictDataById(req.Id)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -142,7 +143,7 @@ func (h *DictHandler) GetDictDataByType(ctx context.Context, req *model.GetDictR
 	}
 
 	list, err := dictService.GetDictWithDataByType(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -163,7 +164,7 @@ func (h *DictHandler) CreateDictData(ctx context.Context, req *model.DictDataAdd
 	}
 
 	_, err = dictService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+//	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 
@@ -184,7 +185,7 @@ func (h *DictHandler) UpdateDictData(ctx context.Context, req *model.EditDictDat
 	}
 
 	err = dictService.UpdateByDict(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -203,7 +204,7 @@ func (h *DictHandler) DeleteDictDataByIds(ctx context.Context, req *comm_def.Ids
 	}
 
 	err = dictService.DeleteDictDataByIds(req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}

+ 8 - 7
opms_admin/app/handler/group.go

@@ -2,13 +2,14 @@ package handler
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
 )
 
 type GroupHandler struct{}
@@ -21,7 +22,7 @@ func (h *GroupHandler) GetList(ctx context.Context, req *model.SysGroupSearchPar
 		return gerror.New("系统异常,请重新尝试")
 	}
 	total, list, err := groupService.GetList(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = g.Map{"list": list, "total": total}
 	return nil
 }
@@ -56,7 +57,7 @@ func (h *GroupHandler) Create(ctx context.Context, req *model.SysGroupReq, rsp *
 		return gerror.New("系统异常,请重新尝试")
 	}
 	err = groupService.Create(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -75,7 +76,7 @@ func (h *GroupHandler) UpdateById(ctx context.Context, req *model.UpdateSysGroup
 	}
 
 	err = groupService.UpdateById(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -88,6 +89,6 @@ func (h *GroupHandler) DeleteByIds(ctx context.Context, req *comm_def.IdsReq, rs
 	}
 
 	err = groupService.DeleteByIds(req.Ids)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }

+ 6 - 5
opms_admin/app/handler/loginLog.go

@@ -2,12 +2,13 @@ package handler
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
+
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
 )
 
 type LoginLogHandler struct{}
@@ -20,7 +21,7 @@ func (h *LoginLogHandler) GetList(ctx context.Context, req *model.SysLoginLogSea
 		return gerror.New("系统异常,请重新尝试")
 	}
 	total, list, err := postService.GetList(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+//	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = g.Map{"list": list, "total": total}
 	return nil
 }
@@ -34,6 +35,6 @@ func (h *LoginLogHandler) DeleteByIds(ctx context.Context, req *comm_def.IdsReq,
 	}
 
 	err = postService.DeleteByIds(req.Ids)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }

+ 11 - 10
opms_admin/app/handler/menu.go

@@ -2,16 +2,17 @@ package handler
 
 import (
 	"context"
+	"errors"
+
 	"dashoo.cn/common_definition/admin/menu_def"
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
-	"dashoo.cn/opms_libary/myerrors"
-	"errors"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gconv"
 	"github.com/gogf/gf/util/gvalid"
+
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
 )
 
 type MenuHandler struct{}
@@ -24,7 +25,7 @@ func (h *MenuHandler) GetList(ctx context.Context, req *menu_def.SelectReq, rsp
 		return errors.New("系统异常,请重新尝试")
 	}
 	list, err := menuService.GetList(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = list
 	return nil
 }
@@ -45,7 +46,7 @@ func (h *MenuHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rs
 		g.Log().Error(err)
 		return err
 	}
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = entity
 	return nil
 }
@@ -63,7 +64,7 @@ func (h *MenuHandler) Create(ctx context.Context, req *model.SysMenuReq, rsp *co
 		return gerror.New("系统异常,请重新尝试")
 	}
 	id, err := menuService.Create(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = gconv.String(id)
 	return nil
 }
@@ -87,7 +88,7 @@ func (h *MenuHandler) UpdateById(ctx context.Context, req *model.SysMenuReq, rsp
 	}
 
 	err = menuService.UpdateById(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -100,7 +101,7 @@ func (h *MenuHandler) DeleteById(ctx context.Context, req *comm_def.IdReq, rsp *
 	}
 
 	err = menuService.Delete(req.Id)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -138,7 +139,7 @@ func (h *MenuHandler) GetMenuTree(ctx context.Context, req map[string]interface{
 		userRoles, _ := userService.GetUserRoleIds(userService.GetCxtUserId())
 		list, err = menuService.GetUserRoleMenuTree(userRoles)
 	}
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = list
 	return nil
 }

+ 8 - 7
opms_admin/app/handler/post.go

@@ -2,13 +2,14 @@ package handler
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
 )
 
 type PostHandler struct{}
@@ -21,7 +22,7 @@ func (h *PostHandler) GetList(ctx context.Context, req *model.SysPostSearchParam
 		return gerror.New("系统异常,请重新尝试")
 	}
 	total, list, err := postService.GetList(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = g.Map{"list": list, "total": total}
 	return nil
 }
@@ -60,7 +61,7 @@ func (h *PostHandler) Create(ctx context.Context, req *model.SysPostReq, rsp *co
 		return gerror.New("系统异常,请重新尝试")
 	}
 	err = postService.Create(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -79,7 +80,7 @@ func (h *PostHandler) UpdateById(ctx context.Context, req *model.UpdateSysPostRe
 	}
 
 	err = postService.UpdateById(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -92,6 +93,6 @@ func (h *PostHandler) DeleteByIds(ctx context.Context, req *comm_def.IdsReq, rsp
 	}
 
 	err = postService.DeleteByIds(req.Ids)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }

+ 13 - 12
opms_admin/app/handler/role.go

@@ -2,13 +2,14 @@ package handler
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
 )
 
 type RoleHandler struct{}
@@ -21,7 +22,7 @@ func (h *RoleHandler) GetList(ctx context.Context, req *model.SelectPageReq, rsp
 		return gerror.New("系统异常,请重新尝试")
 	}
 	total, list, err := roleService.GetRoleListSearch(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = g.Map{"list": list, "total": total}
 	return nil
 }
@@ -38,7 +39,7 @@ func (o *RoleHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rs
 		return gerror.New("系统异常,请重新尝试")
 	}
 	entity, err := roleService.GetRoleById(req.Id)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = entity
 	return nil
 }
@@ -56,7 +57,7 @@ func (h *RoleHandler) Create(ctx context.Context, req *model.SysRoleReq, rsp *co
 		return gerror.New("系统异常,请重新尝试")
 	}
 	err = roleService.CreateRole(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -75,7 +76,7 @@ func (h *RoleHandler) UpdateById(ctx context.Context, req *model.UpdateSysRoleRe
 	}
 
 	err = roleService.UpdateRole(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -88,7 +89,7 @@ func (h *RoleHandler) DeleteByIds(ctx context.Context, req *comm_def.IdsReq, rsp
 	}
 
 	err = roleService.DeleteByIds(req.Ids)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -101,7 +102,7 @@ func (h *RoleHandler) GetRoleDeptTreeselect(ctx context.Context, req *comm_def.I
 	}
 
 	deptIds, err := roleService.GetRoleDeptTreeselect(req.Id)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	rsp.Data = deptIds
 	return nil
 }
@@ -115,7 +116,7 @@ func (h *RoleHandler) UpdateRoleStatus(ctx context.Context, req *model.StatusSet
 	}
 
 	err = roleService.UpdateRoleStatus(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -128,7 +129,7 @@ func (h *RoleHandler) UpdateRoleDataScope(ctx context.Context, req *model.DataSc
 	}
 
 	err = roleService.UpdateRoleDataScope(req)
-	_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, _, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return nil
 }
 
@@ -139,7 +140,7 @@ func (o *RoleHandler) GetDataScope(ctx context.Context, nullParams interface{},
 		return gerror.New("系统异常,请重新尝试")
 	}
 	ids, err := roleService.GetDataScope(roleService.GetCxtUserId())
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}

+ 17 - 16
opms_admin/app/handler/user.go

@@ -2,14 +2,15 @@ package handler
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/admin/user_def"
-	"dashoo.cn/micro/app/model"
-	"dashoo.cn/micro/app/service"
 	"dashoo.cn/opms_libary/micro_srv"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/util/gvalid"
 
+	"dashoo.cn/micro/app/model"
+	"dashoo.cn/micro/app/service"
+
 	"dashoo.cn/common_definition/comm_def"
 
 	"github.com/gogf/gf/frame/g"
@@ -26,7 +27,7 @@ func (h *UserHandler) GetList(ctx context.Context, req *model.SysUserSearchReq,
 	}
 
 	total, list, err := userService.GetUserList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -52,7 +53,7 @@ func (h *UserHandler) Create(ctx context.Context, req *model.AddUserReq, rsp *co
 	//	return err
 	//}
 	err = userService.CreateUser(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -81,7 +82,7 @@ func (h *UserHandler) UpdateById(ctx context.Context, req *model.EditUserReq, rs
 	//	return err
 	//}
 	err = userService.UpdateUser(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -106,24 +107,24 @@ func (e *UserHandler) GetUserInfo(ctx context.Context, req *comm_def.IdReq, rsp
 	}
 	// 获取用户权限 角色
 	userRoles, err := userService.GetUserRoleIds(userId)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 	roleService, _ := service.NewRoleService(ctx)
 	permissions, err := roleService.GetRolesMenuPermissions(userRoles)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+//	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 
 	userPosts, err := userService.GetUserPostIds(userId)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 	userGroups, err := userService.GetUserGroupIds(userId)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -170,7 +171,7 @@ func (h *UserHandler) DeleteByIds(ctx context.Context, req *comm_def.IdsReq, rsp
 	}
 
 	err = userService.DeleteUserByIds(ctx, req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -188,7 +189,7 @@ func (e *UserHandler) ResetPassword(ctx context.Context, req *model.SysUserReset
 		return gerror.New("系统异常,请重新尝试")
 	}
 	err = userService.ResetUserPwd(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -205,7 +206,7 @@ func (e *UserHandler) SetStatus(ctx context.Context, req *model.SysUserStatusReq
 		return gerror.New("系统异常,请重新尝试")
 	}
 	err = userService.ChangeUserStatus(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -224,7 +225,7 @@ func (e *UserHandler) GetUserByDept(ctx context.Context, req *user_def.DeptIdReq
 	}
 
 	list, err := userService.GetUserByDept(req.DeptId)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -244,7 +245,7 @@ func (e *UserHandler) GetUserByRole(ctx context.Context, req *model.SysUserRoleR
 	}
 
 	list, err := userService.GetUserByRole(req.RoleId)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -441,7 +442,7 @@ func (e *UserHandler) ChangePassword(ctx context.Context, req *user_def.PWDReq,
 		OldPassword: req.OldPassword,
 		NewPassword: req.NewPassword,
 	})
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	return err
 }
 

+ 1 - 1
opms_admin/app/service/sys_dict_type.go

@@ -115,7 +115,7 @@ func (s *dictTypeService) UpdateById(req *model.SysDictTypeEditReq) error {
 			return err
 		}
 		if dt == nil {
-			return myerrors.NewMsgError(nil, "字典不存在")
+			return myerrors.TipsError( "字典不存在")
 		}
 		//修改字典类型
 		data := new(model.SysDictType)