Merge branch 'pgsqlDevelop'

server/config.docker.yaml

@@ -43,7 +43,7 @@ system:
   env: 'public'  # Change to "develop" to skip authentication for development mode
   addr: 8888
   db-type: 'mysql'
-  oss-type: 'local'    # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  oss-type: 'local'    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
   use-multipoint: false
 
 # captcha configuration
@@ -94,7 +94,6 @@ qiniu:
   secret-key: ''
   use-cdn-domains: false
 
-
 # aliyun oss configuration
 aliyun-oss:
   endpoint: 'yourEndpoint'
@@ -112,11 +111,18 @@ tencent-cos:
   base-url: 'https://gin.vue.admin'
   path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server'
 
+# huawei obs configuration
+hua-wei-obs:
+  path: 'you-path'
+  bucket: 'you-bucket'
+  endpoint: 'you-endpoint'
+  access-key: 'you-access-key'
+  secret-key: 'you-secret-key'
+
 # excel configuration
 excel:
   dir: './resource/excel/'
 
-
 # timer task db clear table
 Timer:
   start: true

server/config.yaml

@@ -42,7 +42,7 @@ system:
   env: 'public'  # Change to "develop" to skip authentication for development mode
   addr: 8888
   db-type: 'mysql'
-  oss-type: 'local'    # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  oss-type: 'local'    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
   use-multipoint: false
   # IP限制次数 一个小时15000次
   iplimit-count: 15000
@@ -83,6 +83,26 @@ pgsql:
   log-mode: ""
   log-zap: false
 
+db-list: [
+  {
+    disabled: true, # 是否启用
+    type: "", # 数据库的类型,目前支持mysql、pgsql
+    alias-name: "", # 数据库的名称,注意: alias-name 需要在db-list中唯一
+    path: '',
+    port: '',
+    config: '',
+    db-name: '',
+    username: '',
+    password: '',
+    max-idle-conns: 10,
+    max-open-conns: 100,
+    log-mode: "",
+    log-zap: false,
+  }
+]
+
+
+
 # local configuration
 local:
   path: 'uploads/file'
@@ -115,7 +135,6 @@ qiniu:
   secret-key: ''
   use-cdn-domains: false
 
-
 # aliyun oss configuration
 aliyun-oss:
   endpoint: 'yourEndpoint'
@@ -134,11 +153,18 @@ tencent-cos:
   base-url: 'https://gin.vue.admin'
   path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server'
 
+# huawei obs configuration
+hua-wei-obs:
+  path: 'you-path'
+  bucket: 'you-bucket'
+  endpoint: 'you-endpoint'
+  access-key: 'you-access-key'
+  secret-key: 'you-secret-key'
+
 # excel configuration
 excel:
   dir: './resource/excel/'
 
-
 # timer task db clear table
 Timer:
   start: true

server/config/config.go

