diff --git a/global/data.go b/global/data.go index 6daaff8..dceccda 100644 --- a/global/data.go +++ b/global/data.go @@ -26,5 +26,5 @@ func InitDB() { if err != nil { panic(err) } - repo.UserRepo.GetUserInfo(DB) + repo.User.GetUserInfo(DB) } diff --git a/pkg/utils/uuid.go b/pkg/utils/uuid.go index 3dfb7fa..2126e53 100644 --- a/pkg/utils/uuid.go +++ b/pkg/utils/uuid.go @@ -9,14 +9,14 @@ import ( "time" ) -type UuidUtil struct { +type uuidUtil struct { lock sync.Mutex uuidint int } -var Uuid = &UuidUtil{} +var Uuid = &uuidUtil{} -func (u *UuidUtil) CreateUUID() string { +func (u *uuidUtil) CreateUUID() string { u.lock.Lock() defer u.lock.Unlock() // 生成基于字符串的 UUID @@ -26,13 +26,13 @@ func (u *UuidUtil) CreateUUID() string { return u1.String() } -type IpUtil struct { +type ipUtil struct { Ip string } -var IP = &IpUtil{} +var IP = &ipUtil{} -func (i *IpUtil) Get192Ip() string { +func (i *ipUtil) Get192Ip() string { if i.Ip == "" { i.Ip = Get192Ip() return i.Ip diff --git a/repo/erlangCard.go b/repo/erlangCard.go index a5770ce..41c24b5 100644 --- a/repo/erlangCard.go +++ b/repo/erlangCard.go @@ -5,16 +5,16 @@ import ( "work_cation/models" ) -type ErlangCard struct{} +type erlangCard struct{} -var ErlangCardRepo *ErlangCard +var ErlangCardRepo *erlangCard -func (*ErlangCard) FindAll(db *gorm.DB) []models.ErlangCards { +func (*erlangCard) FindAll(db *gorm.DB) []models.ErlangCards { var cards []models.ErlangCards db.Find(&cards) return cards } -func (*ErlangCard) Create(db *gorm.DB, erlangCard *models.ErlangCards) error { +func (*erlangCard) Create(db *gorm.DB, erlangCard *models.ErlangCards) error { return db.Create(erlangCard).Error } diff --git a/repo/user.go b/repo/user.go index 742c46a..68bce6d 100644 --- a/repo/user.go +++ b/repo/user.go @@ -7,11 +7,11 @@ import ( "work_cation/pkg/utils" ) -type User struct{} +type userRepo struct{} -var UserRepo *User +var User *userRepo -func (*User) GetUserInfo(db *gorm.DB) *models.Users { +func (*userRepo) GetUserInfo(db *gorm.DB) *models.Users { var users models.Users db.Find(&users) ip := utils.IP.Get192Ip() diff --git a/service/erlangCard.go b/service/erlangCard.go index 1ae9ddc..83cbc2f 100644 --- a/service/erlangCard.go +++ b/service/erlangCard.go @@ -10,11 +10,11 @@ import ( "work_cation/repo" ) -type ErlangCardService struct{} +type erlangCardService struct{} -var ErlangCard = &ErlangCardService{} +var ErlangCard = &erlangCardService{} -func (*ErlangCardService) Create(erlangCard *models.ErlangCards) error { +func (*erlangCardService) Create(erlangCard *models.ErlangCards) error { err := os.Mkdir(filepath.Join(cfg.T.CardDir, erlangCard.UUID), os.ModeDir) if err != nil { return err @@ -38,11 +38,11 @@ func (*ErlangCardService) Create(erlangCard *models.ErlangCards) error { return nil } -func (*ErlangCardService) GetInfoPath(erlangCard *models.ErlangCards) string { +func (*erlangCardService) GetInfoPath(erlangCard *models.ErlangCards) string { return filepath.Join(cfg.T.CardDir, erlangCard.UUID, cfg.T.CardInfo) } -func (*ErlangCardService) GetImageDir(erlangCard *models.ErlangCards) []string { +func (*erlangCardService) GetImageDir(erlangCard *models.ErlangCards) []string { var coverPaths []string for _, cover := range erlangCard.Covers { coverPaths = append(coverPaths, filepath.Join(cfg.T.CardDir, erlangCard.UUID, cover)) diff --git a/views/userView.go b/views/userView.go index d8d0d46..e81cc98 100644 --- a/views/userView.go +++ b/views/userView.go @@ -14,7 +14,7 @@ func UserViews(w fyne.Window) fyne.CanvasObject { image := canvas.NewImageFromResource(assets.LogoDataSR) image.FillMode = canvas.ImageFillContain - user := repo.UserRepo.GetUserInfo(global.DB) + user := repo.User.GetUserInfo(global.DB) userCard := widget.NewCard( user.Name,