This commit is contained in:
gazebo
2019-05-12 22:09:32 +08:00
parent 46ee522bbb
commit c2911fca0f

View File

@@ -112,8 +112,8 @@ func (a *API) Decrypt(msg string) (decryptedMsg string, err error) {
func (a *API) RegisterCallback(callbackTagList []string, token, aesKey, urlStr string) (err error) { func (a *API) RegisterCallback(callbackTagList []string, token, aesKey, urlStr string) (err error) {
a.locker.Lock() a.locker.Lock()
oldCallbackToken := a.callbackToken // oldCallbackToken := a.callbackToken
oldCallbackAESKey := a.callbackAESKey // oldCallbackAESKey := a.callbackAESKey
a.callbackToken = token a.callbackToken = token
a.callbackAESKey, _ = base64.StdEncoding.DecodeString(aesKey + "=") a.callbackAESKey, _ = base64.StdEncoding.DecodeString(aesKey + "=")
a.locker.Unlock() a.locker.Unlock()
@@ -126,12 +126,12 @@ func (a *API) RegisterCallback(callbackTagList []string, token, aesKey, urlStr s
"url": urlStr, "url": urlStr,
}) })
} }
if err != nil { // if err != nil {
a.locker.Lock() // a.locker.Lock()
defer a.locker.Unlock() // defer a.locker.Unlock()
a.callbackToken = oldCallbackToken // a.callbackToken = oldCallbackToken
a.callbackAESKey = oldCallbackAESKey // a.callbackAESKey = oldCallbackAESKey
} // }
return err return err
} }