@@ -11,13 +11,16 @@ type Server struct {
 	// auto
 	AutoCode Autocode `mapstructure:"autoCode" json:"autoCode" yaml:"autoCode"`
 	// gorm
-	Mysql Mysql `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
-	Pgsql Pgsql `mapstructure:"pgsql" json:"pgsql" yaml:"pgsql"`
+	Mysql  Mysql `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
+	Pgsql  Pgsql `mapstructure:"pgsql" json:"pgsql" yaml:"pgsql"`
+	DBList []DB  `mapstructure:"db-list" json:"db-list" yaml:"db-list"`
 	// oss
 	Local      Local      `mapstructure:"local" json:"local" yaml:"local"`
 	Qiniu      Qiniu      `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
 	AliyunOSS  AliyunOSS  `mapstructure:"aliyun-oss" json:"aliyunOSS" yaml:"aliyun-oss"`
+	HuaWeiObs  HuaWeiObs  `mapstructure:"hua-wei-obs" json:"huaWeiObs" yaml:"hua-wei-obs"`
 	TencentCOS TencentCOS `mapstructure:"tencent-cos" json:"tencentCOS" yaml:"tencent-cos"`
-	Excel      Excel      `mapstructure:"excel" json:"excel" yaml:"excel"`
-	Timer      Timer      `mapstructure:"timer" json:"timer" yaml:"timer"`
+
+	Excel Excel `mapstructure:"excel" json:"excel" yaml:"excel"`
+	Timer Timer `mapstructure:"timer" json:"timer" yaml:"timer"`
 }

server/config/db_list.go

+package config
+
+type DB struct {
+	Disable      bool   `mapstructure:"disable" json:"disable" yaml:"disable"`
+	Type         string `mapstructure:"type" json:"type" yaml:"type"`
+	AliasName    string `mapstructure:"alias-name" json:"alias-name" yaml:"alias-name"`
+	Path         string `mapstructure:"path" json:"path" yaml:"path"`                             // 服务器地址:端口
+	Port         string `mapstructure:"port" json:"port" yaml:"port"`                             //:端口
+	Config       string `mapstructure:"config" json:"config" yaml:"config"`                       // 高级配置
+	Dbname       string `mapstructure:"db-name" json:"dbname" yaml:"db-name"`                     // 数据库名
+	Username     string `mapstructure:"username" json:"username" yaml:"username"`                 // 数据库用户名
+	Password     string `mapstructure:"password" json:"password" yaml:"password"`                 // 数据库密码
+	MaxIdleConns int    `mapstructure:"max-idle-conns" json:"maxIdleConns" yaml:"max-idle-conns"` // 空闲中的最大连接数
+	MaxOpenConns int    `mapstructure:"max-open-conns" json:"maxOpenConns" yaml:"max-open-conns"` // 打开到数据库的最大连接数
+	LogMode      string `mapstructure:"log-mode" json:"logMode" yaml:"log-mode"`                  // 是否开启Gorm全局日志
+	LogZap       bool   `mapstructure:"log-zap" json:"logZap" yaml:"log-zap"`
+}
+
+func (m *DB) Dsn() string {
+	return m.Username + ":" + m.Password + "@tcp(" + m.Path + ":" + m.Port + ")/" + m.Dbname + "?" + m.Config
+}

server/config/oss_aliyun.go

+package config
+
+type AliyunOSS struct {
+	Endpoint        string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
+	AccessKeyId     string `mapstructure:"access-key-id" json:"accessKeyId" yaml:"access-key-id"`
+	AccessKeySecret string `mapstructure:"access-key-secret" json:"accessKeySecret" yaml:"access-key-secret"`
+	BucketName      string `mapstructure:"bucket-name" json:"bucketName" yaml:"bucket-name"`
+	BucketUrl       string `mapstructure:"bucket-url" json:"bucketUrl" yaml:"bucket-url"`
+	BasePath        string `mapstructure:"base-path" json:"basePath" yaml:"base-path"`
+}

server/config/oss_huawei.go

+package config
+
+type HuaWeiObs struct {
+	Path      string `mapstructure:"path" json:"path" yaml:"path"`
+	Bucket    string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	Endpoint  string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
+	AccessKey string `mapstructure:"access-key" json:"accessKey" yaml:"access-key"`
+	SecretKey string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`
+}

server/config/oss_local.go

+package config
+
+type Local struct {
+	Path string `mapstructure:"path" json:"path" yaml:"path"` // 本地文件路径
+}

server/config/oss.go → server/config/oss_qiniu.go

 package config
 
-type Local struct {
-	Path string `mapstructure:"path" json:"path" yaml:"path"` // 本地文件路径
-}
-
 type Qiniu struct {
 	Zone          string `mapstructure:"zone" json:"zone" yaml:"zone"`                                // 存储区域
 	Bucket        string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`                          // 空间名称
@@ -13,21 +9,3 @@ type Qiniu struct {
 	SecretKey     string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`               // 秘钥SK
 	UseCdnDomains bool   `mapstructure:"use-cdn-domains" json:"useCdnDomains" yaml:"use-cdn-domains"` // 上传是否使用CDN上传加速
 }
