1.bugfix:Appid generated incorrect. 2.winform UI enhancement.

tmoonlight · Sep 22, 2019 · f862593 · f862593
1 parent af9680f
commit f862593
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 94 deletions.
diff --git a/src/NSmartProxy.ClientRouter/Router.cs b/src/NSmartProxy.ClientRouter/Router.cs
@@ -211,20 +211,21 @@ public async Task Start(bool AlwaysReconnect = false)
                 {
                     int counter = 0;
 
-                    //2.分配配置：appid为0时说明没有分配appid，所以需要分配一个
+                    //2.从服务端返回的appid上分配客户端的appid TODO 3 appid逻辑需要重新梳理
                     foreach (var app in appIdIpPortConfig)
                     {
-                        if (app.AppId == 0)
-                        {
-                            app.AppId = clientModel.AppList[counter].AppId;
-                            counter++;
-                        }
+                        //if (app.AppId == 0)
+                        //{
+                        app.AppId = clientModel.AppList[counter].AppId;
+                        counter++;
+                        //}
                     }
                     Logger.Debug("****************port list*************");
                     List<string> tunnelstrs = new List<string>();
                     foreach (var ap in clientModel.AppList)
                     {
                         var cApp = appIdIpPortConfig.First(obj => obj.AppId == ap.AppId);
+                        //var cApp = appIdIpPortConfig[ap.AppId];
                         var tunnelStr = ap.AppId + ":  " + ClientConfig.ProviderAddress + ":" +
                                         ap.Port + "=>" +
                                         cApp.IP + ":" + cApp.TargetServicePort;

diff --git a/src/NSmartProxy.Infrastructure/Shared/Global.cs b/src/NSmartProxy.Infrastructure/Shared/Global.cs
@@ -6,8 +6,8 @@
     public sealed class Global
     {
         public const string NO_TOKEN_STRING = "notoken";
-        public const string NSmartProxyClientName = "NSmartProxy Client v1.0_Beta";
-        public const string NSmartProxyServerName = "NSmartProxy Server v1.0_Beta";
+        public const string NSmartProxyClientName = "NSmartProxy Client v1.0";
+        public const string NSmartProxyServerName = "NSmartProxy Server v1.0";
 
         public const int ClientReconnectInterval = 3000;//客户端断线重连时间间隔（毫秒）
 

diff --git a/src/NSmartProxy/Extension/HttpServerStaticFiles/main.html b/src/NSmartProxy/Extension/HttpServerStaticFiles/main.html
@@ -137,7 +137,7 @@
     <script src="Chart.min.js"></script>
     <!--<script src="dashboard.js"></script>-->
     <!--<script src="bootstrap-table-expandable.js"></script>-->
-    <script src="main.js?v=135"></script>
+    <script src="main.js?v=145"></script>
     <script></script>
 
 </body>

diff --git a/src/NSmartProxy/Extension/HttpServerStaticFiles/main.js b/src/NSmartProxy/Extension/HttpServerStaticFiles/main.js
@@ -1,6 +1,6 @@
 //TODO 调试用
-//var basepath = "/";//api根地址,这里需要和配置文件一致
-var basepath = "http://localhost:12309/";
+var basepath = "/";//api根地址,这里需要和配置文件一致
+//var basepath = "http://localhost:12309/";
 
 //hashchange事件，路由是如此实现的
 (function () {

diff --git a/src/NSmartProxyWinform/ClientMngr.Designer.cs b/src/NSmartProxyWinform/ClientMngr.Designer.cs