-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/super-k8s
- Loading branch information
Showing
14 changed files
with
761 additions
and
543 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // Copyright © 2023 OpenIM open source community. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package email | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/OpenIMSDK/chat/pkg/common/config" | ||
| "github.com/OpenIMSDK/tools/errs" | ||
|
|
||
| "gopkg.in/gomail.v2" | ||
| ) | ||
|
|
||
| func NewMail() (Mail, error) { | ||
| dail := gomail.NewDialer( | ||
| config.Config.VerifyCode.Mail.SmtpAddr, | ||
| config.Config.VerifyCode.Mail.SmtpPort, | ||
| config.Config.VerifyCode.Mail.SenderMail, | ||
| config.Config.VerifyCode.Mail.SenderAuthorizationCode) | ||
|
|
||
| return &mail{dail: dail}, nil | ||
| } | ||
|
|
||
| type Mail interface { | ||
| Name() string | ||
| SendMail(ctx context.Context, mail string, verifyCode string) error | ||
| } | ||
|
|
||
| type mail struct { | ||
| dail *gomail.Dialer | ||
| } | ||
|
|
||
| func (a *mail) Name() string { | ||
| return "mail" | ||
| } | ||
|
|
||
| func (a *mail) SendMail(ctx context.Context, mail string, verifyCode string) error { | ||
| m := gomail.NewMessage() | ||
| m.SetHeader(`From`, config.Config.VerifyCode.Mail.SenderMail) | ||
| m.SetHeader(`To`, []string{mail}...) | ||
| m.SetHeader(`Subject`, config.Config.VerifyCode.Mail.Title) | ||
| m.SetBody(`text/html`, fmt.Sprintf("您的验证码为:%s，该验证码5分钟内有效，请勿泄露于他人。", verifyCode)) | ||
|
|
||
| // Send | ||
| err := a.dail.DialAndSend(m) | ||
| return errs.Wrap(err) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package email | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "github.com/OpenIMSDK/chat/pkg/common/config" | ||
| "gopkg.in/yaml.v3" | ||
| "io/ioutil" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestEmail(T *testing.T) { | ||
| if err := InitConfig(); err != nil { | ||
| panic(err) | ||
| } | ||
| tests := []struct { | ||
| name string | ||
| ctx context.Context | ||
| mail string | ||
| code string | ||
| want error | ||
| }{ | ||
| { | ||
| name: "success send email", | ||
| ctx: context.Background(), | ||
| mail: "[email protected]", | ||
| code: "5555", | ||
| want: errors.New("nil"), | ||
| }, | ||
| { | ||
| name: "fail send email", | ||
| ctx: context.Background(), | ||
| mail: "", | ||
| code: "5555", | ||
| want: errors.New("dial tcp :0: connectex: The requested address is not valid in its context."), | ||
| }, | ||
| } | ||
| mail, err := NewMail() | ||
| if err != nil { | ||
| T.Errorf("Init mail failed,%v", err) | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| T.Run(tt.name, func(t *testing.T) { | ||
| if got := mail.SendMail(tt.ctx, tt.mail, tt.code); errors.Is(got, tt.want) { | ||
| t.Errorf("%v have a err,%v", tt.name, tt.want) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func InitConfig() error { | ||
| yam, err := ioutil.ReadFile("../../config/config.yaml") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = yaml.Unmarshal(yam, &config.Config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.