freestyle optimize

dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Message/Extensions/ApiMessageExtensions.cs

@@ -8,6 +8,7 @@ using System.Runtime.CompilerServices;
 using Vit.Extensions.Json_Extensions;
 using Vit.Core.Module.Serialization;
 using Vit.Extensions.Object_Serialize_Extensions;
+using System.Collections.Generic;
 
 namespace Vit.Extensions
 {
@@ -55,7 +56,19 @@ namespace Vit.Extensions
             #region (x.2)设置body
             {
                 ArraySegment<byte> bodyData;
-                if (arg != null && (bodyData = arg.SerializeToArraySegmentByte()).HasData())
+                if (arg is ArraySegment<byte> asByte)
+                {
+                    apiRequestMessage.value_OriData = asByte;
+                }
+                else if (arg is byte[] bytes)
+                {
+                    apiRequestMessage.value_OriData = bytes.BytesToArraySegmentByte();
+                }
+                else if (arg is string str)
+                {
+                    apiRequestMessage.value_OriData = str.StringToArraySegmentByte();
+                }
+                else if (arg != null && (bodyData = arg.SerializeToArraySegmentByte()).HasData())
                 {
                     apiRequestMessage.value_OriData = bodyData;
                 }
@@ -73,7 +86,7 @@ namespace Vit.Extensions
                             var query = url.Substring(queryIndex);
                             var kvs = System.Web.HttpUtility.ParseQueryString(query);
 
-                            JObject data = new JObject();
+                            var data = new Dictionary<string, string>();
                             foreach (string key in kvs)
                             {
                                 var value = kvs.Get(key);
@@ -103,15 +116,15 @@ namespace Vit.Extensions
         /// <param name="InitRpc">对Rpc的额外处理,如添加header</param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ApiMessage InitAsApiRequestMessage(this ApiMessage apiRequestMessage, string url, Object arg=null,string httpMethod=null,Action<RpcContextData>InitRpc=null)
-        {   
+        public static ApiMessage InitAsApiRequestMessage(this ApiMessage apiRequestMessage, string url, Object arg = null, string httpMethod = null, Action<RpcContextData> InitRpc = null)
+        {
             //(x.1)初始化rpcData
             var rpcData = new RpcContextData().InitFromRpcContext().Init(url, httpMethod);
             InitRpc?.Invoke(rpcData);
             apiRequestMessage.RpcContextData_OriData_Set(rpcData);
 
             //(x.2)设置body
-            SetValue(apiRequestMessage, url,arg);    
+            SetValue(apiRequestMessage, url, arg);
 
             return apiRequestMessage;
         }

dotnet/Library/Sers/Sers.ServiceStation/Sers.ServiceStation/ServiceStation.cs

@@ -287,7 +287,7 @@ namespace Sers.ServiceStation
             #region #6 register localApiService to ServiceCenter
             //if (0 < localApiMng.apiCount)
             {
-                Logger.Info("[ServiceStation] regist serviceStation to ServiceCenter...");
+                Logger.Info("[ServiceStation] register serviceStation to ServiceCenter...");
 
                 var serviceStationData = new
                 {
@@ -298,7 +298,7 @@ namespace Sers.ServiceStation
 
                 if (true == Appsettings.json.GetByPath<bool?>("Sers.ServiceStation.StationRegist_PrintRegistArg"))
                 {
-                    Logger.Info("[ServiceStation] regist - arg:" + serviceStationData);
+                    Logger.Info("[ServiceStation] register - arg:" + serviceStationData);
                 }
 
 
@@ -311,7 +311,7 @@ namespace Sers.ServiceStation
 
                         if (ret?.success != true)
                         {
-                            Logger.Error("[ServiceStation] regist - failed", ret);
+                            Logger.Error("[ServiceStation] register - failed", ret);
                             return false;
                         }
                     }
@@ -322,7 +322,7 @@ namespace Sers.ServiceStation
                     {
                         try
                         {
-                            // ##1 calculate DeviceUnqueKey and ServiceStationUniqueKey
+                            // ##1 calculate DeviceUniqueKey and ServiceStationUniqueKey
                             SersApplication.CalculateUniquekey();
 
                             // ##2 get arguments
@@ -330,12 +330,12 @@ namespace Sers.ServiceStation
                             {
                                 serviceStationInfo = SersApplication.serviceStationInfo,
                                 deviceInfo = SersApplication.deviceInfo
-                            }.Serialize();
+                            };
 
                             // ##3 call api to update station info
                             foreach (var apiClient in ApiClient.Instances)
                             {
-                                ApiReturn ret = apiClient.CallApi<ApiReturn>("/_sys_/serviceStation/updateStationInfo", strServiceStationData);
+                                ApiReturn ret = apiClient.CallApi<ApiReturn>(route: "/_sys_/serviceStation/updateStationInfo", arg: strServiceStationData);
 
                                 if (ret?.success != true)
                                 {
@@ -353,11 +353,11 @@ namespace Sers.ServiceStation
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error("[ServiceStation] regist - failed", ex);
+                    Logger.Error("[ServiceStation] register - failed", ex);
                     return false;
                 }
 
-                Logger.Info("[ServiceStation] regist - succeed");
+                Logger.Info("[ServiceStation] register - succeed");
 
             }
             #endregion

dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Extensions/Object_Convert_Extensions.cs

@@ -16,7 +16,11 @@ namespace Vit.Extensions.Json_Extensions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static object ConvertBySerialize(this object value, Type type)
         {
-            return Json.Deserialize(Json.Serialize(value), type);
+            string str;
+            if (value is string strValue) str = strValue;
+            else str = Json.Serialize(value);
+
+            return Json.Deserialize(str, type);
         }
 
         /// <summary>
@@ -28,7 +32,11 @@ namespace Vit.Extensions.Json_Extensions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static TTarget ConvertBySerialize<TTarget>(this object value)
         {
-            return Json.Deserialize<TTarget>(Json.Serialize(value));
+            string str;
+            if (value is string strValue) str = strValue;
+            else str = Json.Serialize(value);
+
+            return Json.Deserialize<TTarget>(str);
         }
 
 

dotnet/ServiceCenter/App.Gover.Gateway/wwwroot/_gover_/ServiceStation.html

@@ -143,7 +143,7 @@
                                 </tr>
                                 <tr>
                                     <td> stationVersion </td>
-                                    <td> : {{ ((station.serviceStationInfo||{}).stationVersion||'').substr(0,20) }} </td>
+                                    <td> : <font :title="(station.serviceStationInfo||{}).stationVersion">{{ ((station.serviceStationInfo||{}).stationVersion||'').substr(0,20) }} </font></td>
                                 </tr>
                                 <tr>
                                     <td> startTime </td>

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/ServiceCenter.cs

@@ -22,6 +22,7 @@ using System.Runtime.CompilerServices;
 using Vit.Extensions.Newtonsoft_Extensions;
 using Vit.Extensions.Json_Extensions;
 using Vit.Extensions.Object_Serialize_Extensions;
+using Vit.Core.Module.Serialization;
 
 namespace Sers.ServiceCenter
 {
@@ -286,7 +287,7 @@ namespace Sers.ServiceCenter
                             deviceInfo = SersApplication.deviceInfo
                         }.Serialize();
 
-                        serviceStation = strServiceStationData.ConvertBySerialize<ServiceStation>();
+                        serviceStation = Json.Deserialize<ServiceStation>(strServiceStationData);
                         serviceStation.connection = connForLocalStationService;
 
                         //(x.x.x.3)调用api