From 917d3ade8e6d0a4ace0a34806613ac26b52f6349 Mon Sep 17 00:00:00 2001
From: tangmingyou <234767776@qq.com>
Date: Fri, 17 Feb 2023 15:17:34 +0800
Subject: [PATCH] auth msg, dockerfile

---
 .gitignore                |  4 ++--
 Dockerfile                | 14 ++++++++++++++
 Makefile                  |  8 ++++----
 {cmd => data}/config.toml |  4 ++--
 internal/conf/conf.go     |  2 +-
 internal/game/hand.go     |  2 +-
 internal/service/auth.go  | 11 ++++++++---
 7 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 Dockerfile
 rename {cmd => data}/config.toml (86%)

diff --git a/.gitignore b/.gitignore
index ecfae6a..55965df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,5 @@ Thumbs.db
 /target
 /configs
 /dist
-/etc/texas-poker.db
-/cmd/avatar
\ No newline at end of file
+/data/texas-poker.db
+/data/avatar
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..832ca06
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM golang:1.19-alpine
+
+ENV GO111MODULE=on
+ENV GOPROXY=https://goproxy.cn
+
+RUN mkdir -p /var/texas/data/
+
+WORKDIR /var/texas
+
+COPY target/texas /var/texas/
+COPY target/config.toml /var/texas/data/
+COPY /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+CMD ["/var/texas/texas"]
diff --git a/Makefile b/Makefile
index c0381f0..a101402 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,16 @@ GOTEST=$(GOCMD) test
 
 all: build
 build:
-	rm -rf target/texas
-	mkdir target/
-	#cp etc/config.toml target/config.toml
+	rm -rf target/texas target/data/config.toml
+	mkdir -p target/data/
+	cp data/config.toml target/data/config.toml
 	$(GOBUILD) -o target/texas cmd/main.go
 
 clean:
 	rm -rf target/
 
 run:
-	nohup target/texas -conf=target/config.toml -region=sh -zone=sh001 -deploy.env=dev -weight=10 2>&1 > target/texas.log &
+	nohup target/texas -conf=target/data/config.toml -region=sh -zone=sh001 -deploy.env=dev -weight=10 2>&1 > target/data/texas.log &
 
 stop:
 	pkill -f target/texas
diff --git a/cmd/config.toml b/data/config.toml
similarity index 86%
rename from cmd/config.toml
rename to data/config.toml
index 9de84f0..0578ad2 100644
--- a/cmd/config.toml
+++ b/data/config.toml
@@ -19,9 +19,9 @@ captchaUrl = [
 ]
 
 [sqlite]
-dbPath = "etc/texas-poker.db"
+dbPath = "data/texas-poker.db"
 
 [game]
 # 新用户赠送筹码
 GiftChip = 10000
-AvatarPath = "cmd/avatar/"
+AvatarPath = "data/avatar/"
diff --git a/internal/conf/conf.go b/internal/conf/conf.go
index ee8bf71..cae732a 100644
--- a/internal/conf/conf.go
+++ b/internal/conf/conf.go
@@ -13,7 +13,7 @@ var (
 
 func init() {
 	// go run xx -conf=xx.toml
-	flag.StringVar(&confPath, "conf", "cmd/config.toml", "default config path.")
+	flag.StringVar(&confPath, "conf", "data/config.toml", "default config path.")
 	fmt.Printf("confPath: %v\n", confPath)
 
 	Conf = Default()
diff --git a/internal/game/hand.go b/internal/game/hand.go
index 02d8149..5b25a8c 100644
--- a/internal/game/hand.go
+++ b/internal/game/hand.go
@@ -67,7 +67,7 @@ func (ct CardType) NameZh() string {
 }
 
 var cardTypeNames = []string{"HighCard", "OnePair", "TwoPairs", "ThreeOfKind", "Straight", "Flush", "FullHouse", "FourOfKind", "StraightFlush", "RoyalFlush"}
-var cardTypeZhNames = []string{"高牌", "对子", "两对", "三条", "顺子", "同花", "葫芦", "四条", "同花顺", "皇家同花顺"}
+var cardTypeZhNames = []string{"散牌", "对子", "两对", "三条", "顺子", "同花", "葫芦", "四条", "同花顺", "皇家同花顺"}
 
 const (
 	HighCard      CardType = 1 << 13 << iota // 高牌
diff --git a/internal/service/auth.go b/internal/service/auth.go
index f780431..e5073f5 100644
--- a/internal/service/auth.go
+++ b/internal/service/auth.go
@@ -54,7 +54,8 @@ func Authorize(ctx *gin.Context) {
 		return
 	}
 	user := dao.UserDao.FindUserByName(username)
-	if user == nil {
+	unregister := user == nil
+	if unregister {
 		var err error = nil
 		// 注册
 		user, err = registerUser(username, password)
@@ -82,7 +83,11 @@ func Authorize(ctx *gin.Context) {
 		return
 	}
 
-	ctx.JSON(http.StatusOK, gin.H{"data": gin.H{
+	msg := "登录成功"
+	if unregister {
+		msg = "注册成功"
+	}
+	ctx.JSON(http.StatusOK, gin.H{"msg": msg, "data": gin.H{
 		"token": token,
 		"user": gin.H{
 			"id":       user.Id,
@@ -95,7 +100,7 @@ func Authorize(ctx *gin.Context) {
 // 注册用户到DB
 func registerUser(username string, password string) (*entity.User, error) {
 	// 生成头像
-	avatar := fmt.Sprintf("%d%d%s", time.Now().UnixMilli(), rand.Intn(99), ".jpg")
+	avatar := fmt.Sprintf("%d%d%s", time.Now().UnixMilli(), rand.Intn(90)+10, ".jpg")
 	err := govatar.GenerateFile(govatar.MALE, conf.Conf.Game.AvatarPath+avatar)
 	if err != nil {
 		return nil, err