diff --git a/dsBaseRpc/Shell/start.sh b/dsBaseRpc/Shell/start.sh index c1be0c2f..ec1122ec 100644 --- a/dsBaseRpc/Shell/start.sh +++ b/dsBaseRpc/Shell/start.sh @@ -10,5 +10,5 @@ sleep 3 cd /usr/local/dsMin/dsBaseRpc chmod +x dsBaseRpc # 运行为后台进程 -nohup /usr/local/dsMin/dsBaseRpc/dsBaseRpc >> /usr/local/dsMin/dsBaseRpc/dsBaseRpc.log 2>&1 & +nohup /usr/local/dsMin/dsBaseRpc/dsBaseRpc >> /usr/local/dsMin/dsBaseRpc/Logs/dsBaseRpc.log 2>&1 & diff --git a/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go b/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go index 37e94fe0..e100b3e0 100644 --- a/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go +++ b/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go @@ -48,16 +48,12 @@ var ( ) func init() { - //判断是不是单元测试,如果是的话,那么配置文件的路径需要加上一个. var configIniFile = "./Config/Config.ini" //判断文件不是存在 if !CommonUtil.Exists(configIniFile) { configIniFile = "." + configIniFile } - if !CommonUtil.Exists(configIniFile) { - configIniFile = "/usr/local/dsMin/dsBaseRpc/Config/Config.ini" - } iniParser := IniParser{} if err := iniParser.Load(configIniFile); err != nil { fmt.Printf("try load config file[%s] error[%s]\n", configIniFile, err.Error()) @@ -99,7 +95,6 @@ func init() { ProjectName = iniParser.GetString("project", "project_name") //kafka地址 KafkaAddress = iniParser.GetString("kafka", "KafkaAddress") - //数据汇集中心地址 DataExchangeHost = iniParser.GetString("dataExchange", "host") DataExchangeUrl = DataExchangeHost + iniParser.GetString("dataExchange", "exchangeUrl") diff --git a/dsBaseRpc/Utils/DbUtil/DbUtil.go b/dsBaseRpc/Utils/DbUtil/DbUtil.go index a8d1c749..e1fb6baa 100644 --- a/dsBaseRpc/Utils/DbUtil/DbUtil.go +++ b/dsBaseRpc/Utils/DbUtil/DbUtil.go @@ -58,7 +58,7 @@ func init() { Engine.SetTableMapper(core.SnakeMapper{}) //显示+记录SQL日志 - f, _ := os.Create("./Logs/sql.log") + f, _ := os.Create(ConfigUtil.DistributeRemotePath+"sql.log") Engine.SetLogger(log.NewSimpleLogger(f)) Engine.ShowSQL(true) // 则会在控制台打印出生成的SQL语句 diff --git a/dsBaseRpc/Utils/LogUtil/LogUtil.go b/dsBaseRpc/Utils/LogUtil/LogUtil.go index b4d87d2f..c23e7a3a 100644 --- a/dsBaseRpc/Utils/LogUtil/LogUtil.go +++ b/dsBaseRpc/Utils/LogUtil/LogUtil.go @@ -2,6 +2,7 @@ package LogUtil import ( "dsBaseRpc/Utils/CommonUtil" + "dsBaseRpc/Utils/ConfigUtil" "fmt" "log" "os" @@ -14,13 +15,13 @@ import ( */ func Error(code string, msg string) { //判断是不是单元测试,如果是的话,那么配置文件的路径需要加上一个. - var logPath = "/usr/local/dsMin/dsBaseRpc/Logs" + var logPath = ConfigUtil.DistributeRemotePath+"Logs" if !CommonUtil.Exists(logPath) { //创建 os.MkdirAll(logPath, os.ModePerm) } //设置手工日志的办法 - logFile, err := os.OpenFile(logPath+"/dsBaseRpc.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) + logFile, err := os.OpenFile(logPath+"/dsBaseRpcManual.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) defer logFile.Close() if err != nil { fmt.Println("open file error !") diff --git a/dsBaseRpc/Utils/PinYinUtil/PinYinUtil.go b/dsBaseRpc/Utils/PinYinUtil/PinYinUtil.go index 7861e450..a056f6fc 100644 --- a/dsBaseRpc/Utils/PinYinUtil/PinYinUtil.go +++ b/dsBaseRpc/Utils/PinYinUtil/PinYinUtil.go @@ -13,9 +13,6 @@ func init(){ if !CommonUtil.Exists(configIniFile) { configIniFile = "." + configIniFile } - if !CommonUtil.Exists(configIniFile) { - configIniFile = "/usr/local/dsMin/dsBaseRpc/Config/pinyin.txt" - } pinyin.LoadingPYFileName(configIniFile) } diff --git a/dsBaseRpc/main.go b/dsBaseRpc/main.go index 1823e9c8..9be4a415 100644 --- a/dsBaseRpc/main.go +++ b/dsBaseRpc/main.go @@ -32,6 +32,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/reflection" "net" + "os" ) // 配置步骤: @@ -42,11 +43,13 @@ func main() { // 一、显示Logo configIniFile := "./Config/logo.txt" var logo = FileUtil.ReadFileContent(configIniFile) - if !CommonUtil.Exists(configIniFile) { - configIniFile = "/usr/local/dsMin/dsBaseWeb/Config/logo.txt" - } fmt.Print(logo) + //创建日志文件目录 + if !CommonUtil.Exists(ConfigUtil.DistributeRemotePath+"Logs"){ + os.MkdirAll(ConfigUtil.DistributeRemotePath+"Logs",os.ModePerm) + } + //添加定时清理垃圾的代码 c := cron.New(cron.WithSeconds()) c.AddFunc("0 0 1 * * *", func() {