From 44e761a2d8f87ab595bf76b7b3615c126e5cac85 Mon Sep 17 00:00:00 2001
From: zhangxiaofeng <zhangxiaofengzhangxiaofeng@myshipping.net>
Date: Mon, 9 Oct 2023 16:46:24 +0800
Subject: [PATCH] =?UTF-8?q?ISF=E5=A2=9E=E5=8A=A0=E8=B4=AD=E4=B9=B0Bond?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=81=E8=A1=A5=E5=85=85=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=AE=81=E6=B3=A2=E6=8E=A5=E5=8F=A3=E6=89=80=E9=9C=80=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/Djy.Common/Common.xml                     | 42 ++++++++++-
 web/Djy.Common/Tools/EnumTools.cs             |  8 +-
 web/djy.IService/Djy/IFinanceService.cs       |  2 +-
 web/djy.Model/Isf/ISF_Master.cs               | 10 ++-
 web/djy.Model/IsfDto/ISFDto.cs                |  9 ++-
 web/djy.Model/IsfDto/IsfInfo.cs               | 20 ++++-
 web/djy.Service/DjyService/FinanceService.cs  | 10 +--
 web/djy.Service/ISF/IsfService.cs             | 68 +++++++++++++----
 web/djy.WebApi/appsettings.Staging.json       | 74 +++++++++++++++++++
 web/djy.WebApi/appsettings.json               | 23 +++---
 .../FolderProfile1.pubxml.user                | 11 ---
 ...file1.pubxml => 本地-windows-x64.pubxml} |  3 +-
 .../本地-windows-x64.pubxml.user            | 11 +++
 web/djy_IsfApi/appsettings.Staging.json       | 71 ++++++++++++++++++
 web/djy_IsfApi/appsettings.json               | 32 ++++----
 web/djy_IsfApi/djy_IsfApi.csproj.user         |  2 +-
 16 files changed, 322 insertions(+), 74 deletions(-)
 create mode 100644 web/djy.WebApi/appsettings.Staging.json
 delete mode 100644 web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
 rename web/djy_IsfApi/Properties/PublishProfiles/{FolderProfile1.pubxml => 本地-windows-x64.pubxml} (89%)
 create mode 100644 web/djy_IsfApi/Properties/PublishProfiles/本地-windows-x64.pubxml.user
 create mode 100644 web/djy_IsfApi/appsettings.Staging.json

diff --git a/web/Djy.Common/Common.xml b/web/Djy.Common/Common.xml
index 19fb1a1..f403217 100644
--- a/web/Djy.Common/Common.xml
+++ b/web/Djy.Common/Common.xml
@@ -96,6 +96,26 @@
             <param name="TokenKeyName"></param>
             <returns></returns>
         </member>
+        <member name="T:Common.Const.BusinessType">
+            <summary>
+            大简云扣费项目代码常量
+            </summary>
+        </member>
+        <member name="F:Common.Const.BusinessType.AMS_REPORT">
+            <summary>
+            AMS申报项目代码；名称为“AMS申报”
+            </summary>
+        </member>
+        <member name="F:Common.Const.BusinessType.ISF_REPORT">
+            <summary>
+            ISF申报代码；名称为“ISF申报”
+            </summary>
+        </member>
+        <member name="F:Common.Const.BusinessType.ISF_BOUND">
+            <summary>
+            ISF-bond使用费代码；名称为“ISF-bond使用费”
+            </summary>
+        </member>
         <member name="T:Common.Const.FlowInstanceStatus">
             <summary>
             流程状态
@@ -817,7 +837,7 @@
         </member>
         <member name="P:Common.DJYModel.CustFee.BSTYPE">
             <summary>
-            业务类型
+            业务类型 见<see cref="T:Common.Const.BusinessType"/>
             </summary>
         </member>
         <member name="P:Common.DJYModel.CustFee.COMID">
@@ -870,6 +890,11 @@
             是否可以信用支付 1 可以  0不允许  1的时候钱包金额不足可以负数
             </summary>
         </member>
