dathlin/ClientServerProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

系统新增一个数据库连接字符串信息，客户端的数据由服务器初始化，v1.7.11

Browse Source
This commit is contained in:
dathlin
2017-12-24 13:35:13 +08:00
parent f9e44b3812
commit e89f008868
7 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ClientsLibrary/AccountSupport/AccountLogin.cs
View File

@@ -196,6 +196,7 @@ namespace ClientsLibrary
{
UserClient.SystemFactories = json[nameof(UserClient.SystemFactories)].ToObject<List<string>>();
}
CommonLibrary.DataBaseSupport.SqlServerSupport.ConnectionString = SoftBasic.GetValueFromJsonObject(json, nameof(ServerSettings.SqlServerStr), "");
}
else
{

7
CommonLibrary/BasicSupport/SoftSettings.cs
View File

@@ -50,6 +50,10 @@ namespace CommonLibrary
/// </summary>
public string Announcement { get; set; } = "测试公告";
/// <summary>
/// 数据库连接字符串
/// </summary>
public string SqlServerStr { get; set; } = string.Empty;
/// <summary>
/// 是否允许账户登录，超级管理员账户除外
/// </summary>
public bool Can_Account_Login { get; set; } = true;
@@ -163,6 +167,7 @@ namespace CommonLibrary
{ nameof(WhetherToEnableTrustedClientAuthentication),new JValue(WhetherToEnableTrustedClientAuthentication) },
{ nameof(TrustedClientList),new JArray(TrustedClientList) },
{ nameof(AllowLoginWhenFramewordVersionNotCheck), new JValue(AllowLoginWhenFramewordVersionNotCheck) },
{ nameof(SqlServerStr), new JValue(SqlServerStr) },
};
return json.ToString();
}
@@ -179,7 +184,7 @@ namespace CommonLibrary
AllowUserMultiOnline = SoftBasic.GetValueFromJsonObject(json, nameof(AllowUserMultiOnline), AllowUserMultiOnline);
Account_Forbidden_Reason = SoftBasic.GetValueFromJsonObject(json, nameof(Account_Forbidden_Reason), Account_Forbidden_Reason);
AllowLoginWhenFramewordVersionNotCheck = SoftBasic.GetValueFromJsonObject(json, nameof(AllowLoginWhenFramewordVersionNotCheck), AllowLoginWhenFramewordVersionNotCheck);
SqlServerStr = SoftBasic.GetValueFromJsonObject(json, nameof(SqlServerStr), SqlServerStr);
if (json[nameof(SystemFactories)] != null)

1
CommonLibrary/CommonLibrary.csproj
View File

@@ -118,6 +118,7 @@
<DependentUpon>FormWaitInfomation.cs</DependentUpon>
</Compile>
<Compile Include="BasicSupport\SoftSettings.cs" />
<Compile Include="DataBaseSupport\SqlServerSupport.cs" />
<Compile Include="LocalizationSupport\ChineseLocalization.cs" />
<Compile Include="LocalizationSupport\EnglishLocalization.cs" />
<Compile Include="LocalizationSupport\Localization.cs" />

19
CommonLibrary/DataBaseSupport/SqlServerSupport.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace CommonLibrary.DataBaseSupport
{
/// <summary>
/// 使用SQL SERVER服务器的时的数据支持
/// </summary>
public class SqlServerSupport
{
/// <summary>
/// 数据库的连接字符串，该信息应来源于服务器保存的连接字符串
/// </summary>
public static string ConnectionString { get; set; }
}
}

2
CommonLibrary/UserSystem.cs
View File

@@ -44,7 +44,7 @@ namespace CommonLibrary
**************************************************************************/
SoftBasic.FrameworkVersion = new SystemVersion("1.7.10");
SoftBasic.FrameworkVersion = new SystemVersion("1.7.11");
}

2
软件系统服务端模版/FormServerWindow.cs
View File

@@ -111,6 +111,7 @@ namespace 软件系统服务端模版
// 初始化并加载账户信息
UserServer.ServerSettings.FileSavePath = Application.StartupPath + @"\settings.txt";
UserServer.ServerSettings.LoadByFile();
CommonLibrary.DataBaseSupport.SqlServerSupport.ConnectionString = UserServer.ServerSettings.SqlServerStr;
// 初始化并加载角色规则
UserServer.ServerRoles.FileSavePath = Application.StartupPath + @"\roles.txt";
@@ -487,6 +488,7 @@ namespace 软件系统服务端模版
{
{ nameof(UserServer.ServerSettings.Announcement), new JValue(UserServer.ServerSettings.Announcement) },
{ nameof(UserServer.ServerSettings.SystemFactories), new JArray(UserServer.ServerSettings.SystemFactories) },
{ nameof(UserServer.ServerSettings.SqlServerStr), new JValue(UserServer.ServerSettings.SqlServerStr) },
};
net_simplify_server.SendMessage(state, handle, json.ToString());
}

1
软件系统浏览器模版/Controllers/AccountController.cs
View File

@@ -124,6 +124,7 @@ namespace 软件系统浏览器模版.Controllers
json = JObject.Parse(result.Content);
//例如公告数据
UserClient.Announcement = SoftBasic.GetValueFromJsonObject(json, nameof(UserClient.Announcement), "");
CommonLibrary.DataBaseSupport.SqlServerSupport.ConnectionString = SoftBasic.GetValueFromJsonObject(json, nameof(ServerSettings.SqlServerStr), "");
}
else
{