diff --git a/BO/Utils/AfterLoginUtil.cs b/BO/Utils/AfterLoginUtil.cs index 00b76e1..2016978 100644 --- a/BO/Utils/AfterLoginUtil.cs +++ b/BO/Utils/AfterLoginUtil.cs @@ -19,13 +19,13 @@ namespace BO.Utils public static class AfterLoginUtil { - static List> roleToAssemblies = new List>(){new Tuple("排宰员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"), - new Tuple("过磅员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"), - new Tuple("验质员",@"C:\BwpB3Project\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder"),new Tuple("定级员",@"C:\BwpB3Project\src\B3ButcherManageClient\WeighAndGrading\bin\Debug\WeighAndGrading"),new Tuple("窒晕员",@"C:\BwpB3Project\src\B3ButcherManageClient\OrderConfirm\bin\Debug\OrderConfirm")}; + // static List> roleToAssemblies = new List>(){new Tuple("排宰员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherOrder\bin\Debug\ButcherOrder"), + //new Tuple("过磅员",@"C:\BwpB3Project\src\B3ButcherManageClient\ButcherWeight\bin\Debug\ButcherWeight"), + // new Tuple("验质员",@"C:\BwpB3Project\src\B3ButcherManageClient\QualityAndOrder\bin\Debug\QualityAndOrder"),new Tuple("定级员",@"C:\BwpB3Project\src\B3ButcherManageClient\WeighAndGrading\bin\Debug\WeighAndGrading"),new Tuple("窒晕员",@"C:\BwpB3Project\src\B3ButcherManageClient\OrderConfirm\bin\Debug\OrderConfirm")}; - //static List> roleToAssemblies = new List>(){new Tuple("排宰员",@"ButcherOrder"), - //new Tuple("过磅员",@"ButcherWeight"), - // new Tuple("验质员",@"QualityAndOrder"),new Tuple("定级员",@"WeighAndGrading"),new Tuple("窒晕员",@"OrderConfirm")}; + static List> roleToAssemblies = new List>(){new Tuple("排宰员",@"ButcherOrder"), + new Tuple("过磅员",@"ButcherWeight"), + new Tuple("验质员",@"QualityAndOrder"),new Tuple("定级员",@"WeighAndGrading"),new Tuple("窒晕员",@"OrderConfirm")}; public static Form CreateForm(string role) @@ -34,10 +34,10 @@ namespace BO.Utils if (first == null) throw new Exception("未注册的角色"); //#if debug - var filePath = string.Format("{0}.dll", first.Item2); + // var filePath = string.Format("{0}.dll", first.Item2); //#endif //#if !debug - //var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2)); + var filePath = Path.Combine(Application.StartupPath, string.Format("{0}.dll", first.Item2)); //#endif if (!File.Exists(filePath)) throw new Exception("相关模块不存在"); diff --git a/ButcherManageClient/Login.cs b/ButcherManageClient/Login.cs index b685b34..3773f78 100644 --- a/ButcherManageClient/Login.cs +++ b/ButcherManageClient/Login.cs @@ -122,7 +122,7 @@ namespace ButcherManageClient private void Login_Load(object sender, EventArgs e) { - // AutoUpdate(); + AutoUpdate(); } } } diff --git a/ButcherWeight/WeightContext.cs b/ButcherWeight/WeightContext.cs index f183274..a86a7dc 100644 --- a/ButcherWeight/WeightContext.cs +++ b/ButcherWeight/WeightContext.cs @@ -12,7 +12,7 @@ namespace ButcherWeight public static class WeightContext { //#if debug - // private static string loginConfigPath = @"C:\BwpB3Project\src\B3ButcherManageClient\ButcherManageClient\bin\Debug\WeightSetting.xml"; + //private static string loginConfigPath = @"C:\BwpB3Project\src\B3ButcherManageClient\ButcherManageClient\bin\Debug\WeightSetting.xml"; //#endif //#if !debug private static string loginConfigPath = Application.StartupPath + "\\WeightSetting.xml"; diff --git a/Setup/Release/Setup.msi b/Setup/Release/Setup.msi index ee6fcf8..d076dbb 100644 Binary files a/Setup/Release/Setup.msi and b/Setup/Release/Setup.msi differ diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj index b3dfb94..49d6227 100644 --- a/Setup/Setup.vdproj +++ b/Setup/Setup.vdproj @@ -39,6 +39,12 @@ } "Entry" { + "MsmKey" = "8:_22C665F6A7E140C3B3377CF2EAD48C09" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_2C2942BD572A3CAA8721DF87BDC15062" "OwnerKey" = "8:_B110F71EA45DE28B9A91C6C8EC87BC44" "MsmSig" = "8:_UNDEFINED" @@ -75,12 +81,6 @@ } "Entry" { - "MsmKey" = "8:_38D34C00AC7904E5D01A35ECF223BE06" - "OwnerKey" = "8:_E562E4F2F1D44477985FD09F62884850" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_490CF6B031F04EA68BE52D3A7EB5FEF9" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -111,26 +111,14 @@ } "Entry" { - "MsmKey" = "8:_863A403291F0637680FF1E9D313B477D" - "OwnerKey" = "8:_E562E4F2F1D44477985FD09F62884850" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_B110F71EA45DE28B9A91C6C8EC87BC44" - "OwnerKey" = "8:_EE17E053D2DAEC8711E3F47FB9870675" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B110F71EA45DE28B9A91C6C8EC87BC44" - "OwnerKey" = "8:_38D34C00AC7904E5D01A35ECF223BE06" + "OwnerKey" = "8:_D4A570E8506CE9B608EA798211060C3A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_B110F71EA45DE28B9A91C6C8EC87BC44" - "OwnerKey" = "8:_863A403291F0637680FF1E9D313B477D" + "OwnerKey" = "8:_EE17E053D2DAEC8711E3F47FB9870675" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -141,12 +129,6 @@ } "Entry" { - "MsmKey" = "8:_B110F71EA45DE28B9A91C6C8EC87BC44" - "OwnerKey" = "8:_D4A570E8506CE9B608EA798211060C3A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C4609315564A5A79DE9CC35B7F0552D9" "OwnerKey" = "8:_3889C054825438E9FCA8AD0745ADE017" "MsmSig" = "8:_UNDEFINED" @@ -172,6 +154,12 @@ "Entry" { "MsmKey" = "8:_D4A570E8506CE9B608EA798211060C3A" + "OwnerKey" = "8:_E562E4F2F1D44477985FD09F62884850" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D4A570E8506CE9B608EA798211060C3A" "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" "MsmSig" = "8:_UNDEFINED" } @@ -208,6 +196,12 @@ "Entry" { "MsmKey" = "8:_EE17E053D2DAEC8711E3F47FB9870675" + "OwnerKey" = "8:_E562E4F2F1D44477985FD09F62884850" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_EE17E053D2DAEC8711E3F47FB9870675" "OwnerKey" = "8:_72C299799A4A4FCE805FFC4FC20FAFEF" "MsmSig" = "8:_UNDEFINED" } @@ -231,6 +225,12 @@ } "Entry" { + "MsmKey" = "8:_FAF55378A3FC4DAA86CA8CD6FCE44943" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_5028DE72CC42424CB6B2165E77BED521" "MsmSig" = "8:_UNDEFINED" @@ -238,19 +238,19 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E562E4F2F1D44477985FD09F62884850" + "OwnerKey" = "8:_D4A570E8506CE9B608EA798211060C3A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_38D34C00AC7904E5D01A35ECF223BE06" + "OwnerKey" = "8:_EE17E053D2DAEC8711E3F47FB9870675" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_863A403291F0637680FF1E9D313B477D" + "OwnerKey" = "8:_E562E4F2F1D44477985FD09F62884850" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -316,18 +316,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D4A570E8506CE9B608EA798211060C3A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EE17E053D2DAEC8711E3F47FB9870675" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_B110F71EA45DE28B9A91C6C8EC87BC44" "MsmSig" = "8:_UNDEFINED" } @@ -494,21 +482,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2C2942BD572A3CAA8721DF87BDC15062" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_22C665F6A7E140C3B3377CF2EAD48C09" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Forks.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2C2942BD572A3CAA8721DF87BDC15062" - { - "Name" = "8:Forks.Json.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Forks.Json.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\BWP.WinFormControl\\bin\\Debug\\Winpplb.dll" + "TargetName" = "8:Winpplb.dll" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" "Condition" = "8:" @@ -522,23 +499,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_330D031AE5F223BC187AA689BE72AD7E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2C2942BD572A3CAA8721DF87BDC15062" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MongoDB.Driver, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Forks.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" "ScatterAssemblies" { - "_330D031AE5F223BC187AA689BE72AD7E" + "_2C2942BD572A3CAA8721DF87BDC15062" { - "Name" = "8:MongoDB.Driver.dll" + "Name" = "8:Forks.Json.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MongoDB.Driver.dll" + "SourcePath" = "8:Forks.Json.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" @@ -556,20 +533,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3889C054825438E9FCA8AD0745ADE017" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_330D031AE5F223BC187AA689BE72AD7E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MongoDB.Driver, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL" "ScatterAssemblies" { - "_3889C054825438E9FCA8AD0745ADE017" + "_330D031AE5F223BC187AA689BE72AD7E" { - "Name" = "8:Forks.EnterpriseServices.dll" + "Name" = "8:MongoDB.Driver.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Forks.EnterpriseServices.dll" + "SourcePath" = "8:MongoDB.Driver.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" @@ -587,20 +564,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_38D34C00AC7904E5D01A35ECF223BE06" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3889C054825438E9FCA8AD0745ADE017" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BWP.WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" "ScatterAssemblies" { - "_38D34C00AC7904E5D01A35ECF223BE06" + "_3889C054825438E9FCA8AD0745ADE017" { - "Name" = "8:BWP.WinFormControl.DLL" + "Name" = "8:Forks.EnterpriseServices.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:BWP.WinFormControl.DLL" + "SourcePath" = "8:Forks.EnterpriseServices.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" @@ -742,37 +719,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_863A403291F0637680FF1E9D313B477D" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_863A403291F0637680FF1E9D313B477D" - { - "Name" = "8:BO.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:BO.DLL" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B110F71EA45DE28B9A91C6C8EC87BC44" { "AssemblyRegister" = "3:1" @@ -959,6 +905,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FAF55378A3FC4DAA86CA8CD6FCE44943" + { + "SourcePath" = "8:..\\BWP.WinFormControl\\bin\\Debug\\WinPort.dll" + "TargetName" = "8:WinPort.dll" + "Tag" = "8:" + "Folder" = "8:_BEB5263E66544AA0ADFECA514F610FF5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } } "FileType" { @@ -1027,7 +993,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:青花瓷屠宰场管理" "ProductCode" = "8:{B80B0D89-2840-4465-ADFA-EC99FF1D4819}" - "PackageCode" = "8:{1B57BA98-8443-44E5-9E9B-804B44C343BF}" + "PackageCode" = "8:{3F7F6DA0-BB50-49F8-BCAE-59B39B1B33C7}" "UpgradeCode" = "8:{36F49E93-1C91-49B0-BB59-9984FC596D30}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE"