Refactored module structure for ease of testing backend colliders.

battle_srv/common/conf.go

@@ -1,16 +1,15 @@
 package common
 
 import (
+	. "dnmshared"
 	"encoding/json"
 	"fmt"
+	"go.uber.org/zap"
 	"os"
 	"path/filepath"
 	"strings"
-
-	"go.uber.org/zap"
 )
 
-// 隐式导入
 var Conf *config
 
 const (
@@ -72,11 +71,15 @@ func MustParseConfig() {
 		BotServer: new(botServerConf),
 	}
 	execPath, err := os.Executable()
-	ErrFatal(err)
+	if nil != err {
+		panic(err)
+	}
 
 	pwd, err := os.Getwd()
 	Logger.Debug("os.GetWd", zap.String("pwd", pwd))
-	ErrFatal(err)
+	if nil != err {
+		panic(err)
+	}
 
 	appRoot := pwd
 	confDir := filepath.Join(appRoot, "configs")
@@ -129,22 +132,21 @@ func loadJSON(fp string, v interface{}) {
 		fp = filepath.Join(Conf.General.ConfDir, fp)
 	}
 	_, err := os.Stat(fp)
-	ErrFatal(err)
+	if nil != err {
+		panic(err)
+	}
 
 	fd, err := os.Open(fp)
-	ErrFatal(err)
+	if nil != err {
+		panic(err)
+	}
 	defer fd.Close()
 	Logger.Info("Opened json file successfully.", zap.String("fp", fp))
 	err = json.NewDecoder(fd).Decode(v)
-	ErrFatal(err)
-	Logger.Info("Loaded json file successfully.", zap.String("fp", fp))
-}
-
-// Please only use this auxiliary function before server is fully started up, but not afterwards (启动过程可以使用，运行时不准使用).
-func ErrFatal(err error) {
-	if err != nil {
-		Logger.Fatal("ErrFatal", zap.NamedError("err", err))
+	if nil != err {
+		panic(err)
 	}
+	Logger.Info("Loaded json file successfully.", zap.String("fp", fp))
 }
 
 func isNotExist(p string) bool {

battle_srv/common/constants_loader.go

@@ -5,9 +5,10 @@ import (
 
 	"github.com/imdario/mergo"
 	"go.uber.org/zap"
+
+	. "dnmshared"
 )
 
-// 隐式导入
 var Constants *constants
 
 func MustParseConstants() {
@@ -24,13 +25,11 @@ func MustParseConstants() {
 		if !isNotExist(fp) {
 			testConstants := new(constants)
 			loadJSON(fp, testConstants)
-			//Logger.Debug(spew.Sdump(Constants))
-			//Logger.Debug(spew.Sdump(testConstants))
 			err := mergo.Merge(testConstants, Constants)
-			ErrFatal(err)
+			if nil != err {
+				panic(err)
+			}
 			Constants = testConstants
-			//Logger.Debug("mergo.Merge", zap.Error(err))
-			//Logger.Debug(spew.Sdump(testConstants))
 		}
 	}
 	constantsPost()

battle_srv/common/logger.go

@@ -1,23 +0,0 @@
-package common
-
-import (
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-)
-
-var Logger *zap.Logger
-var LoggerConfig zap.Config
-
-func init() {
-	LoggerConfig = zap.NewDevelopmentConfig()
-	LoggerConfig.Level.SetLevel(zap.InfoLevel)
-	LoggerConfig.Development = false
-	LoggerConfig.Sampling = &zap.SamplingConfig{
-		Initial:    100,
-		Thereafter: 100,
-	}
-	LoggerConfig.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	var err error
-	Logger, err = LoggerConfig.Build()
-	ErrFatal(err)
-}

battle_srv/common/utils/wechat.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"bytes"
 	"crypto/sha1"
+	. "dnmshared"
 	"encoding/json"
 	"fmt"
 	"go.uber.org/zap"

battle_srv/common/vals.go

@@ -11,7 +11,6 @@ var (
 	RE_CHINA_PHONE_NUM  = regexp.MustCompile(`^(13[0-9]|14[5|7]|15[0|1|2|3|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$`)
 )
 
-// 隐式导入
 var ConstVals = &struct {
 	Player struct {
 		CaptchaExpire time.Duration