diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index 8f11760..3f497b8 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -153,9 +153,7 @@ - - Always - + @@ -172,6 +170,7 @@ + diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 536b7ff..0358b1f 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -137,10 +137,10 @@ namespace AllBase public static int TimeOut = 60; public static int ThreadCount = 3; public static int MainCatId = 0; - /// - /// 用户分组 - /// - public static int GroupId = 0; + /// + /// 用户分组 3主号 4客服 5加盟 8登录 9采购 10加盟 11上货 + /// + public static int GroupId = 0; public static bool DarenYaoyue = false; public static bool DyProductCollect = false; public static bool IsCloudBuyOrder = false; @@ -321,8 +321,11 @@ namespace AllBase /// 子账号所属主账号 /// public static string ParentUserName { get; set; } - //public static bool IsSa; - public static int SaLevel = 0; + //public static bool IsSa; + /// + /// 超管等级 0 普通用户 1 超级管理员 + /// + public static int SaLevel = 0; public static string UserAuthority = ""; public static string ParentAuthority = ""; public static string ForbiddenPage = ""; diff --git a/AllBase/Helper/EnvironmentHelper.cs b/AllBase/Helper/EnvironmentHelper.cs new file mode 100644 index 0000000..7f5dc8e --- /dev/null +++ b/AllBase/Helper/EnvironmentHelper.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AllBase.Helper +{ + public class EnvironmentHelper + { + private static string _currentEnvironment; + + // 获取当前环境 + public static string CurrentEnvironment + { + get + { + if (_currentEnvironment == null) + { + _currentEnvironment = DetermineEnvironment(); + } + return _currentEnvironment; + } + } + public static bool IsTest => CurrentEnvironment.Equals("Test", StringComparison.OrdinalIgnoreCase); + public static bool IsDevelopment => CurrentEnvironment.Equals("Development", StringComparison.OrdinalIgnoreCase); + + public static bool IsProduction => CurrentEnvironment.Equals("Production", StringComparison.OrdinalIgnoreCase); + + private static string DetermineEnvironment() + { +#if RELEASE + // Release 构建：只允许生产环境，不允许其他环境 + return "Production"; +#else + // 1. 检查环境变量 + var envVar = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? + Environment.GetEnvironmentVariable("ENVIRONMENT"); + + if (!string.IsNullOrEmpty(envVar)) + { + return envVar; + } + + + // 检查当前机器名 + string machineName = Environment.MachineName.ToLower(); + if (machineName.Contains("dev") || + machineName.Contains("test")) + { + return machineName.Contains("TEST") ? "Test" : "Development"; + } + + // 4. 默认返回 Production + return "Production"; +#endif + } + + // 获取环境描述 + public static string EnvironmentDescription + { + get + { + if (IsTest) return "测试环境"; + if (IsDevelopment) return "开发环境"; + if (IsProduction) return "生产环境"; + return $"未知环境 ({CurrentEnvironment})"; + } + } + } +} diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index e394b39..e4c1f7b 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -1,2201 +1,70 @@ - - - - - - - - Debug - AnyCPU - {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6} - WinExe - TemuKJD - 29供应链 - v4.6.2 - 512 - true - true - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - AnyCPU - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - false - true - - - AnyCPU - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - - - bag.ico - - - true - ..\bin\ - DEBUG;TRACE - full - x64 - 8.0 - prompt - false - - - ..\bin\ - TRACE - true - pdbonly - x64 - 8.0 - prompt - true - - - - ..\packages\CefSharp.Common.138.0.340\lib\net462\CefSharp.dll - - - ..\packages\CefSharp.Common.138.0.340\lib\net462\CefSharp.Core.dll - - - ..\packages\CefSharp.WinForms.138.0.340\lib\net462\CefSharp.WinForms.dll - - - False - ..\DllReference\DevComponents.DotNetBar2.dll - - - ..\DllReference\FiddlerCore4.dll - - - False - ..\DllReference\NaiBa.CefHelper.138.dll - - - ..\DllReference\NaiBa.Util.dll - - - False - ..\DllReference\NaiBa.Util.Winform.dll - - - False - ..\DllReference\NaiBa.Util.Zip.dll - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll - - - - - - False - ..\DllReference\System.Data.SQLite.DLL - - - - - - - - - - - - - - - - - - - Form - - - BaseTalkForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - ChangeForm.cs - - - - - Form - - - InitForm.cs - - - - Form - - - RandomComProductForm.cs - - - Form - - - PDDAddActivityForm.cs - - - Form - - - ExprotProductForm.cs - - - - Form - - - JstBanPlatformForm.cs - - - Form - - - PDDDBProdNotesManageFrom.cs - - - Form - - - PDDDBProdGroupManageFrom.cs - - - Form - - - WXAdminQualificationImageForm.cs - - - Form - - - WXAdminTransitWarehouseManage.cs - - - Form - - - WXAdminAccountBalanceForm.cs - - - Form - - - WxAdminOemManageForm.cs - - - Form - - - WxAiTalkForm.cs - - - Form - - - WXProdNoCheckEditAddressForm.cs - - - Form - - - WXUserCollectAuthProdEditCatesForm.cs - - - Form - - - WXUserCollectAuthProdEditNotesForm.cs - - - Form - - - PDDGetChanceProdByImgForm.cs - - - True - True - Resources.resx - - - Form - - - DouBaoTitleFissionCefForm.cs - - - Form - - - GetJuShuitanAuthForm.cs - - - Form - - - Get1688ProductForm.cs - - - Form - - - GetJuShuitanProductSKUListForm.cs - - - Form - - - GetJuShuitanProdForm.cs - - - Form - - - ImgToolForm.cs - - - Form - - - PddMobileLoginForm.cs - - - Form - - - WebForm.cs - - - - Form - - - GetAddressForm.cs - - - - Form - - - VDianShopEditForm.cs - - - Form - - - VDianLoginForm.cs - - - Form - - - VDianShopLoginForm.cs - - - Form - - - VDianShopListForm.cs - - - Form - - - VDianUploadProductForm.cs - - - Form - - - WXAdminAccountSelectForm.cs - - - Form - - - WXAdminSetTopUpQrCodeForm.cs - - - Form - - - WXSaleAssistantForm.cs - - - Form - - - WXAdminAddressSyncForm.cs - - - Form - - - WXWaybillManageForm.cs - - - Form - - - WXActivity618Form.cs - - - Form - - - WXOrderListOptimizeForm.cs - - - Form - - - WXOrderListForm.cs - - - Form - - - WXOrderConsignmentForm.cs - - - Form - - - WXProdClearNoVisit260606Form.cs - - - Form - - - WXProdClearNoVisitForm.cs - - - Form - - - WXUserCollectAuthProdListForm.cs - - - Form - - - WXSelectDBProdListForm.cs - - - Form - - - WXFinderSquareForm.cs - - - Form - - - WXOemPointsTopUpListForm.cs - - - Form - - - WXOemAccountBalanceForm.cs - - - Form - - - WXOemAccountForm.cs - - - Form - - - WXTaxManage.cs - - - Form - - - WXPDDShopLoginForm.cs - - - Form - - - WXGetTopUpQrCode.cs - - - Form - - - WXShopDefaultAddressEditForm.cs - - - Form - - - WXShopDefaultAddressListForm.cs - - - Form - - - WXShopOptimizeForm.cs - - - - Form - - - WXAdminShopListForm.cs - - - Form - - - WXAdminAccountForm.cs - - - Form - - - WXAdminForm.cs - - - Form - - - WXAdminShopAddSubSaForm.cs - - - Form - - - WXAdminShopLoginForm.cs - - - Form - - - WXProdSyncForm.cs - - - Form - - - WXProdCouponOrderBoomForm.cs - - - Form - - - WXProdPreSaleForm.cs - - - Form - - - WXDBProdUploadForm.cs - - - Form - - - WXProductForm.cs - - - Form - - - WXShopMultiLoginForm.cs - - - Form - - - WxShopStatisticsForm.cs - - - Form - - - WXShopUpdateCookieForm.cs - - - Form - - - WXShopForm.cs - - - Form - - - WXShopAddEditForm.cs - - - Form - - - WXShopListForm.cs - - - Form - - - WXShopLoginForm.cs - - - Form - - - WXSubAccountListForm.cs - - - Form - - - WXSubAccountShopEditForm.cs - - - UserControl - - - UcSubAccount.cs - - - - - - - - - Form - - - AdminAccountForm.cs - - - Form - - - AdminCardCodeForm.cs - - - Form - - - AdminForm.cs - - - Form - - - JITForm.cs - - - Form - - - JitOrderUploadFileForm.cs - - - Form - - - JitPushOrder.cs - - - Form - - - JitShopActiveForm.cs - - - Form - - - AdminProductPriceCheckForm.cs - - - Form - - - JoinDeliveryForm.cs - - - Form - - - ProductChangePriceForm.cs - - - Form - - - PurchasePriceForm.cs - - - Form - - - TemuAdsForm.cs - - - Form - - - TemuJitForm.cs - - - Form - - - ComplianceForm.cs - - - Form - - - ChangeStockForm.cs - - - Form - - - ReceiveAreaForm.cs - - - UserControl - - - UcStockEdit.cs - - - Form - - - DbProductCategorySearch.cs - - - Form - - - DbProductEditDetailForm.cs - - - Form - - - DbPriceEditForm.cs - - - Form - - - DbProductPriceMarkUpForm.cs - - - Form - - - AdminShopAddSubSaForm.cs - - - Form - - - AdminShopListForm.cs - - - Form - - - AdminShopLoginForm.cs - - - - Form - - - BaseForm.cs - - - Form - - - BaseMsgForm.cs - - - Form - - - BaseGeneralForm.cs - - - Form - - - OrderForm.cs - - - Form - - - PriceManageForm.cs - - - Form - - - ProductForm.cs - - - - Form - - - SaleStockUpForm.cs - - - Form - - - DbProductEditForm.cs - - - Form - - - DbProductListForm.cs - - - Form - - - DbProductSelectEditNotesForm.cs - - - Form - - - DbProductSelectListManageForm.cs - - - Form - - - DbProductSelectSetSubSaForm.cs - - - Form - - - DbProductUserSelectEditNotesForm.cs - - - Form - - - DbProductUserSelectForm.cs - - - UserControl - - - UcPropEdit.cs - - - Form - - - ProductThirdSelectAddShopForm.cs - - - Form - - - ProductThirdSelectListManageForm.cs - - - Form - - - ProductThirdTitleForm.cs - - - Form - - - ProductThirdUserSelectForm.cs - - - Form - - - MarketingActivityForm.cs - - - Form - - - SalesCenterForm.cs - - - UserControl - - - UcActivityDiscountCtrl.cs - - - Form - - - ReturnPackageDetailForm.cs - - - Form - - - ShopAddEditForm.cs - - - Form - - - ShopForm.cs - - - Form - - - ShopListForm.cs - - - Form - - - ShopLoginForm.cs - - - Form - - - ShopOrderStatisticsDetailForm.cs - - - Form - - - ShopOrderStatisticsForm.cs - - - Form - - - ShopUpdateCookieForm.cs - - - Form - - - ShopSetPurchasePriceForm.cs - - - Form - - - ShopWorkStatisticsForm.cs - - - Form - - - SubAccountListForm.cs - - - Form - - - SubAccountShopEditForm.cs - - - UserControl - - - UcSubAccount.cs - - - Form - - - SystemForm.cs - - - Form - - - SystemRemoveRestrictionsForm.cs - - - Form - - - PDDProdActivityToolShouJianLiJianForm.cs - - - Form - - - PDDProdCouponForm.cs - - - Form - - - PDDProdCouponJingXiForm.cs - - - Form - - - PDDProdCouponLingQuanZhongXinForm.cs - - - Form - - - PDDProdCouponShangPinLiJianForm.cs - - - Form - - - PDDProdActivityToolXianShiXianLiangForm.cs - - - Form - - - PDDProductForm.cs - - - Form - - - PDDProductUpDownForm.cs - - - Form - - - PDDDBProdEditDetailForm.cs - - - Form - - - PDDDBProdImgListForm.cs - - - Form - - - PDDDBProdUploadSelectCacheForm.cs - - - Form - - - PDDDBProdUploadForm.cs - - - Form - - - PDDDBProdListForm.cs - - - Form - - - PDDDBProdEditForm.cs - - - Form - - - PDDGetChanceProdForm.cs - - - Form - - - PDDThirdProdSelectAddShopForm.cs - - - UserControl - - - UcAddPrice.cs - - - UserControl - - - UcPddSpecEdit.cs - - - Form - - - PDDShopUpdateFddlCookieForm.cs - - - Form - - - DouBaoImgListForm.cs - - - Form - - - CefForm.cs - - - Form - - - DouBaoImgCefForm.cs - - - Form - - - ChangeIPForm.cs - - - Form - - - IeForm.cs - - - Form - - - CollectVerifyForm.cs - - - Form - - - MeituMessageDialog.cs - - - Form - - - PinDuoDuoCaptchaForm.cs - - - Form - - - PinDuoDuoLoginForm.cs - - - Form - - - ProxyForm.cs - - - Form - - - TextForm.cs - - - Form - - - TokenNewForm.cs - - - Form - - - MainForm.cs - - - Form - - - PDDAdminAccountForm.cs - - - Form - - - PDDAdminForm.cs - - - Form - - - PDDAdminShopAddSubSaForm.cs - - - Form - - - PDDAdminShopListForm.cs - - - Form - - - PDDAdminShopLoginForm.cs - - - Form - - - PDDShopAddEditForm.cs - - - Form - - - A_PddShopForm.cs - - - Form - - - PDDShopListForm.cs - - - Form - - - PDDShopLoginForm.cs - - - Form - - - PDDShopUpdateCookieForm.cs - - - Form - - - PDDSubAccountListForm.cs - - - Form - - - PDDSubAccountShopEditForm.cs - - - - - UserControl - - - UcSubAccount.cs - - - - - - Form - - - TaobaoLoginForm.cs - - - Form - - - ShowImgForm.cs - - - UserControl - - - UcSkuImgItem.cs - - - UserControl - - - UcSkuImgListItem.cs - - - Component - - - Component - - - Component - - - Component - - - UcCheckBox.cs - - - Component - - - Component - - - UcComboBoxMutiSelect .cs - - - - UcDataGridViewCheckBoxColumn.cs - - - Component - - - UcGroupBoxEx.cs - - - Component - - - UcTabControl.cs - - - Component - - - UcTabControlMetro.cs - - - Component - - - UcTreeView.cs - - - Component - - - - UserControl - - - StatusBarUserControl.cs - - - UserControl - - - UcSplitPage.cs - - - Form - - - LoginForm.cs - - - Form - - - RegeditForm.cs - - - Form - - - ResetPasswordForm.cs - - - Form - - - SupportQrCodeForm.cs - - - Form - - - OtherBuyerOrderListForm.cs - - - Form - - - TalkAutoReplyConfigForm.cs - - - Form - - - TalkMessageForm.cs - - - - - - Form - - - WxTalkForm.cs - - - Form - - - PDDBuyerOrderListForm.cs - - - BaseTalkForm.cs - - - ChangeForm.cs - - - InitForm.cs - - - RandomComProductForm.cs - - - PDDAddActivityForm.cs - - - ExprotProductForm.cs - - - JstBanPlatformForm.cs - - - PDDDBProdNotesManageFrom.cs - - - PDDDBProdGroupManageFrom.cs - - - WXAdminQualificationImageForm.cs - - - WXAdminTransitWarehouseManage.cs - - - WXAdminAccountBalanceForm.cs - - - WxAdminOemManageForm.cs - - - WxAiTalkForm.cs - - - WXProdNoCheckEditAddressForm.cs - - - WXUserCollectAuthProdEditCatesForm.cs - - - WXUserCollectAuthProdEditNotesForm.cs - - - PDDGetChanceProdByImgForm.cs - - - DouBaoTitleFissionCefForm.cs - - - GetJuShuitanAuthForm.cs - - - Get1688ProductForm.cs - - - GetJuShuitanProductSKUListForm.cs - - - GetJuShuitanProdForm.cs - - - ImgToolForm.cs - - - PddMobileLoginForm.cs - - - WebForm.cs - - - GetAddressForm.cs - - - DataGridViewEx.cs - - - VDianShopEditForm.cs - - - VDianLoginForm.cs - - - VDianShopLoginForm.cs - - - VDianShopListForm.cs - - - VDianUploadProductForm.cs - - - WXAdminAccountSelectForm.cs - - - WXAdminSetTopUpQrCodeForm.cs - - - WXSaleAssistantForm.cs - - - WXAdminAddressSyncForm.cs - - - WXAdminShopListForm.cs - - - WXAdminAccountForm.cs - - - WXAdminForm.cs - - - WXAdminShopAddSubSaForm.cs - - - WXAdminShopLoginForm.cs - - - WXWaybillManageForm.cs - - - WXActivity618Form.cs - - - WXOrderListOptimizeForm.cs - - - WXOrderListForm.cs - - - WXOrderConsignmentForm.cs - - - WXProdClearNoVisit260606Form.cs - - - WXProdClearNoVisitForm.cs - - - WXUserCollectAuthProdListForm.cs - - - WXSelectDBProdListForm.cs - - - WXFinderSquareForm.cs - - - WXProdSyncForm.cs - - - WXProdCouponOrderBoomForm.cs - - - WXProdPreSaleForm.cs - - - WXDBProdUploadForm.cs - - - WXProductForm.cs - - - WXOemPointsTopUpListForm.cs - - - WXOemAccountBalanceForm.cs - - - WXOemAccountForm.cs - - - WXTaxManage.cs - - - WXPDDShopLoginForm.cs - - - WXGetTopUpQrCode.cs - - - WXShopDefaultAddressEditForm.cs - - - WXShopDefaultAddressListForm.cs - - - WXShopOptimizeForm.cs - - - WXShopMultiLoginForm.cs - - - WxShopStatisticsForm.cs - - - WXShopUpdateCookieForm.cs - - - WXShopForm.cs - - - WXShopAddEditForm.cs - - - WXShopListForm.cs - - - WXShopLoginForm.cs - - - WXSubAccountListForm.cs - - - WXSubAccountShopEditForm.cs - - - UcSubAccount.cs - - - AdminAccountForm.cs - - - AdminCardCodeForm.cs - - - AdminForm.cs - - - JITForm.cs - - - JitOrderUploadFileForm.cs - - - JitPushOrder.cs - - - JitShopActiveForm.cs - - - AdminProductPriceCheckForm.cs - - - JoinDeliveryForm.cs - - - ProductChangePriceForm.cs - - - PurchasePriceForm.cs - - - TemuAdsForm.cs - - - TemuJitForm.cs - - - ChangeStockForm.cs - - - ComplianceForm.cs - - - ReceiveAreaForm.cs - - - UcStockEdit.cs - - - DbProductCategorySearch.cs - - - DbProductEditDetailForm.cs - - - DbPriceEditForm.cs - - - DbProductPriceMarkUpForm.cs - - - AdminShopAddSubSaForm.cs - - - AdminShopListForm.cs - - - AdminShopLoginForm.cs - - - BaseForm.cs - - - BaseMsgForm.cs - Designer - - - BaseGeneralForm.cs - - - OrderForm.cs - - - PriceManageForm.cs - - - ProductForm.cs - - - SaleStockUpForm.cs - - - DbProductEditForm.cs - - - DbProductListForm.cs - - - DbProductSelectEditNotesForm.cs - - - DbProductSelectListManageForm.cs - - - DbProductSelectSetSubSaForm.cs - - - DbProductUserSelectEditNotesForm.cs - - - DbProductUserSelectForm.cs - - - UcPropEdit.cs - - - ProductThirdSelectAddShopForm.cs - - - ProductThirdSelectListManageForm.cs - - - ProductThirdTitleForm.cs - - - ProductThirdUserSelectForm.cs - - - MarketingActivityForm.cs - - - SalesCenterForm.cs - - - UcActivityDiscountCtrl.cs - - - ReturnPackageDetailForm.cs - - - ShopAddEditForm.cs - - - ShopForm.cs - - - ShopListForm.cs - - - ShopLoginForm.cs - - - ShopUpdateCookieForm.cs - - - ShopOrderStatisticsDetailForm.cs - - - ShopOrderStatisticsForm.cs - - - ShopSetPurchasePriceForm.cs - - - ShopWorkStatisticsForm.cs - - - SubAccountListForm.cs - - - SubAccountShopEditForm.cs - - - UcSubAccount.cs - - - SystemForm.cs - - - SystemRemoveRestrictionsForm.cs - - - PDDProdActivityToolShouJianLiJianForm.cs - - - PDDProdCouponForm.cs - - - PDDProdCouponJingXiForm.cs - - - PDDProdCouponLingQuanZhongXinForm.cs - - - PDDProdCouponShangPinLiJianForm.cs - - - PDDProdActivityToolXianShiXianLiangForm.cs - - - PDDProductForm.cs - - - PDDProductUpDownForm.cs - - - PDDDBProdEditDetailForm.cs - - - PDDDBProdImgListForm.cs - - - PDDDBProdUploadSelectCacheForm.cs - - - PDDDBProdUploadForm.cs - - - PDDDBProdListForm.cs - - - PDDDBProdEditForm.cs - - - PDDGetChanceProdForm.cs - - - PDDThirdProdSelectAddShopForm.cs - - - UcAddPrice.cs - - - UcPddSpecEdit.cs - - - PDDShopUpdateFddlCookieForm.cs - - - DouBaoImgListForm.cs - - - CefForm.cs - - - DouBaoImgCefForm.cs - - - ChangeIPForm.cs - - - IeForm.cs - - - CollectVerifyForm.cs - - - MeituMessageDialog.cs - - - PinDuoDuoCaptchaForm.cs - - - PinDuoDuoLoginForm.cs - - - ProxyForm.cs - - - TextForm.cs - - - TokenNewForm.cs - - - MainForm.cs - - - PDDAdminAccountForm.cs - - - PDDAdminForm.cs - - - PDDAdminShopAddSubSaForm.cs - - - PDDAdminShopListForm.cs - - - PDDAdminShopLoginForm.cs - - - PDDShopAddEditForm.cs - - - A_PddShopForm.cs - - - PDDShopListForm.cs - - - PDDShopLoginForm.cs - - - PDDShopUpdateCookieForm.cs - - - PDDSubAccountListForm.cs - - - PDDSubAccountShopEditForm.cs - - - UcSubAccount.cs - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - TaobaoLoginForm.cs - - - ShowImgForm.cs - - - UcSkuImgItem.cs - - - UcSkuImgListItem.cs - - - StatusBarUserControl.cs - - - UcSplitPage.cs - - - LoginForm.cs - - - RegeditForm.cs - - - ResetPasswordForm.cs - - - SupportQrCodeForm.cs - - - OtherBuyerOrderListForm.cs - - - TalkAutoReplyConfigForm.cs - - - TalkMessageForm.cs - - - WxTalkForm.cs - - - PDDBuyerOrderListForm.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {6461d807-b1c8-45f0-b388-e0ca1a418de0} - AllBase - - - {38e74d4c-2d8d-47d2-8a23-417c3c57ade5} - Work - - - - - - - - False - Microsoft .NET Framework 4.6.2 %28x86 和 x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - - - - + + + + WinExe + true + net462 + TemuKJD + 29供应链 + bag.ico + 12 + ..\bin\ + false + x64 + false + + + + + + + + + + + + + + + + + + ..\DllReference\DevComponents.DotNetBar2.dll + + + ..\DllReference\FiddlerCore4.dll + + + ..\DllReference\NaiBa.CefHelper.138.dll + + + ..\DllReference\NaiBa.Util.dll + + + ..\DllReference\NaiBa.Util.Winform.dll + + + ..\DllReference\NaiBa.Util.Zip.dll + + + ..\DllReference\System.Data.SQLite.DLL + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/TEMUKJD/KJD.csproj.user b/TEMUKJD/KJD.csproj.user index a19d39a..e041bfa 100644 --- a/TEMUKJD/KJD.csproj.user +++ b/TEMUKJD/KJD.csproj.user @@ -10,8 +10,637 @@ zh-CN false + Development false + ProjectDebugger + + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + UserControl + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + Form + + + Form + + + UserControl + + + UserControl + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + UserControl + + + UserControl + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + \ No newline at end of file diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 4407301..0d67bcb 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace TemuKJD.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/TEMUKJD/Properties/launchSettings.json b/TEMUKJD/Properties/launchSettings.json new file mode 100644 index 0000000..2265c7b --- /dev/null +++ b/TEMUKJD/Properties/launchSettings.json @@ -0,0 +1,22 @@ +{ + "profiles": { + "Production": { + "commandName": "Project", + "environmentVariables": { + "ENVIRONMENT": "Production" + } + }, + "Development": { + "commandName": "Project", + "environmentVariables": { + "ENVIRONMENT": "Development" + } + }, + "Test": { + "commandName": "Project", + "environmentVariables": { + "ENVIRONMENT": "Test" + } + } + } +} \ No newline at end of file diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index 0f2dad5..7c136f6 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -1,7 +1,7 @@ using AllBase; +using AllBase.Helper; using CefSharp; using CefSharp.WinForms; -using TemuKJD.BaseForms; using System; using System.Collections.Generic; using System.Diagnostics; @@ -12,6 +12,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.BaseForms; using Work; namespace TemuKJD.UserForm @@ -65,13 +66,15 @@ namespace TemuKJD.UserForm //pnlShowRemember.Visible = false; rbtPrd.Checked = true; } + grpEnvironmentChoice.Visible = true; + rbtDev.Checked = EnvironmentHelper.IsDevelopment; #else grpEnvironmentChoice.Visible = false; //pnlShowRemember.Visible = false; rbtPrd.Checked = true; #endif - if (BaseClass.Ico != null) + if (BaseClass.Ico != null) Icon = BaseClass.Ico; Text = "登录 " + BaseClass.ToolName; diff --git a/TEMUKJD/packages.config b/TEMUKJD/packages.config deleted file mode 100644 index a0ae3c2..0000000 --- a/TEMUKJD/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file