evan/tank
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to abstract the core package.

Browse Source
This commit is contained in:
zicla
2019-04-27 23:25:46 +08:00
parent 2732b14eae
commit 02805363ac
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/config/config.go
View File

@ -1,7 +1,7 @@
package config
import (
"github.com/eyebluecn/tank/code/tool/inter"
"github.com/eyebluecn/tank/code/core"
"github.com/eyebluecn/tank/code/tool/util"
"github.com/json-iterator/go"
"io/ioutil"
@ -65,7 +65,7 @@ type ConfigItem struct {
func (this *ConfigItem) validate() bool {
if this.ServerPort == 0 {
inter.LOGGER.Error("ServerPort 未配置")
core.LOGGER.Error("ServerPort 未配置")
return false
} else {
//只要配置文件中有配置端口，就使用。
@ -73,27 +73,27 @@ func (this *ConfigItem) validate() bool {
}
if this.MysqlUsername == "" {
inter.LOGGER.Error("MysqlUsername 未配置")
core.LOGGER.Error("MysqlUsername 未配置")
return false
}
if this.MysqlPassword == "" {
inter.LOGGER.Error("MysqlPassword 未配置")
core.LOGGER.Error("MysqlPassword 未配置")
return false
}
if this.MysqlHost == "" {
inter.LOGGER.Error("MysqlHost 未配置")
core.LOGGER.Error("MysqlHost 未配置")
return false
}
if this.MysqlPort == 0 {
inter.LOGGER.Error("MysqlPort 未配置")
core.LOGGER.Error("MysqlPort 未配置")
return false
}
if this.MysqlSchema == "" {
inter.LOGGER.Error("MysqlSchema 未配置")
core.LOGGER.Error("MysqlSchema 未配置")
return false
}
@ -135,14 +135,14 @@ func (this *Config) ReadFromConfigFile() {
filePath := util.GetConfPath() + "/tank.json"
content, err := ioutil.ReadFile(filePath)
if err != nil {
inter.LOGGER.Warn("无法找到配置文件：%s 即将进入安装过程！", filePath)
core.LOGGER.Warn("无法找到配置文件：%s 即将进入安装过程！", filePath)
this.Installed = false
} else {
this.Item = &ConfigItem{}
inter.LOGGER.Warn("读取配置文件：%s", filePath)
core.LOGGER.Warn("读取配置文件：%s", filePath)
err := jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal(content, this.Item)
if err != nil {
inter.LOGGER.Error("配置文件格式错误！ 即将进入安装过程！")
core.LOGGER.Error("配置文件格式错误！ 即将进入安装过程！")
this.Installed = false
return
}
@ -150,7 +150,7 @@ func (this *Config) ReadFromConfigFile() {
//验证项是否齐全
itemValidate := this.Item.validate()
if !itemValidate {
inter.LOGGER.Error("配置文件信息不齐全！ 即将进入安装过程！")
core.LOGGER.Error("配置文件信息不齐全！ 即将进入安装过程！")
this.Installed = false
return
}
@ -171,8 +171,8 @@ func (this *Config) ReadFromConfigFile() {
this.MysqlUrl = util.GetMysqlUrl(this.Item.MysqlPort, this.Item.MysqlHost, this.Item.MysqlSchema, this.Item.MysqlUsername, this.Item.MysqlPassword)
this.Installed = true
inter.LOGGER.Info("使用配置文件：%s", filePath)
inter.LOGGER.Info("上传文件存放路径：%s", this.MatterPath)
core.LOGGER.Info("使用配置文件：%s", filePath)
core.LOGGER.Info("上传文件存放路径：%s", this.MatterPath)
}
}