+        <member name="M:Common.DJYModel.CustFee.Clone">
+            <summary>
+            创建当前对象的浅表副本
+            </summary>
+        </member>
         <member name="M:Common.DJYModel.CustFee.GetCtnrcount">
             <summary>
             根据CtnrInfo计算箱量
@@ -5138,6 +5163,21 @@
             该URL已经失效
             </summary>
         </member>
+        <member name="T:Common.Tools.BondOwnTypeEnum">
+            <summary>
+            Bond的使用类型
+            </summary>
+        </member>
+        <member name="F:Common.Tools.BondOwnTypeEnum.OWN">
+            <summary>
+            使用自有Bond
+            </summary>
+        </member>
+        <member name="F:Common.Tools.BondOwnTypeEnum.CargoEDI">
+            <summary>
+            使用CargoEDI的Bond
+            </summary>
+        </member>
         <member name="T:Common.Tools.PostFileListEntity">
             <summary>
             上传文件实体
diff --git a/web/Djy.Common/Tools/EnumTools.cs b/web/Djy.Common/Tools/EnumTools.cs
index 9258f6f..7c092fa 100644
--- a/web/Djy.Common/Tools/EnumTools.cs
+++ b/web/Djy.Common/Tools/EnumTools.cs
@@ -172,13 +172,7 @@ namespace Common.Tools
         /// 使用CargoEDI的Bond
         /// </summary>
         [EnumText("使用CargoEDI的Bond")]
-        CargoEDI = 2,
-
-        /// <summary>
-        /// 使用大简云的Bond
-        /// </summary>
-        [EnumText("使用大简云的Bond")]
-        DJY = 3
+        CargoEDI = 2
     }
 
 }
diff --git a/web/djy.IService/Djy/IFinanceService.cs b/web/djy.IService/Djy/IFinanceService.cs
index 1149435..15deded 100644
--- a/web/djy.IService/Djy/IFinanceService.cs
+++ b/web/djy.IService/Djy/IFinanceService.cs
@@ -20,7 +20,7 @@ namespace djy.IService.Djy
         /// </summary>
         /// <param name="Dto"></param>
         /// <param name="ExpType">1判断钱包并执行扣款生成记录 2 验证钱包金额是否充足</param>
-        /// <param name="bondOwnType">bond是否自有；值是：1或者2或者3；1表示“自有BOND”，2表示“使用CargoEDI的BOND”，3表示“使用大简云的Bond”；当值为3时，需要额外扣除ISF-Bond使用费</param>
+        /// <param name="bondOwnType">bond是否自有；值是：1或者2；1表示“自有BOND”，2表示“使用CargoEDI的BOND”；当值为2时，需要额外扣除ISF-Bond使用费</param>
         /// <returns></returns>
         public ReturnResult<object> Expend(CustFee Dto, int ExpType, BondOwnTypeEnum? bondOwnType);
  
diff --git a/web/djy.Model/Isf/ISF_Master.cs b/web/djy.Model/Isf/ISF_Master.cs
index d2927b9..ca2e646 100644
--- a/web/djy.Model/Isf/ISF_Master.cs
+++ b/web/djy.Model/Isf/ISF_Master.cs
@@ -30,6 +30,12 @@ namespace djy.Model.Isf
         [MaxLength(50)]
         public string MBLNO { get; set; }
 
+        /// <summary>
+        /// 船东提单号
+        /// </summary>
+        [MaxLength(100)]
+        public string ShipMasterBillNo { get; set; }
+
         /// <summary>
         /// 类型(1.ISF5 2.ISF10)
         /// </summary>
@@ -105,8 +111,8 @@ namespace djy.Model.Isf
         public string NewNotice { get; set; }
         /// <summary>
         /// bond是否自有；<see cref="InFoType"/> =2（ISF10）时，需提供；
