From cf2e6c576eef621068c8453cdeca18ee92809bdb Mon Sep 17 00:00:00 2001
From: oneRain <onerain88@gmail.com>
Date: Tue, 23 Jul 2019 14:35:07 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E7=AE=80=E5=8C=96=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RTM/Source/Public/AVRealtime.cs   | 44 +++++++++++--------------------
 Storage/Source/Public/AVClient.cs | 39 ++++++++++++++-------------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/RTM/Source/Public/AVRealtime.cs b/RTM/Source/Public/AVRealtime.cs
index cd6360d..49bd9ec 100644
--- a/RTM/Source/Public/AVRealtime.cs
+++ b/RTM/Source/Public/AVRealtime.cs
@@ -409,18 +409,6 @@ namespace LeanCloud.Realtime
             /// 登录的时候告知服务器，本次登录所使用的离线消息策略
             /// </summary>
             public OfflineMessageStrategy OfflineMessageStrategy { get; set; }
-
-            /// <summary>
-            /// Gets or sets the realtime server.
-            /// </summary>
-            /// <value>The realtime server.</value>
-            public Uri RealtimeServer { get; set; }
-
-            /// <summary>
-            /// Gets or sets the push router server.
-            /// </summary>
-            /// <value>The push router server.</value>
-            public Uri RTMRouter { get; set; }
         }
 
         /// <summary>
@@ -1086,26 +1074,26 @@ namespace LeanCloud.Realtime
                 return Task.FromResult(true);
             }
 
-            if (CurrentConfiguration.RealtimeServer != null)
+            if (AVClient.CurrentConfiguration.RealtimeServer != null)
             {
-                _wss = CurrentConfiguration.RealtimeServer.ToString();
+                _wss = AVClient.CurrentConfiguration.RealtimeServer;
                 AVRealtime.PrintLog("use configuration realtime server with url: " + _wss);
                 return OpenAsync(_wss, subprotocol, enforce);
             }
-            var routerUrl = CurrentConfiguration.RTMRouter != null ? CurrentConfiguration.RTMRouter.ToString() : null;
+            var routerUrl = AVClient.CurrentConfiguration.RTMServer;
             return RouterController.GetAsync(routerUrl, secure, cancellationToken).OnSuccess(r =>
+            {
+                var routerState = r.Result;
+                if (routerState == null)
                 {
-                    var routerState = r.Result;
-                    if (routerState == null)
-                    {
-                        return Task.FromResult(false);
-                    }
-                    _wss = routerState.server;
-                    _secondaryWss = routerState.secondary;
-                    state = Status.Connecting;
-                    AVRealtime.PrintLog("push router give a url :" + _wss);
-                    return OpenAsync(routerState.server, subprotocol, enforce);
-                }).Unwrap();
+                    return Task.FromResult(false);
+                }
+                _wss = routerState.server;
+                _secondaryWss = routerState.secondary;
+                state = Status.Connecting;
+                AVRealtime.PrintLog("push router give a url :" + _wss);
+                return OpenAsync(routerState.server, subprotocol, enforce);
+            }).Unwrap();
         }
 
         /// <summary>
@@ -1136,7 +1124,7 @@ namespace LeanCloud.Realtime
         /// <returns></returns>
         public Task<Tuple<int, IDictionary<string, object>>> RunCommandAsync(AVIMCommand command)
         {
-            command.AppId(this.CurrentConfiguration.ApplicationId);
+            command.AppId(AVClient.CurrentConfiguration.ApplicationId);
             return this.AVIMCommandRunner.RunCommandAsync(command);
         }
 
@@ -1146,7 +1134,7 @@ namespace LeanCloud.Realtime
         /// <param name="command"></param>
         public void RunCommand(AVIMCommand command)
         {
-            command.AppId(this.CurrentConfiguration.ApplicationId);
+            command.AppId(AVClient.CurrentConfiguration.ApplicationId);
             this.AVIMCommandRunner.RunCommand(command);
         }
 
diff --git a/Storage/Source/Public/AVClient.cs b/Storage/Source/Public/AVClient.cs
index 825b791..a4308c9 100644
--- a/Storage/Source/Public/AVClient.cs
+++ b/Storage/Source/Public/AVClient.cs
@@ -102,7 +102,7 @@ namespace LeanCloud
             /// <summary>
             /// The LeanCloud application ID of your app.
             /// </summary>
-            public String ApplicationId { get; set; }
+            public string ApplicationId { get; set; }
 
             /// <summary>
             /// LeanCloud  C# SDK 支持的服务节点，目前支持华北，华东和北美公有云节点和私有节点，以及专属节点
@@ -120,13 +120,13 @@ namespace LeanCloud
             /// <summary>
             /// The LeanCloud application key for your app.
             /// </summary>
-            public String ApplicationKey { get; set; }
+            public string ApplicationKey { get; set; }
 
             /// <summary>
             /// The LeanCloud master key for your app.
             /// </summary>
             /// <value>The master key.</value>
-            public String MasterKey { get; set; }
+            public string MasterKey { get; set; }
 
             /// <summary>
             /// Gets or sets additional HTTP headers to be sent with network requests from the SDK.
@@ -139,28 +139,31 @@ namespace LeanCloud
             public VersionInformation VersionInfo { get; set; }
 
             /// <summary>
-            /// Gets or sets the engine server uri. The Uri must have no path port.
-            /// If this property is set, all LeanEngine cloud func calls will use this server as LeanEngine server.
-            /// </summary>
-            /// <value>The engine server uri.</value>
-            public Uri EngineServer { get; set; }
-
-            /// <summary>
-            /// Gets or sets the API server.
+            /// 存储服务器地址
             /// </summary>
             /// <value>The API server.</value>
-            public Uri ApiServer { get; set; }
+            public string ApiServer { get; set; }
 
             /// <summary>
-            /// Gets or sets the push server.
+            /// 云引擎服务器地址
             /// </summary>
-            /// <value>The push server.</value>
+            /// <value>The engine server uri.</value>
+            public string EngineServer { get; set; }
+
+            /// <summary>
+            /// 即时通信服务器地址
+            /// </summary>
+            /// <value>The RTMR outer.</value>
+            public string RTMServer { get; set; }
+
+            /// <summary>
+            /// 直连即时通信服务器地址
+            /// </summary>
+            /// <value>The realtime server.</value>
+            public string RealtimeServer { get; set; }
+
             public Uri PushServer { get; set; }
 
-            /// <summary>
-            /// Gets or sets the stats server.
-            /// </summary>
-            /// <value>The stats server.</value>
             public Uri StatsServer { get; set; }
         }