Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

EX/Configini.ini

@@ -0,0 +1,23 @@
+[SYS]
+Language=zh-CN
+Name=YZ
+Enterprise=YONGZHAO
+[SQL_SERVER]
+SQL1=192.168.15.248
+SQL2=BatchDyeingCentral
+SQL3=SQL SERVER
+SQL4=sa
+SQL5=yf888999
+[NETWORK]
+TCP=1
+HTTP=1
+TLS=0
+TCP_PORT1=7789
+TCP_PORT2=7790
+HTTP_PORT=7791
+[SERVER]
+SERVERIP=www.scserverddns.top:7795
+SERVERNAME=SUNLIGHT
+SERVERUSER=SUNLIGHT
+SERRVERPASWORD=SUNLIGHT
+

View/imgQR.xaml.cs

@@ -99,7 +99,7 @@ namespace SunlightAggregationManager.View
         {
             string text_APP = "TEST"; // 
             string text_LINK = MainWindowViewModel.MachineIP + ":"+ MainWindowViewModel.MachineIPP1 + 
-                "," + MainWindowViewModel.SERVERIP + "/"+ MainWindowViewModel.Enterprise;
+                "," + MainWindowViewModel.SERVERIP + ":7791/"+ MainWindowViewModel.Enterprise;
             // 要生成二维码的内容
 
             imgQR_CREATE(text_APP, imgQR_app);

ViewModel/MainWindowViewModel.cs

@@ -150,7 +150,7 @@ namespace SunlightAggregationManager.ViewModel
             Console.WriteLine(MachineIP);
             //连接sunlight服务器
             Service.Rows.Add(3, "RUN", "Sunlight_Server_Link");
-            AsyncTcpClient.Configuration(SERVERIP, SERVERNAME, SERVERUSER, SERRVERPASWORD);
+            AsyncTcpClient.Configuration(SERVERIP+":7795", SERVERNAME, SERVERUSER, SERRVERPASWORD);
 
             Service.EndInit();