From 3778ede97ab3ebae118fed098997f13f9046b02d Mon Sep 17 00:00:00 2001
From: puras <puras.he@gmail.com>
Date: Mon, 10 Jan 2022 22:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20ErrDef=20=E5=8F=98?=
 =?UTF-8?q?=E6=88=90=20ErrDef2=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ctrl/response.go     | 6 +++---
 response/response.go | 6 +++---
 util/biz.go          | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ctrl/response.go b/ctrl/response.go
index 69bb114..b069ede 100644
--- a/ctrl/response.go
+++ b/ctrl/response.go
@@ -2,7 +2,7 @@ package ctrl
 
 import (
 	"github.com/gin-gonic/gin"
-	errdef2 "github.com/puras/mog/errdef"
+	"github.com/puras/mog/errdef"
 	"github.com/puras/mog/response"
 	"github.com/sirupsen/logrus"
 )
@@ -15,11 +15,11 @@ import (
  */
 
 func RespError(c *gin.Context, err error) {
-	if e, ok := err.(errdef2.Error); ok {
+	if e, ok := err.(errdef.Error); ok {
 		logrus.Info("yes")
 		response.RespErr(c, e)
 	} else {
 		logrus.Info("no")
-		response.RespFail(c, errdef2.ServerException.Code, err.Error())
+		response.RespFail(c, errdef.ServerException.Code, err.Error())
 	}
 }
diff --git a/response/response.go b/response/response.go
index f3c39f2..37d2c6c 100644
--- a/response/response.go
+++ b/response/response.go
@@ -1,7 +1,7 @@
 package response
 
 import (
-	errdef2 "github.com/puras/mog/errdef"
+	"github.com/puras/mog/errdef"
 	"github.com/puras/mog/util"
 	"net/http"
 	"time"
@@ -49,12 +49,12 @@ func RespOk(c *gin.Context, data interface{}) {
 	c.JSON(http.StatusOK, resp)
 }
 
-func RespErrCode(c *gin.Context, err errdef2.ErrCode) {
+func RespErrCode(c *gin.Context, err errdef.ErrCode) {
 	resp := Response{RequestId: GetRequestId(c), Code: err.Code, Message: err.Message}
 	c.JSON(http.StatusBadRequest, resp)
 }
 
-func RespErr(c *gin.Context, err errdef2.Error) {
+func RespErr(c *gin.Context, err errdef.Error) {
 	resp := Response{RequestId: GetRequestId(c), Code: err.Code, Message: err.Message}
 	c.JSON(http.StatusBadRequest, resp)
 }
diff --git a/util/biz.go b/util/biz.go
index 06abfc0..d4d0d7f 100644
--- a/util/biz.go
+++ b/util/biz.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"github.com/puras/mog/constants"
 	"github.com/puras/mog/ctype"
-	errdef2 "github.com/puras/mog/errdef"
+	"github.com/puras/mog/errdef"
 	"strings"
 	"time"
 )
@@ -31,16 +31,16 @@ func GeneratePassword(password, salt string) string {
 func ParsePassword(password string) (string, error) {
 	passwdBytes, err := base64.StdEncoding.DecodeString(password)
 	if err != nil {
-		return "", errdef2.New(errdef2.INVALID_PARAM)
+		return "", errdef.New(errdef.INVALID_PARAM)
 	}
 	passwdStr := string(passwdBytes)
 	passwdInfos := strings.Split(passwdStr, fmt.Sprintf("%s%s", constants.PasswordPrefix, constants.PasswordSep))
 	if len(passwdInfos) != 2 {
-		return "", errdef2.New(errdef2.INVALID_PARAM)
+		return "", errdef.New(errdef.INVALID_PARAM)
 	}
 	passwdAndTimestamp := passwdInfos[1]
 	if strings.Index(passwdAndTimestamp, constants.PasswordSep) == -1 {
-		return "", errdef2.New(errdef2.INVALID_PARAM)
+		return "", errdef.New(errdef.INVALID_PARAM)
 	}
 	return passwdAndTimestamp[:strings.LastIndex(passwdAndTimestamp, constants.PasswordSep)], nil
 }