Merge branch 'dep' into dep_yangw

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj

@@ -153,9 +153,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Office.Interop.Excel">
-      <HintPath>..\Microsoft.Office.Interop.Excel.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -776,15 +773,6 @@
     <Folder Include="Product\PptShift\" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="Microsoft.Office.Core">
-      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>8</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="Microsoft.Office.Interop.Excel">
       <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>1</VersionMajor>

Actions/Default/Mesnac.Action.Default/Purview/CheckPurviewControl.cs

@@ -28,7 +28,7 @@ namespace Mesnac.Action.Default.Purview
             {
                 return;//窗体不验证权限
             }
-            if (UserInfo.Instance.RoleGUID == "-mesnac")
+            if (UserInfo.Instance.RoleGUID == "-99")
             {
                 return;//超级用户
             }

Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.cs

@@ -206,7 +206,7 @@ namespace Mesnac.Action.Default.Purview
 
             #region 如果是强制登录则放行
 
-            if (Mesnac.Basic.UserInfo.Instance.RoleGUID.Equals("-mesnac") || _ower == Mesnac.Gui.Workbench.WorkbenchSingleton.Workbench)
+            if (Mesnac.Basic.UserInfo.Instance.RoleGUID.Equals("-99") || _ower == Mesnac.Gui.Workbench.WorkbenchSingleton.Workbench)
             {
                 return true;
             }
@@ -306,7 +306,7 @@ namespace Mesnac.Action.Default.Purview
         private bool superLogin()
         {
             bool bResult = false;
-            if (this.txtPWD.Text == "-mesnac")
+            if (this.txtPWD.Text == "-99")
             {
                 UserInfo.Instance.RoleGUID = "-99";
                 UserInfo.Instance.UserGUID = "-";

Main/MCEdit/Data/MCProject/nodeDataSource.xml

@@ -1,3 +1,3 @@
 <DataSources>
-  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
+  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="10.11.41.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
 </DataSources>

Main/Mesnac.Gui.Run/ViewContent/BrowserCommand.cs

@@ -246,7 +246,7 @@ namespace Mesnac.Gui.Run.ViewContent
         public bool IsValid(object owner, ICSharpCode.Core.Condition condition)
         {
             //如果是超级管理员或没经过登录（独立运行）则可用
-            if (UserInfo.Instance.RoleGUID == "-mesnac" || UserInfo.Instance.RoleGUID == "-1")
+            if (UserInfo.Instance.RoleGUID == "-99" || UserInfo.Instance.RoleGUID == "-1")
             {
                 return true;
             }