-
-type AliyunOSS struct {
-	Endpoint        string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
-	AccessKeyId     string `mapstructure:"access-key-id" json:"accessKeyId" yaml:"access-key-id"`
-	AccessKeySecret string `mapstructure:"access-key-secret" json:"accessKeySecret" yaml:"access-key-secret"`
-	BucketName      string `mapstructure:"bucket-name" json:"bucketName" yaml:"bucket-name"`
-	BucketUrl       string `mapstructure:"bucket-url" json:"bucketUrl" yaml:"bucket-url"`
-	BasePath        string `mapstructure:"base-path" json:"basePath" yaml:"base-path"`
-}
-
-type TencentCOS struct {
-	Bucket     string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
-	Region     string `mapstructure:"region" json:"region" yaml:"region"`
-	SecretID   string `mapstructure:"secret-id" json:"secretID" yaml:"secret-id"`
-	SecretKey  string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`
-	BaseURL    string `mapstructure:"base-url" json:"baseURL" yaml:"base-url"`
-	PathPrefix string `mapstructure:"path-prefix" json:"pathPrefix" yaml:"path-prefix"`
-}

server/config/oss_tencent.go

+package config
+
+type TencentCOS struct {
+	Bucket     string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	Region     string `mapstructure:"region" json:"region" yaml:"region"`
+	SecretID   string `mapstructure:"secret-id" json:"secretID" yaml:"secret-id"`
+	SecretKey  string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`
+	BaseURL    string `mapstructure:"base-url" json:"baseURL" yaml:"base-url"`
+	PathPrefix string `mapstructure:"path-prefix" json:"pathPrefix" yaml:"path-prefix"`
+}

