fix: 账号系统只有一个数据库。

zhangqijia
1 parent 4a502dd5
Showing 4 changed files with 55 additions and 14 deletions Show diff stats
cmd/gameserver/action/GmAction.go -> cmd/gameserver/gmaction/GmAction.go
cmd/httpserver/action/AccountAction.go
cmd/httpserver/main.go
common/db/mongoproxy/mongoplugin.go
 // GM系统API
-package action
+package gmaction
  
 import (
 	"pro2d/models"
@@ -19,12 +19,13 @@ type AccountAction struct {
 	HttpServer *service.AccountServer
 }
  
-/*Register 账号注册
-2 验证码转化为string错误
-3 验证码错误
-4 手机号已存在，不用重复注册
-5 uid get error
-6 mongo create error
+/*
+Register 账号注册
+ 2 验证码转化为string错误
+ 3 验证码错误
+ 4 手机号已存在，不用重复注册
+ 5 uid get error
+ 6 mongo create error
 */
 func (h *AccountAction) Register(c *gin.Context) (int, interface{}) {
 	var register pb.Register
@@ -64,9 +65,10 @@ func (h *AccountAction) Register(c *gin.Context) (int, interface{}) {
 	return 0, "success"
 }
  
-/*Login 登录
-2 账号不存在
-3 密码错误
+/*
+Login 登录
+ 2 账号不存在
+ 3 密码错误
 */
 func (h *AccountAction) Login(c *gin.Context) (int, interface{}) {
 	var login pb.Account
@@ -97,9 +99,10 @@ func (h *AccountAction) Login(c *gin.Context) (int, interface{}) {
 	return 0, rsp
 }
  
-/*Sms 发短信
-2 发送太频繁
-3 发送失败
+/*
+Sms 发短信
+ 2 发送太频繁
+ 3 发送失败
 */
 func (h *AccountAction) Sms(c *gin.Context) (int, interface{}) {
 	phone, ok := c.GetQuery("phone")
@@ -0,0 +1,34 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"pro2d/cmd/httpserver/action"
+	"pro2d/cmd/httpserver/service"
+	"pro2d/common"
+	"pro2d/common/logger"
+	"syscall"
+)
+
+func main() {
+	err := make(chan error)
+	stopChan := make(chan os.Signal)
+	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
+
+	common.GlobalSconf = common.GlobalConf.AccountConf
+
+	web := service.NewAccountServer("v1", fmt.Sprintf(":%d", common.GlobalSconf.Port))
+	web.BindHandler(&action.AccountAction{HttpServer: web})
+	go func() {
+		err <- web.Start()
+	}()
+
+	select {
+	case e := <-err:
+		logger.Error("http server error: %v", e)
+	case <-stopChan:
+		logger.Debug("http stop")
+		web.Stop()
+	}
+}
@@ -47,7 +47,11 @@ func ConnectMongo(conf *common.MongoConf, ID int64) error {
 		return err
 	}
  
-	mongoDatabase = mongoClient.Database(fmt.Sprintf("%s_%d", conf.DBName, ID))
+	if conf.DBName != "account" {
+		mongoDatabase = mongoClient.Database(fmt.Sprintf("%s_%d", conf.DBName, ID))
+	} else {
+		mongoDatabase = mongoClient.Database(conf.DBName)
+	}
 	return nil
 }