blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-08-30 02:30:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
wenxu12345 2022-02-23 10:31:26 +08:00
commit 4c92ee4a8a
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.yaml
View File

@ -464,13 +464,13 @@ demo:
verificationCodeTemplateCode: SMS_226810164 verificationCodeTemplateCode: SMS_226810164
superCode: 666666 superCode: 666666
# second # second
codeTTL: 60 codeTTL: 300
mail: mail:
title: "openIM" title: "openIM"
senderMail: "765567899@qq.com" senderMail: "765567899@qq.com"
senderAuthorizationCode: "gxyausfoevlzbfag" senderAuthorizationCode: "gxyausfoevlzbfag"
smtpAddr: "smtp.qq.com" smtpAddr: "smtp.qq.com"
smtpPort: smtpPort: 25

11
internal/demo/register/verify.go
View File

@ -45,9 +45,16 @@ func Verify(c *gin.Context) {
log.NewInfo("0", " params.VerificationCode != config.Config.Demo.SuperCode", params.VerificationCode, config.Config.Demo) log.NewInfo("0", " params.VerificationCode != config.Config.Demo.SuperCode", params.VerificationCode, config.Config.Demo)
log.NewInfo(params.OperationID, "begin get form redis", account) log.NewInfo(params.OperationID, "begin get form redis", account)
if params.UsedFor == 0 { if params.UsedFor == 0 {
params.UsedFor = 1 params.UsedFor = constant.VerificationCodeForRegister
} }
accountKey := account + "_" + constant.VerificationCodeForRegisterSuffix var accountKey string
switch params.UsedFor {
case constant.VerificationCodeForRegister:
accountKey = account + "_" + constant.VerificationCodeForRegisterSuffix
case constant.VerificationCodeForReset:
accountKey = account + "_" + constant.VerificationCodeForResetSuffix
}
code, err := db.DB.GetAccountCode(accountKey) code, err := db.DB.GetAccountCode(accountKey)
log.NewInfo(params.OperationID, "redis phone number and verificating Code", accountKey, code, params) log.NewInfo(params.OperationID, "redis phone number and verificating Code", accountKey, code, params)
if err != nil { if err != nil {

2
script/sdk_svr_start.sh
View File

@ -6,7 +6,6 @@ source ./function.sh
list1=$(cat $config_path | grep openImApiPort | awk -F '[:]' '{print $NF}') list1=$(cat $config_path | grep openImApiPort | awk -F '[:]' '{print $NF}')
list2=$(cat $config_path | grep openImWsPort | awk -F '[:]' '{print $NF}') list2=$(cat $config_path | grep openImWsPort | awk -F '[:]' '{print $NF}')
list3=$(cat $config_path | grep openImSdkWsPort | awk -F '[:]' '{print $NF}') list3=$(cat $config_path | grep openImSdkWsPort | awk -F '[:]' '{print $NF}')
list4=$(cat $config_path | grep openImCmsApiPort | awk - F '[:]' '{print $NF}')
list_to_string $list1 list_to_string $list1
api_ports=($ports_array) api_ports=($ports_array)
list_to_string $list2 list_to_string $list2
@ -14,7 +13,6 @@ ws_ports=($ports_array)
list_to_string $list3 list_to_string $list3
sdk_ws_ports=($ports_array) sdk_ws_ports=($ports_array)
list_to_string $list4 list_to_string $list4
cms_api_ports=($ports_array)

2
script/start_rpc_service.sh
View File

@ -29,7 +29,7 @@ service_port_name=(
openImUserPort openImUserPort
openImFriendPort openImFriendPort
openImGroupPort openImGroupPort
openImAuthPort
openImAdminCmsPort openImAdminCmsPort
openImMessageCmsPort openImMessageCmsPort
openImStatisticsPort openImStatisticsPort