mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-20 09:44:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove unused code

Browse Source
This commit is contained in:
MaysWind
2021-04-04 17:16:13 +08:00
parent ead072ed31
commit f5b96a61d3
3 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/users.go
-1
View File
@@ -128,7 +128,6 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (interface{}, *errs
userNew := &models.User{ userNew := &models.User{
Uid: user.Uid, Uid: user.Uid,
Salt: user.Salt, Salt: user.Salt,
Rands: user.Rands,
} }
if userUpdateReq.Email != "" && userUpdateReq.Email != user.Email { if userUpdateReq.Email != "" && userUpdateReq.Email != user.Email {
pkg/models/user.go
-15
View File
@@ -6,16 +6,6 @@ import (
"github.com/mayswind/lab/pkg/utils" "github.com/mayswind/lab/pkg/utils"
) )
// UserType represents user type
type UserType byte
// User types
const (
USER_TYPE_NORMAL UserType = 0
USER_TYPE_ADMIN UserType = 63
USER_TYPE_SUPER_ADMIN UserType = 127
)
// WeekDay represents week day // WeekDay represents week day
type WeekDay byte type WeekDay byte
@@ -54,12 +44,9 @@ type User struct {
Nickname string `xorm:"VARCHAR(64) NOT NULL"` Nickname string `xorm:"VARCHAR(64) NOT NULL"`
Password string `xorm:"VARCHAR(64) NOT NULL"` Password string `xorm:"VARCHAR(64) NOT NULL"`
Salt string `xorm:"VARCHAR(10) NOT NULL"` Salt string `xorm:"VARCHAR(10) NOT NULL"`
Rands string `xorm:"VARCHAR(10) NOT NULL"`
Type UserType `xorm:"TINYINT NOT NULL"`
DefaultCurrency string `xorm:"VARCHAR(3) NOT NULL"` DefaultCurrency string `xorm:"VARCHAR(3) NOT NULL"`
FirstDayOfWeek WeekDay `xorm:"TINYINT NOT NULL"` FirstDayOfWeek WeekDay `xorm:"TINYINT NOT NULL"`
TransactionEditScope TransactionEditScope `xorm:"TINYINT NOT NULL"` TransactionEditScope TransactionEditScope `xorm:"TINYINT NOT NULL"`
IsAdmin bool `xorm:"NOT NULL"`
Deleted bool `xorm:"NOT NULL"` Deleted bool `xorm:"NOT NULL"`
EmailVerified bool `xorm:"NOT NULL"` EmailVerified bool `xorm:"NOT NULL"`
CreatedUnixTime int64 CreatedUnixTime int64
@@ -116,7 +103,6 @@ type UserProfileResponse struct {
Username string `json:"username"` Username string `json:"username"`
Email string `json:"email"` Email string `json:"email"`
Nickname string `json:"nickname"` Nickname string `json:"nickname"`
Type UserType `json:"type"`
DefaultCurrency string `json:"defaultCurrency"` DefaultCurrency string `json:"defaultCurrency"`
FirstDayOfWeek WeekDay `json:"firstDayOfWeek"` FirstDayOfWeek WeekDay `json:"firstDayOfWeek"`
TransactionEditScope TransactionEditScope `json:"transactionEditScope"` TransactionEditScope TransactionEditScope `json:"transactionEditScope"`
@@ -183,7 +169,6 @@ func (u *User) ToUserProfileResponse() *UserProfileResponse {
Username: u.Username, Username: u.Username,
Email: u.Email, Email: u.Email,
Nickname: u.Nickname, Nickname: u.Nickname,
Type: u.Type,
DefaultCurrency: u.DefaultCurrency, DefaultCurrency: u.DefaultCurrency,
FirstDayOfWeek: u.FirstDayOfWeek, FirstDayOfWeek: u.FirstDayOfWeek,
TransactionEditScope: u.TransactionEditScope, TransactionEditScope: u.TransactionEditScope,
pkg/services/users.go
-4
View File
@@ -134,10 +134,6 @@ func (s *UserService) CreateUser(user *models.User) error {
return err return err
} }
if user.Rands, err = utils.GetRandomString(10); err != nil {
return err
}
user.Uid = s.GenerateUuid(uuid.UUID_TYPE_USER) user.Uid = s.GenerateUuid(uuid.UUID_TYPE_USER)
user.Password = utils.EncodePassword(user.Password, user.Salt) user.Password = utils.EncodePassword(user.Password, user.Salt)