update

common_error/error.go → exception/error.go

@@ -1,11 +1,10 @@
 // Copyright 2019 Axetroy. All rights reserved. MIT license.
-package common_error
+package exception
 
 var (
 	ErrUnknown       = NewError("未知错误")
 	ErrInvalidParams = NewError("参数不正确")
 	ErrNoData        = NewError("找不到数据")
-	ErrInvalidId     = NewError("ID不正确")
 	// auth
 	ErrUserNotLogin             = NewError("请先登陆")
 	ErrRequirePassword          = NewError("请输入密码")
@@ -19,7 +18,6 @@ var (
 	ErrPayPasswordSet           = NewError("交易密码已设置")
 	ErrPayPasswordNotSet        = NewError("请先设置交易密码")
 	// user
-	ErrUserExist    = NewError("用户已存在")
 	ErrUserNotExist = NewError("用户不存在")
 	// 没有权限
 	ErrNoPermission = NewError("没有权限")

middleware/middleware.trade_password.go

@@ -3,7 +3,7 @@ package middleware
 
 import (
 	"errors"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/module/user/user_model"
 	"github.com/axetroy/go-server/schema"
 	"github.com/axetroy/go-server/service/database"
@@ -31,7 +31,7 @@ func AuthPayPassword(ctx *gin.Context) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -53,34 +53,34 @@ func AuthPayPassword(ctx *gin.Context) {
 	payPassword := ctx.GetHeader(PayPasswordHeader)
 
 	if len(payPassword) == 0 {
-		err = common_error.ErrRequirePayPassword
+		err = exception.ErrRequirePayPassword
 		return
 	}
 
 	uid := ctx.GetString(ContextUidField)
 
 	if uid == "" {
-		err = common_error.ErrUserNotLogin
+		err = exception.ErrUserNotLogin
 		return
 	}
 
 	userInfo := user_model.User{Id: uid}
 
 	if err = database.Db.Where(&userInfo).Last(&userInfo).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {
-			err = common_error.ErrUserNotExist
+			err = exception.ErrUserNotExist
 		}
 		return
 	}
 
 	if userInfo.PayPassword == nil {
-		err = common_error.ErrPayPasswordNotSet
+		err = exception.ErrPayPasswordNotSet
 		return
 	}
 
 	// 校验密码是否正确
 	if *userInfo.PayPassword != util.GeneratePassword(payPassword) {
-		err = common_error.ErrInvalidPassword
+		err = exception.ErrInvalidPassword
 		return
 	}
 

module/address/area.go

@@ -3,7 +3,7 @@ package address
 
 import (
 	"errors"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/schema"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
@@ -31,7 +31,7 @@ func AreaList() (res schema.Response) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 

module/address/controller.create.go

@@ -4,10 +4,11 @@ package address
 import (
 	"errors"
 	"github.com/asaskevich/govalidator"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/address/address_model"
 	"github.com/axetroy/go-server/module/address/address_schema"
+	"github.com/axetroy/go-server/module/user/user_error"
 	"github.com/axetroy/go-server/module/user/user_model"
 	"github.com/axetroy/go-server/schema"
 	"github.com/axetroy/go-server/service/database"
@@ -45,7 +46,7 @@ func Create(context schema.Context, input CreateAddressParams) (res schema.Respo
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -70,7 +71,7 @@ func Create(context schema.Context, input CreateAddressParams) (res schema.Respo
 	if isValidInput, err = govalidator.ValidateStruct(input); err != nil {
 		return
 	} else if isValidInput == false {
-		err = common_error.ErrInvalidParams
+		err = exception.ErrInvalidParams
 		return
 	}
 
@@ -100,7 +101,7 @@ func Create(context schema.Context, input CreateAddressParams) (res schema.Respo
 
 	if err = tx.First(&userInfo).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {
-			err = common_error.ErrUserNotExist
+			err = user_error.ErrUserNotExist
 		}
 		return
 	}
@@ -183,7 +184,7 @@ func CreateRouter(ctx *gin.Context) {
 	}()
 
 	if err = ctx.ShouldBindJSON(&input); err != nil {
-		err = common_error.ErrInvalidParams
+		err = exception.ErrInvalidParams
 		return
 	}
 

module/address/controller.default.go

@@ -3,7 +3,7 @@ package address
 
 import (
 	"errors"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/address/address_model"
 	"github.com/axetroy/go-server/module/address/address_schema"
@@ -30,7 +30,7 @@ func GetDefault(context schema.Context) (res schema.Response) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 

module/address/controller.delete.go

@@ -3,10 +3,11 @@ package address
 
 import (
 	"errors"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/address/address_model"
 	"github.com/axetroy/go-server/module/address/address_schema"
+	"github.com/axetroy/go-server/module/user/user_error"
 	"github.com/axetroy/go-server/module/user/user_model"
 	"github.com/axetroy/go-server/schema"
 	"github.com/axetroy/go-server/service/database"
@@ -37,7 +38,7 @@ func Delete(context schema.Context, addressId string) (res schema.Response) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -64,7 +65,7 @@ func Delete(context schema.Context, addressId string) (res schema.Response) {
 
 	if err = tx.First(&userInfo).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {
-			err = common_error.ErrUserNotExist
+			err = user_error.ErrUserNotExist
 		}
 		return
 	}

module/address/controller.get.go

@@ -3,7 +3,7 @@ package address
 
 import (
 	"errors"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/address/address_model"
 	"github.com/axetroy/go-server/module/address/address_schema"
@@ -30,7 +30,7 @@ func GetDetail(context schema.Context, id string) (res schema.Response) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 

module/address/controller.list.go

@@ -3,7 +3,7 @@ package address
 
 import (
 	"errors"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/address/address_model"
 	"github.com/axetroy/go-server/module/address/address_schema"
@@ -38,7 +38,7 @@ func GetList(context schema.Context, input Query) (res schema.List) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -100,7 +100,7 @@ func GetListRouter(ctx *gin.Context) {
 	}()
 
 	if err = ctx.ShouldBindQuery(&input); err != nil {
-		err = common_error.ErrInvalidParams
+		err = exception.ErrInvalidParams
 		return
 	}
 

module/address/controller.update.go

@@ -4,10 +4,11 @@ package address
 import (
 	"errors"
 	"github.com/asaskevich/govalidator"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/address/address_model"
 	"github.com/axetroy/go-server/module/address/address_schema"
+	"github.com/axetroy/go-server/module/user/user_error"
 	"github.com/axetroy/go-server/module/user/user_model"
 	"github.com/axetroy/go-server/schema"
 	"github.com/axetroy/go-server/service/database"
@@ -46,7 +47,7 @@ func Update(context schema.Context, addressId string, input UpdateParams) (res s
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -71,7 +72,7 @@ func Update(context schema.Context, addressId string, input UpdateParams) (res s
 	if isValidInput, err = govalidator.ValidateStruct(input); err != nil {
 		return
 	} else if isValidInput == false {
-		err = common_error.ErrInvalidParams
+		err = exception.ErrInvalidParams
 		return
 	}
 
@@ -83,7 +84,7 @@ func Update(context schema.Context, addressId string, input UpdateParams) (res s
 
 	if err = tx.First(&userInfo).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {
-			err = common_error.ErrUserNotExist
+			err = user_error.ErrUserNotExist
 		}
 		return
 	}
@@ -190,7 +191,7 @@ func UpdateRouter(ctx *gin.Context) {
 	id := ctx.Param("address_id")
 
 	if err = ctx.ShouldBindJSON(&input); err != nil {
-		err = common_error.ErrInvalidParams
+		err = exception.ErrInvalidParams
 		return
 	}
 

module/address/error.go

@@ -2,13 +2,13 @@
 package address
 
 import (
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 )
 
 var (
-	ErrDefaultAddressNotExist     = common_error.NewError("默认地址不存在")
-	ErrAddressNotExist            = common_error.NewError("地址记录不存在")
-	ErrAddressInvalidProvinceCode = common_error.NewError("无效的省份代码")
-	ErrAddressInvalidCityCode     = common_error.NewError("无效的城市代码")
-	ErrAddressInvalidAreaCode     = common_error.NewError("无效的地区代码")
+	ErrDefaultAddressNotExist     = exception.NewError("默认地址不存在")
+	ErrAddressNotExist            = exception.NewError("地址记录不存在")
+	ErrAddressInvalidProvinceCode = exception.NewError("无效的省份代码")
+	ErrAddressInvalidCityCode     = exception.NewError("无效的城市代码")
+	ErrAddressInvalidAreaCode     = exception.NewError("无效的地区代码")
 )

module/admin/controller.create.go

@@ -4,7 +4,7 @@ package admin
 import (
 	"errors"
 	"github.com/asaskevich/govalidator"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/admin/admin_model"
 	"github.com/axetroy/go-server/module/admin/admin_schema"
@@ -41,7 +41,7 @@ func CreateAdmin(input CreateAdminParams, isSuper bool) (res schema.Response) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -66,7 +66,7 @@ func CreateAdmin(input CreateAdminParams, isSuper bool) (res schema.Response) {
 	if isValidInput, err = govalidator.ValidateStruct(input); err != nil {
 		return
 	} else if isValidInput == false {
-		err = common_error.ErrInvalidParams
+		err = exception.ErrInvalidParams
 		return
 	}
 
@@ -118,7 +118,7 @@ func CreateAdminRouter(ctx *gin.Context) {
 	}()
 
 	if err = ctx.ShouldBindJSON(&input); err != nil {
-		err = common_error.ErrInvalidParams
+		err = exception.ErrInvalidParams
 		return
 	}
 

module/admin/controller.get.go

@@ -3,7 +3,7 @@ package admin
 
 import (
 	"errors"
-	"github.com/axetroy/go-server/common_error"
+	"github.com/axetroy/go-server/exception"
 	"github.com/axetroy/go-server/middleware"
 	"github.com/axetroy/go-server/module/admin/admin_model"
 	"github.com/axetroy/go-server/module/admin/admin_schema"
@@ -32,7 +32,7 @@ func GetAdminInfo(context schema.Context) (res schema.Response) {
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -61,7 +61,7 @@ func GetAdminInfo(context schema.Context) (res schema.Response) {
 
 	if err = tx.First(&adminInfo).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {
-			err = common_error.ErrInvalidAccountOrPassword
+			err = exception.ErrInvalidAccountOrPassword
 		}
 		return
 	}
@@ -99,7 +99,7 @@ func GetAdminInfoById(context schema.Context, adminId string) (res schema.Respon
 			case error:
 				err = t
 			default:
-				err = common_error.ErrUnknown
+				err = exception.ErrUnknown
 			}
 		}
 
@@ -139,7 +139,7 @@ func GetAdminInfoById(context schema.Context, adminId string) (res schema.Respon
 
 	if err = tx.First(&adminInfo).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {
-			err = common_error.ErrInvalidAccountOrPassword
+			err = exception.ErrInvalidAccountOrPassword
 		}
 		return
 	}