mirror of
				https://github.com/cloudreve/cloudreve.git
				synced 2025-11-01 00:57:15 +08:00 
			
		
		
		
	Feat: option for using SSL connection in mail queue
This commit is contained in:
		
							
								
								
									
										2
									
								
								assets
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								assets
									
									
									
									
									
								
							 Submodule assets updated: 538bd95a7b...0e8e26e4de
									
								
							| @ -90,6 +90,7 @@ func addDefaultSettings() { | ||||
| 		{Name: "replyTo", Value: `abslant@126.com`, Type: "mail"}, | ||||
| 		{Name: "smtpUser", Value: `no-reply@acg.blue`, Type: "mail"}, | ||||
| 		{Name: "smtpPass", Value: ``, Type: "mail"}, | ||||
| 		{Name: "smtpEncryption", Value: `0`, Type: "mail"}, | ||||
| 		{Name: "maxEditSize", Value: `4194304`, Type: "file_edit"}, | ||||
| 		{Name: "archive_timeout", Value: `60`, Type: "timeout"}, | ||||
| 		{Name: "download_timeout", Value: `60`, Type: "timeout"}, | ||||
|  | ||||
| @ -4,7 +4,7 @@ package conf | ||||
| var BackendVersion = "3.0.0-beta1" | ||||
|  | ||||
| // RequiredDBVersion 与当前版本匹配的数据库版本 | ||||
| var RequiredDBVersion = "3.0.0" | ||||
| var RequiredDBVersion = "3.0.0-33-g5885661" | ||||
|  | ||||
| // RequiredStaticVersion 与当前版本匹配的静态资源版本 | ||||
| var RequiredStaticVersion = "3.0.0" | ||||
|  | ||||
| @ -30,19 +30,21 @@ func Init() { | ||||
| 		"replyTo", | ||||
| 		"smtpUser", | ||||
| 		"smtpPass", | ||||
| 		"smtpEncryption", | ||||
| 	) | ||||
| 	port := model.GetIntSetting("smtpPort", 25) | ||||
| 	keepAlive := model.GetIntSetting("mail_keepalive", 30) | ||||
|  | ||||
| 	client := NewSMTPClient(SMTPConfig{ | ||||
| 		Name:      options["fromName"], | ||||
| 		Address:   options["fromAdress"], | ||||
| 		ReplyTo:   options["replyTo"], | ||||
| 		Host:      options["smtpHost"], | ||||
| 		Port:      port, | ||||
| 		User:      options["smtpUser"], | ||||
| 		Password:  options["smtpPass"], | ||||
| 		Keepalive: keepAlive, | ||||
| 		Name:       options["fromName"], | ||||
| 		Address:    options["fromAdress"], | ||||
| 		ReplyTo:    options["replyTo"], | ||||
| 		Host:       options["smtpHost"], | ||||
| 		Port:       port, | ||||
| 		User:       options["smtpUser"], | ||||
| 		Password:   options["smtpPass"], | ||||
| 		Keepalive:  keepAlive, | ||||
| 		Encryption: model.IsTrueVal(options["smtpEncryption"]), | ||||
| 	}) | ||||
|  | ||||
| 	Client = client | ||||
|  | ||||
| @ -22,7 +22,7 @@ type SMTPConfig struct { | ||||
| 	Port       int    // 服务器端口 | ||||
| 	User       string // 用户名 | ||||
| 	Password   string // 密码 | ||||
| 	Encryption string // 是否启用加密 | ||||
| 	Encryption bool   // 是否启用加密 | ||||
| 	Keepalive  int    // SMTP 连接保留时长 | ||||
| } | ||||
|  | ||||
| @ -77,6 +77,11 @@ func (client *SMTP) Init() { | ||||
| 		d.Timeout = time.Duration(client.Config.Keepalive+5) * time.Second | ||||
| 		client.chOpen = true | ||||
|  | ||||
| 		// 是否启用 SSL | ||||
| 		if client.Config.Encryption { | ||||
| 			d.SSL = true | ||||
| 		} | ||||
|  | ||||
| 		var s mail.SendCloser | ||||
| 		var err error | ||||
| 		open := false | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 HFO4
					HFO4