server/global/global.go

 package global
 
 import (
+	"sync"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/utils/timer"
 	"github.com/songzhibin97/gkit/cache/local_cache"
 
@@ -17,6 +19,7 @@ import (
 
 var (
 	GVA_DB     *gorm.DB
+	GVA_DBList map[string]*gorm.DB
 	GVA_REDIS  *redis.Client
 	GVA_CONFIG config.Server
 	GVA_VP     *viper.Viper
@@ -26,4 +29,23 @@ var (
 	GVA_Concurrency_Control             = &singleflight.Group{}
 
 	BlackCache local_cache.Cache
+	lock       sync.RWMutex
 )
+
+// GetGlobalDBByDBName 通过名称获取db list中的db
+func GetGlobalDBByDBName(dbname string) *gorm.DB {
+	lock.RLock()
+	defer lock.RUnlock()
+	return GVA_DBList[dbname]
+}
+
+// MustGetGlobalDBByDBName 通过名称获取db 如果不存在则panic
+func MustGetGlobalDBByDBName(dbname string) *gorm.DB {
+	lock.RLock()
+	defer lock.RUnlock()
+	db, ok := GVA_DBList[dbname]
+	if !ok || db == nil {
+		panic("db no init")
+	}
+	return db
+}

server/go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/go-redis/redis/v8 v8.11.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gookit/color v1.3.1
+	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible
 	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/natefinch/lumberjack v2.0.0+incompatible

server/go.sum

@@ -234,6 +234,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible h1:3kDd8PIWAdU+qGs/+0QUgsMI2ZSiJPt45Xn0su+x/Q0=
+github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible/go.mod h1:l7VUhRbTKCzdOacdT4oWCwATKyvZqUOlOqr0Ous3k4s=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=

server/initialize/db_list.go

+package initialize
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"gorm.io/gorm"
+)
+
+const sys = "system"
+
+func DBList() {
+	dbMap := make(map[string]*gorm.DB)
+	for _, info := range global.GVA_CONFIG.DBList {
+		if info.Disable {
+			continue
+		}
+		switch info.Type {
+		case "mysql":
+			dbMap[info.Dbname] = GormMysqlByConfig(info)
+		case "pgsql":
+			dbMap[info.Dbname] = GormPgSqlByConfig(info)
+		default:
+			continue
+		}
+	}
+	// 做特殊判断,是否有迁移
+	// 适配低版本迁移多数据库版本
+	if sysDB, ok := dbMap[sys]; ok {
+		global.GVA_DB = sysDB
+	}
+	global.GVA_DBList = dbMap
+}

server/initialize/gorm_mysql.go

 package initialize
 
 import (
+	"github.com/flipped-aurora/gin-vue-admin/server/config"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/initialize/internal"
 	"gorm.io/driver/mysql"
@@ -29,3 +30,23 @@ func GormMysql() *gorm.DB {
 		return db
 	}
 }
+
+// GormMysqlByConfig 初始化Mysql数据库用过传入配置
+func GormMysqlByConfig(m config.DB) *gorm.DB {
+	if m.Dbname == "" {
+		return nil
+	}
+	mysqlConfig := mysql.Config{
+		DSN:                       m.Dsn(), // DSN data source name
+		DefaultStringSize:         191,     // string 类型字段的默认长度
+		SkipInitializeWithVersion: false,   // 根据版本自动配置
+	}
+	if db, err := gorm.Open(mysql.New(mysqlConfig), internal.Gorm.Config()); err != nil {
+		panic(err)
+	} else {
+		sqlDB, _ := db.DB()
+		sqlDB.SetMaxIdleConns(m.MaxIdleConns)
+		sqlDB.SetMaxOpenConns(m.MaxOpenConns)
+		return db
+	}
+}

server/initialize/gorm_pgsql.go

 package initialize
 
 import (
+	"github.com/flipped-aurora/gin-vue-admin/server/config"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/initialize/internal"
 	"gorm.io/driver/postgres"
@@ -28,3 +29,22 @@ func GormPgSql() *gorm.DB {
 		return db
 	}
 }
+
+// GormPgSqlByConfig 初始化 Postgresql 数据库 通过参数
+func GormPgSqlByConfig(p config.DB) *gorm.DB {
+	if p.Dbname == "" {
+		return nil
+	}
+	pgsqlConfig := postgres.Config{
+		DSN:                  p.Dsn(), // DSN data source name
+		PreferSimpleProtocol: false,
+	}
+	if db, err := gorm.Open(postgres.New(pgsqlConfig), internal.Gorm.Config()); err != nil {
+		panic(err)
+	} else {
+		sqlDB, _ := db.DB()
+		sqlDB.SetMaxIdleConns(p.MaxIdleConns)
+		sqlDB.SetMaxOpenConns(p.MaxOpenConns)
+		return db
+	}
+}

server/main.go

@@ -23,6 +23,7 @@ func main() {
 	global.GVA_LOG = core.Zap()       // 初始化zap日志库
 	global.GVA_DB = initialize.Gorm() // gorm连接数据库
 	initialize.Timer()
+	initialize.DBList()
 	if global.GVA_DB != nil {
 		initialize.RegisterTables(global.GVA_DB) // 初始化表
 		// 程序结束前关闭数据库链接

server/utils/upload/obs.go

+package upload
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/huaweicloud/huaweicloud-sdk-go-obs/obs"
+	"github.com/pkg/errors"
+	"mime/multipart"
+)
+
+var HuaWeiObs = new(_obs)
+
+type _obs struct{}
+
+func NewHuaWeiObsClient() (client *obs.ObsClient, err error) {
+	return obs.New(global.GVA_CONFIG.HuaWeiObs.AccessKey, global.GVA_CONFIG.HuaWeiObs.SecretKey, global.GVA_CONFIG.HuaWeiObs.Endpoint)
+}
+
+func (o *_obs) UploadFile(file *multipart.FileHeader) (filename string, filepath string, err error) {
+	var open multipart.File
+	open, err = file.Open()
+	if err != nil {
+		return filename, filepath, err
+	}
+	filename = file.Filename
+	input := &obs.PutObjectInput{
+		PutObjectBasicInput: obs.PutObjectBasicInput{
+			ObjectOperationInput: obs.ObjectOperationInput{
+				Bucket: global.GVA_CONFIG.HuaWeiObs.Bucket,
+				Key:    filename,
+			},
+			ContentType: file.Header.Get("content-type"),
+		},
+		Body: open,
+	}
+
+	var client *obs.ObsClient
+	client, err = NewHuaWeiObsClient()
+	if err != nil {
+		return filepath, filename, errors.Wrap(err, "获取华为对象存储对象失败!")
+	}
+
+	_, err = client.PutObject(input)
+	if err != nil {
+		return filepath, filename, errors.Wrap(err, "文件上传失败!")
+	}
+	filepath = global.GVA_CONFIG.HuaWeiObs.Path + "/" + filename
+	return filepath, filename, err
+}
+
+func (o *_obs) DeleteFile(key string) error {
+	client, err := NewHuaWeiObsClient()
+	if err != nil {
+		return errors.Wrap(err, "获取华为对象存储对象失败!")
+	}
+	input := &obs.DeleteObjectInput{
+		Bucket: global.GVA_CONFIG.HuaWeiObs.Bucket,
+		Key:    key,
+	}
+	var output *obs.DeleteObjectOutput
+	output, err = client.DeleteObject(input)
+	if err != nil {
+		return errors.Wrapf(err, "删除对象(%s)失败!, output: %v", key, output)
+	}
+	return nil
+}

server/utils/upload/upload.go

@@ -6,23 +6,17 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 )
 
-//@author: [ccfish86](https://github.com/ccfish86)
-//@author: [SliverHorn](https://github.com/SliverHorn)
-//@interface_name: OSS
-//@description: OSS接口
-
+// OSS 对象存储接口
+// Author [SliverHorn](https://github.com/SliverHorn)
+// Author [ccfish86](https://github.com/ccfish86)
 type OSS interface {
 	UploadFile(file *multipart.FileHeader) (string, string, error)
 	DeleteFile(key string) error
 }
 
-//@author: [ccfish86](https://github.com/ccfish86)
-//@author: [SliverHorn](https://github.com/SliverHorn)
-//@function: NewOss
-//@description: OSS接口
-//@description: OSS的实例化方法
-//@return: OSS
-
+// NewOss OSS的实例化方法
+// Author [SliverHorn](https://github.com/SliverHorn)
+// Author [ccfish86](https://github.com/ccfish86)
 func NewOss() OSS {
 	switch global.GVA_CONFIG.System.OssType {
 	case "local":
@@ -33,6 +27,8 @@ func NewOss() OSS {
 		return &TencentCOS{}
 	case "aliyun-oss":
 		return &AliyunOSS{}
+	case "huawei-obs":
+		return HuaWeiObs
 	default:
 		return &Local{}
 	}

web/src/view/systemTools/system/system.vue

@@ -22,6 +22,7 @@
               <el-option value="qiniu" />
               <el-option value="tencent-cos" />
               <el-option value="aliyun-oss" />
+              <el-option value="huawei-obs" />
             </el-select>
           </el-form-item>
           <el-form-item label="多点登录拦截">
@@ -258,6 +259,24 @@
               <el-input v-model="config.aliyunOSS.bucketUrl" />
             </el-form-item>
           </template>
+          <template v-if="config.system.ossType === 'huawei-obs'">
+            <h2>华为云Obs上传配置</h2>
+            <el-form-item label="path">
+              <el-input v-model="config.huaWeiObs.path" />
+            </el-form-item>
+            <el-form-item label="bucket">
+              <el-input v-model="config.huaWeiObs.bucket" />
+            </el-form-item>
+            <el-form-item label="endpoint">
+              <el-input v-model="config.huaWeiObs.endpoint" />
+            </el-form-item>
+            <el-form-item label="accessKey">
+              <el-input v-model="config.huaWeiObs.AccessKey" />
+            </el-form-item>
+            <el-form-item label="secretKey">
+              <el-input v-model="config.huaWeiObs.secretKey" />
+            </el-form-item>
+          </template>
 
         </el-collapse-item>
 
@@ -352,6 +371,7 @@ export default {
         qiniu: {},
         tencentCOS: {},
         aliyunOSS: {},
+        huaWeiObs: {},
         captcha: {},
         zap: {},
         local: {},