From b61958f0e037ea8e8711fa215b7fffec804ee2ac Mon Sep 17 00:00:00 2001
From: liuxiaobo <1224730913@qq.com>
Date: Sat, 31 May 2025 13:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=AA=E4=B8=8B=E4=BD=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/chat/main.go                         |  1 +
 {test => server}/client/cmd/cmd.go          |  4 ++--
 {test => server}/client/config/config.go    |  0
 {test => server}/client/main.go             |  2 +-
 {test => server}/client/model/db.go         |  2 +-
 {test => server}/client/server/login.go     |  1 +
 {test => server}/client/server/processor.go |  0
 {test => server}/client/server/service.go   |  9 +++++++--
 server/login/model/userAccount.go           | 10 +++++-----
 9 files changed, 18 insertions(+), 11 deletions(-)
 rename {test => server}/client/cmd/cmd.go (90%)
 rename {test => server}/client/config/config.go (100%)
 rename {test => server}/client/main.go (94%)
 rename {test => server}/client/model/db.go (92%)
 rename {test => server}/client/server/login.go (93%)
 rename {test => server}/client/server/processor.go (100%)
 rename {test => server}/client/server/service.go (94%)

diff --git a/server/chat/main.go b/server/chat/main.go
index d75ac45..b9ba991 100644
--- a/server/chat/main.go
+++ b/server/chat/main.go
@@ -18,6 +18,7 @@ func main() {
 	if err == nil {
 		BuildDate = tm.Format("2006-01-02 15:04:05")
 	}
+	//BuildDate = "2025-05-31 09:56:06"
 	ksync.RunSafe(func() {
 		cmd.Run(GitBranch, GitCommit, BuildDate)
 	}, func() { log.ErrorF("reset run") })
diff --git a/test/client/cmd/cmd.go b/server/client/cmd/cmd.go
similarity index 90%
rename from test/client/cmd/cmd.go
rename to server/client/cmd/cmd.go
index c26573b..19cd674 100644
--- a/test/client/cmd/cmd.go
+++ b/server/client/cmd/cmd.go
@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"fmt"
-	"game/test/client/config"
-	"game/test/client/server"
+	"game/server/client/config"
+	"game/server/client/server"
 	"github.com/fox/fox/log"
 	"os"
 	"os/signal"
diff --git a/test/client/config/config.go b/server/client/config/config.go
similarity index 100%
rename from test/client/config/config.go
rename to server/client/config/config.go
diff --git a/test/client/main.go b/server/client/main.go
similarity index 94%
rename from test/client/main.go
rename to server/client/main.go
index 70facb4..fcde384 100644
--- a/test/client/main.go
+++ b/server/client/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"game/test/client/cmd"
+	"game/server/client/cmd"
 	"github.com/fox/fox/ksync"
 	"github.com/fox/fox/log"
 	"time"
diff --git a/test/client/model/db.go b/server/client/model/db.go
similarity index 92%
rename from test/client/model/db.go
rename to server/client/model/db.go
index 03f16ca..2992a1d 100644
--- a/test/client/model/db.go
+++ b/server/client/model/db.go
@@ -1,7 +1,7 @@
 package model
 
 import (
-	"game/test/client/config"
+	"game/server/client/config"
 	"github.com/fox/fox/db"
 	"github.com/fox/fox/log"
 	"github.com/go-redis/redis/v8"
diff --git a/test/client/server/login.go b/server/client/server/login.go
similarity index 93%
rename from test/client/server/login.go
rename to server/client/server/login.go
index de49667..0335482 100644
--- a/test/client/server/login.go
+++ b/server/client/server/login.go
@@ -6,6 +6,7 @@ import (
 )
 
 func (s *ClientService) login() {
+	log.DebugF("user:% ready login", s.username)
 	s.SendMsg(pb.ServiceTypeId_STI_Login, int32(pb.MsgId_C2SUserLoginId), &pb.C2SUserLogin{
 		Username: s.username,
 		Password: s.password,
diff --git a/test/client/server/processor.go b/server/client/server/processor.go
similarity index 100%
rename from test/client/server/processor.go
rename to server/client/server/processor.go
diff --git a/test/client/server/service.go b/server/client/server/service.go
similarity index 94%
rename from test/client/server/service.go
rename to server/client/server/service.go
index ff75008..a1ec7cd 100644
--- a/test/client/server/service.go
+++ b/server/client/server/service.go
@@ -3,7 +3,7 @@ package server
 import (
 	"fmt"
 	"game/common/proto/pb"
-	"game/test/client/config"
+	"game/server/client/config"
 	"github.com/fox/fox/log"
 	"github.com/fox/fox/processor"
 	"github.com/fox/fox/ws"
@@ -59,11 +59,16 @@ func newClientService(serviceId int) *ClientService {
 	return s
 }
 
+func (s *ClientService) loopLoginHour() {
+	s.login()
+	time.AfterFunc(time.Hour, s.loopLoginHour)
+}
+
 func (s *ClientService) OnInit() {
 	s.client.Start()
 	log.Debug("onInit")
 	time.Sleep(100 * time.Millisecond)
-	s.login()
+	s.loopLoginHour()
 }
 
 func (s *ClientService) CanStop() bool {
diff --git a/server/login/model/userAccount.go b/server/login/model/userAccount.go
index affa204..cc25888 100644
--- a/server/login/model/userAccount.go
+++ b/server/login/model/userAccount.go
@@ -9,9 +9,9 @@ import (
 )
 
 const (
-	AccountNormal = 0 // 正常
-	AccountFrozen = 1 // 冻结
-	AccountBanned = 2 // 封禁
+	AccountNormal = 1 // 正常
+	AccountFrozen = 2 // 冻结
+	AccountBanned = 3 // 封禁
 )
 
 // 玩家账户表
@@ -19,8 +19,8 @@ type UserAccount struct {
 	gorm.Model
 	Username      string    `gorm:"type:varchar(32);uniqueIndex;not null"` // 用户名
 	Password      string    `gorm:"type:varchar(255);not null"`            // 密码哈希
-	Email         string    `gorm:"type:varchar(100);uniqueIndex"`         // 邮箱(可选)
-	Phone         string    `gorm:"type:varchar(20);uniqueIndex"`          // 手机号(可选)
+	Email         string    `gorm:"type:varchar(100)"`                     // 邮箱(可选)
+	Phone         string    `gorm:"type:varchar(20)"`                      // 手机号(可选)
 	DeviceID      string    `gorm:"type:varchar(64);index"`                // 设备ID
 	LastLoginIP   string    `gorm:"type:varchar(45)"`                      // 最后登录IP(支持IPv6)
 	LastLoginTime time.Time // 最后登录时间