Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Core/Service/Cache/SysCacheService.cs

@@ -434,7 +434,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeCarrier(List<CodeCarrier> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CARRIER, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CARRIER, list);
     }
 
     /// <summary>
@@ -443,7 +443,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeVessel(List<CodeVessel> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list);
     }
 
     /// <summary>
@@ -452,7 +452,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeForwarder(List<CodeForwarder> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FORWARDER, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FORWARDER, list);
     }
 
     /// <summary>
@@ -461,7 +461,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeYard(List<CodeYard> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_YARD, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_YARD, list);
     }
 
     /// <summary>
@@ -470,7 +470,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodePortLoad(List<CodePortLoad> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORTLOAD, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORTLOAD, list);
     }
 
     /// <summary>
@@ -479,7 +479,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodePort(List<CodePort> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORT, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORT, list);
     }
 
     /// <summary>
@@ -488,7 +488,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodePackage(List<CodePackage> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PACKAGE, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PACKAGE, list);
     }
 
     /// <summary>
@@ -497,7 +497,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeService(List<CodeService> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_SERVICE, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_SERVICE, list);
     }
 
     /// <summary>
@@ -506,7 +506,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeCtn(List<CodeCtn> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CTN, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CTN, list);
     }
 
     /// <summary>
@@ -515,7 +515,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeFrt(List<CodeFrt> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FRT, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FRT, list);
     }
 
     /// <summary>
@@ -524,7 +524,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllMappingCtn(List<MappingCtn> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CTN, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CTN, list);
     }
 
     /// <summary>
@@ -533,7 +533,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllMappingCarrier(List<MappingCarrier> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CARRIER, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CARRIER, list);
     }
 
     /// <summary>
@@ -542,7 +542,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllMappingFrt(List<MappingFrt> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_FRT, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_FRT, list);
     }
 
     /// <summary>
@@ -551,7 +551,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllMappingVessel(List<MappingVessel> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_VESSEL, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_VESSEL, list);
     }
 
     /// <summary>
@@ -560,7 +560,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllMappingYard(List<MappingYard> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_YARD, list, TimeSpan.FromMinutes(5));
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_YARD, list);
     }
 
 

Myshipping.Core/Service/CommonDB/CommonDBService.cs

@@ -20,11 +20,8 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
 
     private readonly SqlSugarRepository<CodeCarrier> _codeCarrierRep;
     private readonly SqlSugarRepository<MappingCarrier> _mappingCarrierRep;
-
     private readonly SqlSugarRepository<CodeVessel> _codeVesselRep;
     private readonly SqlSugarRepository<MappingVessel> _mappingVesselRep;
-
-
     private readonly SqlSugarRepository<CodeForwarder> _codeForwarderRep;
     private readonly SqlSugarRepository<CodeYard> _codeYardRep;
     private readonly SqlSugarRepository<MappingYard> _mappingYardRep;
@@ -34,10 +31,8 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     private readonly SqlSugarRepository<CodeService> _codeServiceRep;
     private readonly SqlSugarRepository<CodeCtn> _codeCtnRep;
     private readonly SqlSugarRepository<MappingCtn> _mappingCtnRep;
-
     private readonly SqlSugarRepository<CodeFrt> _codeFrtRep;
     private readonly SqlSugarRepository<MappingFrt> _mappingFrtRep;
-    
     private readonly ISysCacheService _sysCacheService;
 
     public CommonDBService(SqlSugarRepository<CodeCarrier> codeCarrierRep,
@@ -164,7 +159,6 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         return queryList.ToList();
     }
 
-
     /// <summary>
     /// 新增船名信息
     /// </summary>