Skip to content

Commit 045958d

Browse files
committed
support smsbao
1 parent db1a479 commit 045958d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ require (
6969
github.com/jinzhu/inflection v1.0.0 // indirect
7070
github.com/jinzhu/now v1.1.5 // indirect
7171
github.com/json-iterator/go v1.1.12 // indirect
72-
github.com/juggleim/commons v1.0.11
72+
github.com/juggleim/commons v1.0.12
7373
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
7474
github.com/leodido/go-urn v1.4.0 // indirect
7575
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
@@ -91,5 +91,5 @@ require (
9191
golang.org/x/sys v0.31.0 // indirect
9292
golang.org/x/text v0.23.0 // indirect
9393
google.golang.org/protobuf v1.36.6
94-
gopkg.in/yaml.v3 v3.0.1 // indirect
94+
gopkg.in/yaml.v3 v3.0.1
9595
)

go.sum

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,8 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
190190
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
191191
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
192192
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
193-
github.com/juggleim/commons v1.0.9 h1:N7RTbhcfbtx0nscBN6OWJNN/i7G0TtfPlDKjFLTqEgI=
194-
github.com/juggleim/commons v1.0.9/go.mod h1:1bp7TnNj4j6Bju2No+jPRUQKjOeC6Boopi5uDoJ0+Lo=
195-
github.com/juggleim/commons v1.0.10 h1:RqZH/r+6SodUdWnGE7WN3aapawlcipDPtCMt2kfXoyw=
196-
github.com/juggleim/commons v1.0.10/go.mod h1:1bp7TnNj4j6Bju2No+jPRUQKjOeC6Boopi5uDoJ0+Lo=
197-
github.com/juggleim/commons v1.0.11 h1:I++O9Kk1qsD+afa6+Rkck86tlQX46CNrVgBqklpyu8k=
198-
github.com/juggleim/commons v1.0.11/go.mod h1:1bp7TnNj4j6Bju2No+jPRUQKjOeC6Boopi5uDoJ0+Lo=
193+
github.com/juggleim/commons v1.0.12 h1:VGT0GYNNJe86Q0xKwHo3zQZscEAucXLZ5sWIJxjKuMc=
194+
github.com/juggleim/commons v1.0.12/go.mod h1:1bp7TnNj4j6Bju2No+jPRUQKjOeC6Boopi5uDoJ0+Lo=
199195
github.com/juggleim/imserver-sdk-go v1.0.6 h1:NL639nM2g4MKgRJSpwsMFLlAF/PBPg7BCrJnikdAeLE=
200196
github.com/juggleim/imserver-sdk-go v1.0.6/go.mod h1:xdxsGeW0b4GOYJvKJwnaU04Z+jGaUSrBvzeSbNvNOFk=
201197
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=

services/smsservice.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,17 @@ func loadSmsEngine(appInfo *appinfos.AppInfo) {
103103
if smsConf.Channel == "baidu" && smsConf.BdSmsEngine != nil && smsConf.BdSmsEngine.ApiKey != "" && smsConf.BdSmsEngine.SecretKey != "" {
104104
appInfo.SmsEngine = smsConf.BdSmsEngine
105105
return
106+
} else if smsConf.Channel == "smsbao" && smsConf.SmsBaoEngine != nil && smsConf.SmsBaoEngine.Username != "" && smsConf.SmsBaoEngine.Password != "" && smsConf.SmsBaoEngine.Template != "" {
107+
appInfo.SmsEngine = smsConf.SmsBaoEngine
108+
return
106109
}
107110
}
108111
}
109112
appInfo.SmsEngine = smsengines.DefaultSmsEngine
110113
}
111114

112115
type SmsEngineConf struct {
113-
Channel string `json:"channel,omitempty"`
114-
BdSmsEngine *smsengines.BdSmsEngine `json:"baidu,omitempty"`
116+
Channel string `json:"channel,omitempty"`
117+
BdSmsEngine *smsengines.BdSmsEngine `json:"baidu,omitempty"`
118+
SmsBaoEngine *smsengines.SmsBaoEngine `json:"smsbao,omitempty"`
115119
}

0 commit comments

Comments
 (0)