wip: refactory log with zap

pkg/tool/must.go

@@ -5,7 +5,7 @@ import "github.com/loveuer/uzone/pkg/log"
 func Must(errs ...error) {
 	for _, err := range errs {
 		if err != nil {
-			log.Panic(err.Error())
+			log.Logger.Panic(err.Error())
 		}
 	}
 }

pkg/tool/password.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/loveuer/uzone/pkg/log"
 	"golang.org/x/crypto/pbkdf2"
 )
 
@@ -21,26 +20,29 @@ func NewPassword(password string) string {
 	return EncryptPassword(password, RandomString(8), int(RandomInt(50000)+100000))
 }
 
-func ComparePassword(in, db string) bool {
+// ComparePassword
+// if password in and db are same, return nil
+func ComparePassword(in, db string) error {
 	strs := strings.Split(db, "$")
 	if len(strs) != 3 {
-		log.Error("password in db invalid: %s", db)
-		return false
+		return fmt.Errorf("password in db invalid: %s", db)
 	}
 
 	encs := strings.Split(strs[0], ":")
 	if len(encs) != 3 {
-		log.Error("password in db invalid: %s", db)
-		return false
+		return fmt.Errorf("password in db invalid: %s", db)
 	}
 
 	encIteration, err := strconv.Atoi(encs[2])
 	if err != nil {
-		log.Error("password in db invalid: %s, convert iter err: %s", db, err)
-		return false
+		return fmt.Errorf("password in db invalid: %s, convert iter err: %s", db, err)
 	}
 
-	return EncryptPassword(in, strs[1], encIteration) == db
+	if EncryptPassword(in, strs[1], encIteration) != db {
+		return fmt.Errorf("password input and db not same")
+	}
+
+	return nil
 }
 
 func EncryptPassword(password, salt string, iter int) string {
@@ -66,7 +68,6 @@ func CheckPassword(password string) error {
 	for idx, pattern := range patternList {
 		match, err = regexp.MatchString(pattern, password)
 		if err != nil {
-			log.Warn("regex match string err, reg_str: %s, err: %v", pattern, err)
 			return errors.New("密码强度不够")
 		}
 

pkg/tool/table.go

@@ -8,8 +8,9 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/loveuer/uzone/pkg/log"
+
+	"github.com/jedib0t/go-pretty/v6/table"
 )
 
 func TablePrinter(data any, writers ...io.Writer) {
@@ -81,8 +82,6 @@ Start:
 			p := fmt.Sprintf("%s.%s", prefix, rv.Type().Field(i).Name)
 			field := rv.Field(i)
 
-			// log.Debug("TablePrinter: prefix: %s, field: %v", p, rv.Field(i))
-
 			if !field.CanInterface() {
 				return
 			}
@@ -95,7 +94,7 @@ Start:
 func TableMapPrinter(data []byte) {
 	m := make(map[string]any)
 	if err := json.Unmarshal(data, &m); err != nil {
-		log.Warn(err.Error())
+		log.Logger.Warn(err.Error())
 		return
 	}