diff --git a/.gitignore b/.gitignore index 40a5587..276b370 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ version.lock *.ini conf/conf.ini /statik/ +.vscode/ diff --git a/models/init.go b/models/init.go index 447922a..8cfa788 100644 --- a/models/init.go +++ b/models/init.go @@ -35,7 +35,14 @@ func Init() { case "UNSET", "sqlite", "sqlite3": // 未指定数据库或者明确指定为 sqlite 时,使用 SQLite3 数据库 db, err = gorm.Open("sqlite3", util.RelativePath(conf.DatabaseConfig.DBFile)) - case "mysql", "postgres", "mssql": + case "postgres": + db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable", + conf.DatabaseConfig.Host, + conf.DatabaseConfig.User, + conf.DatabaseConfig.Password, + conf.DatabaseConfig.Name, + conf.DatabaseConfig.Port)) + case "mysql", "mssql": db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=%s&parseTime=True&loc=Local", conf.DatabaseConfig.User, conf.DatabaseConfig.Password, diff --git a/pkg/webdav/prop.go b/pkg/webdav/prop.go index 80464e3..7d0b5aa 100644 --- a/pkg/webdav/prop.go +++ b/pkg/webdav/prop.go @@ -188,7 +188,7 @@ func props(ctx context.Context, fs *filesystem.FileSystem, ls LockSystem, fi Fil } // Otherwise, it must either be a live property or we don't know it. if prop := liveProps[pn]; prop.findFn != nil && (prop.dir || !isDir) { - innerXML, err := prop.findFn(ctx, fs, ls, "", fi) + innerXML, err := prop.findFn(ctx, fs, ls, fi.GetName(), fi) if err != nil { return nil, err }