-        /// <br>值是：1或者2或者3；</br>
-        /// <br>1表示“自有BOND”，2表示“使用CargoEDI的BOND”，3表示“使用大简云的Bond”</br>
+        /// <br>值是：1或者2</br>
+        /// <br>1表示“自有BOND”，2表示“使用CargoEDI的BOND”</br>
         /// </summary>
         [MaxLength(20)]
         public string BondOwnCode { get; set; }
diff --git a/web/djy.Model/IsfDto/ISFDto.cs b/web/djy.Model/IsfDto/ISFDto.cs
index 41062cd..c07fec8 100644
--- a/web/djy.Model/IsfDto/ISFDto.cs
+++ b/web/djy.Model/IsfDto/ISFDto.cs
@@ -33,6 +33,11 @@ namespace djy.Model.IsfDto
         /// </summary>
         public string MBLNO { get; set; }
 
+        /// <summary>
+        /// 船东提单号
+        /// </summary>
+        public string ShipMasterBillNo { get; set; }
+
         /// <summary>
         /// 类型(1.ISF5 2.ISF10)
         /// </summary>
@@ -101,8 +106,8 @@ namespace djy.Model.IsfDto
 
         /// <summary>
         /// bond是否自有；<see cref="InFoType"/> =2（ISF10）时，需提供；
-        /// <br>值是：1或者2或者3；</br>
-        /// <br>1表示“自有BOND”，2表示“使用CargoEDI的BOND”，3表示“使用大简云的Bond”</br>
+        /// <br>值是：1或者2；</br>
+        /// <br>1表示“自有BOND”，2表示“使用CargoEDI的BOND”</br>
         /// </summary>
         public string BondOwnCode { get; set; }
 
diff --git a/web/djy.Model/IsfDto/IsfInfo.cs b/web/djy.Model/IsfDto/IsfInfo.cs
index 717c304..8af117f 100644
--- a/web/djy.Model/IsfDto/IsfInfo.cs
+++ b/web/djy.Model/IsfDto/IsfInfo.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -47,6 +48,23 @@ namespace djy.Model.IsfDto
         /// 贸易类型代码
         /// </summary>
         public string shipmentTypeCode { get; set; }
