Merge remote-tracking branch 'origin/master'

models/init.go

@@ -43,11 +43,20 @@ func Init() {
 				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",
+			var host string
+			if conf.DatabaseConfig.UnixSocket {
+				host = fmt.Sprintf("unix(%s)",
+					conf.DatabaseConfig.Host)
+			} else {
+				host = fmt.Sprintf("(%s:%d)",
+					conf.DatabaseConfig.Host,
+					conf.DatabaseConfig.Port)
+			}
+
+			db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("%s:%s@%s/%s?charset=%s&parseTime=True&loc=Local",
 				conf.DatabaseConfig.User,
 				conf.DatabaseConfig.Password,
-				conf.DatabaseConfig.Host,
+				host,
-				conf.DatabaseConfig.Port,
 				conf.DatabaseConfig.Name,
 				conf.DatabaseConfig.Charset))
 		default:

pkg/conf/conf.go

@@ -17,6 +17,7 @@ type database struct {
 	DBFile      string
 	Port        int
 	Charset     string
+	UnixSocket  bool
 }
 
 // system 系统通用配置

pkg/conf/defaults.go

@@ -10,10 +10,11 @@ var RedisConfig = &redis{
 
 // DatabaseConfig 数据库配置
 var DatabaseConfig = &database{
-	Type:    "UNSET",
+	Type:       "UNSET",
-	Charset: "utf8",
+	Charset:    "utf8",
-	DBFile:  "cloudreve.db",
+	DBFile:     "cloudreve.db",
-	Port:    3306,
+	Port:       3306,
+	UnixSocket: false,
 }
 
 // SystemConfig 系统公用配置