From 8dce69081b2f7acd5fb50013d91e9fcf32194db3 Mon Sep 17 00:00:00 2001
From: zhouahaihai <zhhyf521@163.com>
Date: Wed, 2 Jan 2019 10:21:46 +0800
Subject: [PATCH] 配表由两个位置读取

---
 src/services/csvdatad.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/services/csvdatad.lua b/src/services/csvdatad.lua
index 203f13b..6ef8575 100644
--- a/src/services/csvdatad.lua
+++ b/src/services/csvdatad.lua
@@ -8,7 +8,7 @@ require "csvdata.init"
 require "skynet.manager"
 require "RedisKeys"
 
-local csvdb = {}
+-- local csvdb = {}
 
 local function formatFileName(filename)
 	filename = string.trim(filename)
@@ -33,14 +33,14 @@ local function travCsv(rootPath, pathes)
 				modified = travCsv(pathfile, pathes) or modified
 			else
 				local basename, loadname = formatFileName(pathfile)
-				if basename and tonum(pathes[loadname]) < attrs.modification then
-					modified = true
-					if basename == "init" then
+				if basename then
+					if tonum(pathes[loadname]) < attrs.modification then
+						modified = true
+						pathes[loadname] = attrs.modification
+					end
+					if basename == "init" or basename == "init_adv" then
 						require(loadname)
-					else
-						csvdb[basename .. "Csv"] = require(loadname)
 					end
-					pathes[loadname] = attrs.modification
 				end
 			end
 		end
--
libgit2 0.21.2