+
+        /// <summary>
+        /// bond是否自有,infoType=2时（ISF10），需要提供，如果没提供，默认1；值是：1或者2；1表示“自有BOND”，2表示“使用CargoEDI的BOND”
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string bondOwnCode { get; set; }
+
+        /// <summary>
+        /// bond类型  infoType=2时（ISF10），需要提供，如果没提供，默认01；值是：01或者02或者03或者04或者16；01=ABI Entry - Importer or Broker；02=Custodian of Bonded Merchandise；03=AMS C-3 Bond / International Carrier；04=Foreign Trade Zone Operator；16=ISF Bond
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string bondTypeCode { get; set; }
+
+        /// <summary>
+        /// 船东提单号
+        /// </summary>
+        public string shipMasterBillNo { get; set; }
     }
     public class CompanyList
     {
diff --git a/web/djy.Service/DjyService/FinanceService.cs b/web/djy.Service/DjyService/FinanceService.cs
index fa9aa70..fa2219d 100644
--- a/web/djy.Service/DjyService/FinanceService.cs
+++ b/web/djy.Service/DjyService/FinanceService.cs
@@ -21,7 +21,7 @@ namespace djy.Service.DjyService
         /// </summary>
         /// <param name="Dto"></param>
         /// <param name="exptype">1验证是否可以扣款 2扣除操作 </param>
-        /// <param name="bondOwnType">bond是否自有；值是：1或者2或者3；1表示“自有BOND”，2表示“使用CargoEDI的BOND”，3表示“使用大简云的Bond”；当值为3时，需要额外扣除ISF-Bond使用费</param>
+        /// <param name="bondOwnType">bond是否自有；值是：1或者2；1表示“自有BOND”，2表示“使用CargoEDI的BOND”；当值为2时，需要额外扣除ISF-Bond使用费</param>
         /// <returns></returns>
         public ReturnResult<object> Expend(CustFee Dto, int exptype, BondOwnTypeEnum? bondOwnType = null)
         {
@@ -109,8 +109,8 @@ namespace djy.Service.DjyService
                 Dto.PRICE = price_report = (decimal)cp1.PRICE;
                 price_total += price_report;
 
-                // 如果使用大简云Bond，则获取 BOND使用费单价 的计费规则
-                if (bondOwnType == BondOwnTypeEnum.DJY)
+                // 如果使用CargoEDI的Bond，则获取 BOND使用费单价 的计费规则
+                if (bondOwnType == BondOwnTypeEnum.CargoEDI)
                 {
                     CustPrice cp2 = DbBus.Get(DbList.djydb).Select<CustPrice>().Where(w => w.BSTYPE == BusinessType.ISF_BOUND && w.SENDTYPE == 0 && w.COMID == Dto.COMID).ToOne();
                     if (cp2 == null)
@@ -164,8 +164,8 @@ namespace djy.Service.DjyService
                             throw new Exception("消费记录写入失败！");
                         }
 
-                        // 如果使用大简云Bond，增加ISF-bond使用费流水
-                        if (bondOwnType == BondOwnTypeEnum.DJY)
+                        // 如果使用CargoEDI的Bond，增加ISF-bond使用费流水
+                        if (bondOwnType == BondOwnTypeEnum.CargoEDI)
                         {
                             // 克隆
                             CustFee custFeeBond = (CustFee)Dto.Clone();
diff --git a/web/djy.Service/ISF/IsfService.cs b/web/djy.Service/ISF/IsfService.cs
index f4c2a3d..fa8df32 100644
--- a/web/djy.Service/ISF/IsfService.cs
+++ b/web/djy.Service/ISF/IsfService.cs
@@ -7,19 +7,25 @@ using djy.Model.Ams;
 using djy.Model.Isf;
 using djy.Model.IsfDto;
 using djy.Service.DjyService;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace djy.Service.Isf
 {
     public class IsfService : ServBase, IIsfService
     {
+        private readonly IWebHostEnvironment env;
 
+        public IsfService(IWebHostEnvironment env)
+        {
+            this.env = env;
+        }
         #region   查询接口
         public TableData Load(ISFQuery req, User user, UserAuthorityDto aut)
         {
@@ -151,6 +157,7 @@ namespace djy.Service.Isf
 
                     ISF_Master master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => x.GID == dto.GID).ToOne();
                     master.MBLNO = dto.MBLNO;
+                    master.ShipMasterBillNo = dto.ShipMasterBillNo;
                     master.InFoType = dto.InFoType;
                     master.DischargeHarbourCode = dto.DischargeHarbourCode;
                     master.DischargeHarbourName = dto.DischargeHarbourName;
@@ -350,14 +357,15 @@ namespace djy.Service.Isf
                                 return req;
                             }
 
+                            BondOwnTypeEnum? bondOwnType = master.BondOwnCode switch
+                            {
+                                "1" => BondOwnTypeEnum.OWN,
+                                "2" => BondOwnTypeEnum.CargoEDI,
+                                _ => null
+                            };
 
                             if (msgType == "1" || msgType == "4")
                             {
-                                BondOwnTypeEnum? bondOwnType = master.BondOwnCode switch
-                                {
-                                    "3" => BondOwnTypeEnum.DJY,
-                                    _ => null
-                                };
                                 ///扣费接口
                                 var getfinrs = fin.Expend(new CustFee
                                 {
@@ -382,6 +390,7 @@ namespace djy.Service.Isf
                             var CodePortLoadList = DbBus.Get(DbList.Common).Select<CodePortLoad>().ToList();
                             Info info = new Info();
                             info.masterBillNo = master.MBLNO;
+                            info.shipMasterBillNo = master.ShipMasterBillNo;
                             info.infoType = master.InFoType;
                             info.dischargeHarbourCode = portList.Where(x => x.Code == master.DischargeHarbourCode).Select(x => x.EdiCode).FirstOrDefault();
                             info.deliveryHarbourCode = portList.Where(x => x.Code == master.DeliveryHarbourCode).Select(x => x.EdiCode).FirstOrDefault();
@@ -390,6 +399,13 @@ namespace djy.Service.Isf
                             info.blTypeCode = master.BlTypeCode;
                             info.refId = master.GID;
 
+                            // 只在ISF-10，且使用CargoEDI的BOND时，才传bondOwnCode、bondTypeCode
+                            if (master.InFoType == "2" && bondOwnType == BondOwnTypeEnum.CargoEDI)
+                            {
+                                info.bondOwnCode = "2";
+                                info.bondTypeCode = "03";
+                            }
+
                             List<CompanyList> companyList = new List<CompanyList>();
                             foreach (var item in comlist)
                             {
@@ -440,11 +456,21 @@ namespace djy.Service.Isf
                             dic.Add("timestamp", timestamp);
                             dic.Add("version", "1.0");
                             dic.Add("data", json.ToUrlEncodeString());
-                            gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded);
-                            
-                            //var gethtmlTestObj = new { code = "T", msg = "成功", data = new { code = "1", msg = "成功" } };
-                            //gethtml = JsonConvert.SerializeObject(gethtmlTestObj);
 
+                            //测试用
+                            //if (env.IsDevelopment() || env.IsStaging())
+                            //{
+                            //    var gethtmlTestObj = new { code = "T", msg = "成功", data = new { code = "1", msg = "成功" } };
+                            //    gethtml = JsonConvert.SerializeObject(gethtmlTestObj);
+                            //    _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}（当前所处环境为开发或测试环境，直接返回成功）");
+                            //}
+                            //else
+                            //{
+                            //    gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded);
+                            //    _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}");
+                            //}
+
+                            gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded);
                             _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}");
 
                         }
@@ -467,12 +493,23 @@ namespace djy.Service.Isf
                             dic.Add("timestamp", timestamp);
                             dic.Add("version", "1.0");
                             dic.Add("refId", oid);
-                            gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded);
-                            
-                            //var gethtmlTestObj = new { code = "T", msg = "成功", data = new { code = "1", msg = "成功" } };
-                            //gethtml = JsonConvert.SerializeObject(gethtmlTestObj);
 
+                            //测试用
+                            //if (env.IsDevelopment() || env.IsStaging())
+                            //{
+                            //    var gethtmlTestObj = new { code = "T", msg = "成功", data = new { code = "1", msg = "成功" } };
+                            //    gethtml = JsonConvert.SerializeObject(gethtmlTestObj);
+                            //    _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}（当前所处环境为开发或测试环境，直接返回成功）");
+                            //}
+                            //else
+                            //{
+                            //    gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded);
+                            //    _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}");
+                            //}
+
+                            gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded);
                             _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}");
+
                         }
                         if (gethtml != null)
                         {
@@ -593,7 +630,8 @@ namespace djy.Service.Isf
                                 {
                                     BondOwnTypeEnum? bondOwnType = master.BondOwnCode switch
                                     {
-                                        "3" => BondOwnTypeEnum.DJY,
+                                        "1" => BondOwnTypeEnum.OWN,
+                                        "2" => BondOwnTypeEnum.CargoEDI,
                                         _ => null
                                     };
                                     var getfinrs = fin.Expend(new CustFee
diff --git a/web/djy.WebApi/appsettings.Staging.json b/web/djy.WebApi/appsettings.Staging.json
new file mode 100644
index 0000000..a7a0761
--- /dev/null
+++ b/web/djy.WebApi/appsettings.Staging.json
@@ -0,0 +1,74 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "Urls": "http://*:30816",
+  "WebConfig": {
+    "IdentServerUrl": "http://60.209.125.238:40501",
+    "WebId": 234,
+    "Area": "山东省|青岛市|市南区",
+    "DesKey": "2Fv6I7oV6AlCFEbN",
+    "jwt_Audience": "admin",
+    "jwt_Issuer": "shuosoft",
+    "jwt_Secretkey": "IBFoxBpwAW2rSDIsYiHJL5aZ3Rpr5Uaph4t6Eqm2Fv6I7oV6AlCFEbNWRXyJT653iOFIbWOcOF3sMRSSUelRSbIL6RzOCOfIk3hhxyn9Aj4HxEE08zqlRloA0CWX7MQ0",
+    "jwt_Expiration": 1440,
+    "StrFilte": "肏,妈妈,操你妈,草泥马,屌,傻逼,骚逼,王八蛋,你妈的,+,=,-,_,/,*,&,@,.,,,*",
+    "ShopPower": 1,
+    "ConnName": "sqldb",
+    "cache_time": 10,
+    "WebHostUrl": "http://192.168.1.83:30816",
+    "Redis": "192.168.1.83:6379,password=,defaultDatabase=4",
+    "RedisDb": 4,
+    "Rbmq_Host": "",
+    "Rbmq_UserName": "admin",
+    "Rbmq_Password": "admin",
+    "Rbmq_Sqlhost": "Data Source =192.168.1.83; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true",
+    "DapperDbString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;",
+    "requesterDea": "nbforwarder",
+    "DataConnList": [
+
+      {
+        "SysKey": "AMS",
+        "TitleName": "AMS",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+      },
+      {
+        "SysKey": "Common",
+        "TitleName": "Common",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+      },
+      {
+        "SysKey": "djydb",
+        "TitleName": "pingtai",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+
+      },
+      {
+        "SysKey": "logsdb",
+        "TitleName": "日志库",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+
+      }
+
+
+
+    ]
+  }
+}
diff --git a/web/djy.WebApi/appsettings.json b/web/djy.WebApi/appsettings.json
index a7a0761..cb6c8e2 100644
--- a/web/djy.WebApi/appsettings.json
+++ b/web/djy.WebApi/appsettings.json
@@ -7,9 +7,8 @@
     }
   },
   "AllowedHosts": "*",
