no commit message

MainUI/MainForm.cs

@@ -112,7 +112,7 @@ namespace Framework.MainUI
 			new BarAndDockingController().AppearancesBar.ItemsFont = font;
 
 			InitMenu();
-			//InitShortcutButton();
+			InitShortcutButton();
 		}
 
 		void MainForm_Load(object sender, EventArgs e)
@@ -306,18 +306,20 @@ namespace Framework.MainUI
 
 		private void InitShortcutButton()
 		{
-			List<ShortcutToolbar> list = Rpc.Create<ShortcutToolbarHandler>().QueryByUser(ClientContext.User.Id);
-			if (!list.Any())
-			{
-				bar2.Visible = false;
-				return;
-			}
-
-			foreach (ShortcutToolbar button in list)
-			{
-				ModuleInfo module = ModuleParser.Instance.GetModuleInfoByModuleName(button.Module);
-				CreateShortcutToolbarButton(module);
-			}
+			bar2.Visible = false;
+
+			//List<ShortcutToolbar> list = Rpc.Create<ShortcutToolbarHandler>().QueryByUser(ClientContext.User.Id);
+			//if (!list.Any())
+			//{
+			//	bar2.Visible = false;
+			//	return;
+			//}
+
+			//foreach (ShortcutToolbar button in list)
+			//{
+			//	ModuleInfo module = ModuleParser.Instance.GetModuleInfoByModuleName(button.Module);
+			//	CreateShortcutToolbarButton(module);
+			//}
 		}
 
 		public void AddShortcutButton(ModuleInfo module)

MainUI/Properties/licenses.licx

+DevExpress.Patch.InMemoryPatch, DevExpress.Patch.Common, Version=6.1.0.0, Culture=neutral, PublicKeyToken=7fc7bfca2443de66
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v13.2, Version=13.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ServerConsole/App.config

 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+
   <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="v11.0" />
+        <parameter value="mssqllocaldb" />
       </parameters>
     </defaultConnectionFactory>
     <providers>
       <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
-  <connectionStrings>
-
-    <add name="DB" connectionString="data source=.;initial catalog=Platform;persist security info=True;user id=sa;password=123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
 
+  <connectionStrings>
+    <add name="DB" connectionString="data source=.;initial catalog=MedicalCrm;persist security info=True;user id=sa;password=123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
   </connectionStrings>
 
   <!--注意，以下配置修改后，必须重启服务才能生效-->
   <appSettings>
+    <!--<add key="ServiceLogPath" value="d:\MedicalCrmServiceLog"/>-->
 
-    <!-- 服务端监听的端口号，必须与客户端保持一致 -->
-    <add key="port" value="11260"/>
+    <!-- 定时执行任务，为false为不执行，为true执行 -->
+    <add key="AutoRunTask" value="false"/>
 
-    <!-- 集群服务器端口（无IP则默认与当前服务器同IP） -->
-    <add key="ClusterServersPort" value="11261"/>
+    <add key="debug" value="true"/>
 
-    <add key="db" value="Framework.DomainBase.DB, Framework.DomainBase"/>
+    <add key="db" value="Framework.DomainBase.DB, Framework.DomainBase" />
 
-    <!-- 注意，服务器与客户端的协议必须一致，否则报告错误：服务器提交了协议冲突. Section=ResponseStatusLine -->
+    <!-- 服务连接端口 -->
+    <add key="port" value="11260" />
+
+    <!-- 以SOAP协议访问服务器 -->
     <!--<add key="channel" value="http"/>-->
     <add key="channel" value="tcp"/>
 
-    <!-- 是否是测试模式，注意，正式部署必须置为false -->
-    <add key="test" value="false"/>
-
-    <!-- 是否记录数据更新日志 -->
-    <!--<add key="auditedlog" value="true"/>-->
-
     <!-- 客户端升级路径 -->
     <add key="ClientUpgradePath" value="d:\ClientUpgradePath"/>