diff --git a/config/config.go b/config/config.go index afed44f..127c72e 100644 --- a/config/config.go +++ b/config/config.go @@ -1,9 +1,13 @@ package config -import "os" +import ( + "github.com/clod-moon/goconf" + "os" +) func main() { - +InitConfig() + } //本地工作目录 @@ -12,14 +16,19 @@ var LocalWorkSpaceDir string //本地ipfs网关 var GobalIpfsUrl ="localhost:5001" -//ipfs引导节点网关 +//ipfs引导节点默认网关,安装目录下 bin/fts.ini 可配 var ServerIpfsUrl = "10.240.10.238:5001" //var ServerIpfsUrl = "vpn.azut.cn:5001" +//var EtcdUrl="127.0.0.1:2379" func InitConfig(){ - //TODO 读取本地工作目录路径,默认工作空间 - //LocalWorkSpaceDir = "D:\\easycloud" + + conf := iniconf.InitConfig("../../bin/fts.ini") + + ServerIpfsUrl = conf.GetValue("url", "ServerIpfsUrl") + //log.Print(ServerIpfsUrl) + //log.Print(filepath.Abs("./")) LocalWorkSpaceDir=os.Getenv("USERPROFILE")+"\\easycloud" } \ No newline at end of file diff --git a/handle/handle.go b/handle/handle.go index 684b78d..140f43e 100644 --- a/handle/handle.go +++ b/handle/handle.go @@ -552,7 +552,7 @@ func myWalkfunc(path string, info os.FileInfo, err error) error { simpleFileInfo := new(simpleFileInfo) simpleFileInfo.Name=info.Name() simpleFileInfo.Extension=filepath.Ext(path) - simpleFileInfo.RelativePath=strings.Replace(path,gobalRelativePath,"",1) + simpleFileInfo.RelativePath=filepath.Dir(strings.Replace(path,gobalRelativePath,"",1)) simpleFileInfo.AbsolutePath=path gobalFolderFileMap[path]=simpleFileInfo return nil