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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -846,6 +846,7 @@ namespace Myshipping.Application
 
                 var mlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == input.Id).FirstAsync();
                 var rightlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder, true);
+                _logger.LogInformation("保存权限范围："+rightlist.ToJsonString());
                 if (!(
                     mlist.OPID == UserManager.UserId.ToString() || mlist.OP == UserManager.Name.ToString() ||
                     mlist.DOCID == UserManager.UserId.ToString() || mlist.DOC == UserManager.Name.ToString() ||
@@ -9085,13 +9086,15 @@ HLCUTA12307DPXJ3 以这票为例   6个柜
         public async Task<dynamic> SaveBookingTxxp(long Id)
         {
             //获取url
-            var url = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "bookingTxxpUrl").Select(x => x.Value).FirstOrDefault();
+            var url = _cache.GetAllDictData().Result.Where(x => x.Code == "bookingTxxpUrl").Select(x => x.Value).FirstOrDefault();
+            _logger.LogInformation("提箱小票CMAurl:" + url);
             //亿通账号
             var ytAcc = _webAccountConfig.GetAccountConfig("CmaWeb", UserManager.UserId).Result;
             if (ytAcc == null)
             {
                 throw Oops.Bah(BookingErrorCode.BOOK119);
             }
+            _logger.LogInformation("提箱小票CMA:" + ytAcc.ToJsonString());
             var order = _rep.FirstOrDefault(x => x.Id == Id);
             //条件判断 目前只支持CMA 的数据
             if (order.CARRIERID != "CMA")
@@ -9114,7 +9117,7 @@ HLCUTA12307DPXJ3 以这票为例   6个柜
                 password = ytAcc.Password,
                 company = "CMA",
                 vessel = order.VESSEL
-            }.ToJsonString();
+            };
             BookingExtendState extends = new BookingExtendState();
             var rtn = await url.SetBody(json).PostAsStringAsync();
             JObject jobjRtn = JObject.Parse(rtn);

Myshipping.Application/Service/BookingOrderSF/BookingOrderSFService.cs

@@ -403,7 +403,7 @@ namespace Myshipping.Application
             if (jobj.GetStringValue("apiResultCode") == "A1000")
             {
                 rt = jobj.GetStringValue("accessToken");
-                await _cache.SetTimeoutAsync($"SFToken{UserManager.TENANT_ID}", rt, TimeSpan.FromHours(3));
+                await _cache.SetTimeoutAsync($"SFToken{UserManager.TENANT_ID}", rt, TimeSpan.FromHours(2));
             }
             else
             {

Myshipping.Web.Core/applicationconfig.json

@@ -55,7 +55,7 @@
   },
   "Cache": {
     "CacheType": "RedisCache", // RedisCache
-    "RedisConnectionString": "192.168.0.80:6379,password=,defaultDatabase=11"
+    "RedisConnectionString": "192.168.1.80:6379,password=,defaultDatabase=11"
   },
   "SnowId": {
     "WorkerId": "1" // 取值范围0~63,默认1