Merge branch 'alpha' into refactor_error

# Conflicts:
#	controller/channel.go
#	middleware/distributor.go
#	model/channel.go
#	model/user.go
#	model/user_cache.go
#	relay/common/relay_info.go

relay/channel/baidu_v2/adaptor.go

@@ -43,7 +43,16 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 
 func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Header, info *relaycommon.RelayInfo) error {
 	channel.SetupApiRequestHeader(info, c, req)
-	req.Set("Authorization", "Bearer "+info.ApiKey)
+        keyParts := strings.Split(info.ApiKey, "|")
+	if len(keyParts) == 0 || keyParts[0] == "" {
+        	return errors.New("invalid API key: authorization token is required")
+        }
+	 if len(keyParts) > 1 {
+               if keyParts[1] != "" {
+                       req.Set("appid", keyParts[1])
+               }
+        }
+	req.Set("Authorization", "Bearer "+keyParts[0])
 	return nil
 }