-  "Urls": "http://*:30816",
   "WebConfig": {
-    "IdentServerUrl": "http://60.209.125.238:40501",
+    "IdentServerUrl": "http://djy-identity.myshipping.net",
     "WebId": 234,
     "Area": "山东省|青岛市|市南区",
     "DesKey": "2Fv6I7oV6AlCFEbN",
@@ -21,14 +20,14 @@
     "ShopPower": 1,
     "ConnName": "sqldb",
     "cache_time": 10,
-    "WebHostUrl": "http://192.168.1.83:30816",
-    "Redis": "192.168.1.83:6379,password=,defaultDatabase=4",
-    "RedisDb": 4,
-    "Rbmq_Host": "",
+    "WebHostUrl": "https://zh-userapi.jingyiji.net",
+    "Redis": "172.1.0.2:6379",
+    "RedisDb": 0,
+    "Rbmq_Host": "172.1.0.3:5672",
     "Rbmq_UserName": "admin",
     "Rbmq_Password": "admin",
-    "Rbmq_Sqlhost": "Data Source =192.168.1.83; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true",
-    "DapperDbString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;",
+    "Rbmq_Sqlhost": "Data Source =172.31.85.154; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true",
+    "DapperDbString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;",
     "requesterDea": "nbforwarder",
     "DataConnList": [
 
@@ -38,7 +37,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
       },
       {
         "SysKey": "Common",
@@ -46,7 +45,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
       },
       {
         "SysKey": "djydb",
@@ -54,7 +53,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true"
 
       },
       {
@@ -63,7 +62,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =172.31.85.154,1433; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true"
 
       }
 
diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
deleted file mode 100644
index 78c204b..0000000
--- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
-自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
--->
-<Project>
-  <PropertyGroup>
-    <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
-    <History>True|2023-01-09T00:52:52.3747129Z;True|2023-01-06T18:11:59.7446279+08:00;True|2023-01-06T17:09:56.9087259+08:00;True|2022-10-11T17:38:16.7996816+08:00;True|2022-09-29T09:19:00.7683602+08:00;True|2022-09-29T09:13:52.5346287+08:00;True|2022-09-28T17:20:00.5132329+08:00;True|2022-09-28T17:12:55.5194328+08:00;True|2022-09-28T17:08:40.9334943+08:00;True|2022-09-28T17:05:05.8696515+08:00;True|2022-09-28T16:31:42.3084773+08:00;True|2022-09-28T09:20:15.3600913+08:00;True|2022-08-31T11:05:06.8122818+08:00;True|2022-08-23T14:37:55.9777827+08:00;True|2022-08-22T15:49:27.7983465+08:00;</History>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml b/web/djy_IsfApi/Properties/PublishProfiles/本地-windows-x64.pubxml
similarity index 89%
rename from web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml
rename to web/djy_IsfApi/Properties/PublishProfiles/本地-windows-x64.pubxml
index 700eacd..2cffa89 100644
--- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/web/djy_IsfApi/Properties/PublishProfiles/本地-windows-x64.pubxml
@@ -12,9 +12,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProvider>FileSystem</PublishProvider>
     <PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
+    <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net5.0</TargetFramework>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <ProjectGuid>b9b3283e-fa06-4b06-88f1-5680ac4e5f26</ProjectGuid>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
diff --git a/web/djy_IsfApi/Properties/PublishProfiles/本地-windows-x64.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/本地-windows-x64.pubxml.user
new file mode 100644
index 0000000..7e8eb49
--- /dev/null
+++ b/web/djy_IsfApi/Properties/PublishProfiles/本地-windows-x64.pubxml.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <_PublishTargetUrl>E:\zxf\git\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
+    <History>True|2023-10-08T10:04:56.3126569Z;True|2023-10-08T14:57:53.1562034+08:00;True|2023-10-08T13:32:51.7304482+08:00;True|2023-10-07T15:41:18.6075920+08:00;True|2023-10-07T13:59:10.9233502+08:00;True|2023-10-07T13:58:25.1248073+08:00;False|2023-10-07T13:56:18.6324703+08:00;</History>
+    <LastFailureDetails />
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/web/djy_IsfApi/appsettings.Staging.json b/web/djy_IsfApi/appsettings.Staging.json
new file mode 100644
index 0000000..a02ba4b
--- /dev/null
+++ b/web/djy_IsfApi/appsettings.Staging.json
@@ -0,0 +1,71 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "Urls": "http://*:30817",
+  "WebConfig": {
+    "IdentServerUrl": "http://60.209.125.238:40501",
+    "WebId": 234,
+    "Area": "山东省|青岛市|市南区",
+    "DesKey": "2Fv6I7oV6AlCFEbN",
+    "jwt_Audience": "admin",
+    "jwt_Issuer": "shuosoft",
+    "jwt_Secretkey": "IBFoxBpwAW2rSDIsYiHJL5aZ3Rpr5Uaph4t6Eqm2Fv6I7oV6AlCFEbNWRXyJT653iOFIbWOcOF3sMRSSUelRSbIL6RzOCOfIk3hhxyn9Aj4HxEE08zqlRloA0CWX7MQ0",
+    "jwt_Expiration": 1440,
+    "StrFilte": "肏,妈妈,操你妈,草泥马,屌,傻逼,骚逼,王八蛋,你妈的,+,=,-,_,/,*,&,@,.,,,*",
+    "ShopPower": 1,
+    "ConnName": "sqldb",
+    "cache_time": 10,
+    "WebHostUrl": "http://192.168.1.83:30817",
+    "Redis": "192.168.1.83:6379,password=,defaultDatabase=3",
+    "RedisDb": 3,
+    "Rbmq_Host": "",
+    "Rbmq_UserName": "admin",
+    "Rbmq_Password": "admin",
+    "Rbmq_Sqlhost": "Data Source =192.168.1.83; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true",
+    "DapperDbString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;",
+    "requesterDea": "nbforwarder",
+    "DataConnList": [
+
+      {
+        "SysKey": "AMS",
+        "TitleName": "AMS",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+      },
+      {
+        "SysKey": "Common",
+        "TitleName": "Common",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+      },
+      {
+        "SysKey": "djydb",
+        "TitleName": "pingtai",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+
+      },
+      {
+        "SysKey": "logsdb",
+        "TitleName": "日志库",
+        "Index": 100,
+        "DataType": 1,
+        "Status": 0,
+        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+
+      }
+    ]
+  }
+}
diff --git a/web/djy_IsfApi/appsettings.json b/web/djy_IsfApi/appsettings.json
index a02ba4b..c074c31 100644
--- a/web/djy_IsfApi/appsettings.json
+++ b/web/djy_IsfApi/appsettings.json
@@ -7,28 +7,27 @@
     }
   },
   "AllowedHosts": "*",
