mirror of
				https://gitee.com/dromara/mayfly-go
				synced 2025-11-04 08:20:25 +08:00 
			
		
		
		
	重构数据库备份与恢复模块 (#80)
* fix: 保存 LastResult 时截断字符串过长部分,以避免数据库报错 * refactor: 新增 entity.DbTaskBase 和 persistence.dbTaskBase, 用于实现数据库备份和恢复任务处理相关部分 * fix: aeskey变更后,解密密码出现数组越界访问错误 * fix: 时间属性为零值时,保存到 mysql 数据库报错 * refactor db.infrastructure.service.scheduler * feat: 实现立即备份功能 * refactor db.infrastructure.service.db_instance * refactor: 从数据库中获取数据库备份目录、mysql文件路径等配置信息 * fix: 数据库备份和恢复问题 * fix: 修改 .gitignore 文件,忽略数据库备份目录和数据库程序目录
This commit is contained in:
		@@ -1,6 +1,7 @@
 | 
			
		||||
package entity
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"errors"
 | 
			
		||||
	"mayfly-go/internal/common/utils"
 | 
			
		||||
	"mayfly-go/internal/redis/rdm"
 | 
			
		||||
	"mayfly-go/pkg/model"
 | 
			
		||||
@@ -21,20 +22,30 @@ type Redis struct {
 | 
			
		||||
	Remark             string
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (r *Redis) PwdEncrypt() {
 | 
			
		||||
func (r *Redis) PwdEncrypt() error {
 | 
			
		||||
	// 密码替换为加密后的密码
 | 
			
		||||
	r.Password = utils.PwdAesEncrypt(r.Password)
 | 
			
		||||
	password, err := utils.PwdAesEncrypt(r.Password)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return errors.New("加密 Redis 密码失败")
 | 
			
		||||
	}
 | 
			
		||||
	r.Password = password
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (r *Redis) PwdDecrypt() {
 | 
			
		||||
func (r *Redis) PwdDecrypt() error {
 | 
			
		||||
	// 密码替换为解密后的密码
 | 
			
		||||
	r.Password = utils.PwdAesDecrypt(r.Password)
 | 
			
		||||
	password, err := utils.PwdAesDecrypt(r.Password)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return errors.New("解密 Redis 密码失败")
 | 
			
		||||
	}
 | 
			
		||||
	r.Password = password
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 转换为redisInfo进行连接
 | 
			
		||||
func (re *Redis) ToRedisInfo(db int, tagPath ...string) *rdm.RedisInfo {
 | 
			
		||||
// ToRedisInfo 转换为redisInfo进行连接
 | 
			
		||||
func (r *Redis) ToRedisInfo(db int, tagPath ...string) *rdm.RedisInfo {
 | 
			
		||||
	redisInfo := new(rdm.RedisInfo)
 | 
			
		||||
	structx.Copy(redisInfo, re)
 | 
			
		||||
	_ = structx.Copy(redisInfo, r)
 | 
			
		||||
	redisInfo.Db = db
 | 
			
		||||
	redisInfo.TagPath = tagPath
 | 
			
		||||
	return redisInfo
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user