-  "Urls": "http://*:30817",
   "WebConfig": {
-    "IdentServerUrl": "http://60.209.125.238:40501",
+    "IdentServerUrl": "http://djy-identity.myshipping.net",
     "WebId": 234,
-    "Area": "山东省|青岛市|市南区",
+    "Area": "ɽ��ʡ|�ൺ��|������",
     "DesKey": "2Fv6I7oV6AlCFEbN",
     "jwt_Audience": "admin",
     "jwt_Issuer": "shuosoft",
     "jwt_Secretkey": "IBFoxBpwAW2rSDIsYiHJL5aZ3Rpr5Uaph4t6Eqm2Fv6I7oV6AlCFEbNWRXyJT653iOFIbWOcOF3sMRSSUelRSbIL6RzOCOfIk3hhxyn9Aj4HxEE08zqlRloA0CWX7MQ0",
     "jwt_Expiration": 1440,
-    "StrFilte": "肏,妈妈,操你妈,草泥马,屌,傻逼,骚逼,王八蛋,你妈的,+,=,-,_,/,*,&,@,.,,,*",
+    "StrFilte": "�H,����,������,������,��,ɵ��,ɧ��,���˵�,�����,+,=,-,_,/,*,&,@,.,,,*",
     "ShopPower": 1,
     "ConnName": "sqldb",
     "cache_time": 10,
-    "WebHostUrl": "http://192.168.1.83:30817",
-    "Redis": "192.168.1.83:6379,password=,defaultDatabase=3",
-    "RedisDb": 3,
-    "Rbmq_Host": "",
+    "WebHostUrl": "https://zh-userapi.jingyiji.net",
+    "Redis": "172.1.0.2:6379",
+    "RedisDb": 0,
+    "Rbmq_Host": "172.1.0.3:5672",
     "Rbmq_UserName": "admin",
     "Rbmq_Password": "admin",
-    "Rbmq_Sqlhost": "Data Source =192.168.1.83; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true",
-    "DapperDbString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;",
+    "Rbmq_Sqlhost": "Data Source =172.31.85.154; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true",
+    "DapperDbString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;",
     "requesterDea": "nbforwarder",
     "DataConnList": [
 
@@ -38,7 +37,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
       },
       {
         "SysKey": "Common",
@@ -46,7 +45,7 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;"
+        "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
       },
       {
         "SysKey": "djydb",
@@ -54,18 +53,21 @@
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true"
 
       },
       {
         "SysKey": "logsdb",
-        "TitleName": "日志库",
+        "TitleName": "��־��",
         "Index": 100,
         "DataType": 1,
         "Status": 0,
-        "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true"
+        "ConnString": "Data Source =172.31.85.154,1433; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true"
 
       }
+
+
+
     ]
   }
 }
diff --git a/web/djy_IsfApi/djy_IsfApi.csproj.user b/web/djy_IsfApi/djy_IsfApi.csproj.user
index ebba816..0c764e8 100644
--- a/web/djy_IsfApi/djy_IsfApi.csproj.user
+++ b/web/djy_IsfApi/djy_IsfApi.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\DjyDoc\git\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <ActiveDebugProfile>NetCore</ActiveDebugProfile>