xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1 refactor(config): 将AppSettings移至Application层并更新配置结构

Browse Source 
2
    3 - 将AppSettings从DMS.Infrastructure移至DMS.Application
    4 - 将DatabaseSettings重命名为AppSettings.Database并更新所有引用
    5 - 将配置文件从appSettings.json更改为dms_config.json
    6 - 更新所有项目引用以使用新的AppSettings命名空间
    7 - 移除DI容器中的SqlSugarDbContext直接实例化
    8 - 添加Material Design Icons字体并更新设置视图UI
    9 - 通过移除不必要的变量映射更新来优化S7服务
   10 - 将数据库连接字符串属性名从Database更新为DbName
This commit is contained in:
David P.G
2025-10-04 18:42:12 +08:00
parent abcaf3e160
commit ec1f94a898
14 changed files with 152 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
DMS.WPF/ViewModels/SettingViewModel.cs
View File

@@ -1,5 +1,5 @@
using CommunityToolkit.Mvvm.Input;
using DMS.Infrastructure.Configurations;
using DMS.Application.Configurations;
using DMS.WPF.Helper;
using DMS.WPF.Interfaces;
@@ -39,12 +39,12 @@ public partial class SettingViewModel : ViewModelBase
public string SelectedDbType
{
get => _settings.Database.DbType;
get => _settings.Db.DbType;
set
{
if (_settings.Database.DbType != value)
if (_settings.Db.DbType != value)
{
_settings.Database.DbType = value;
_settings.Db.DbType = value;
OnPropertyChanged();
_settings.Save();
}
@@ -53,12 +53,12 @@ public partial class SettingViewModel : ViewModelBase
public string Server
{
get => _settings.Database.Server;
get => _settings.Db.Server;
set
{
if (_settings.Database.Server != value)
if (_settings.Db.Server != value)
{
_settings.Database.Server = value;
_settings.Db.Server = value;
OnPropertyChanged();
_settings.Save();
}
@@ -67,12 +67,12 @@ public partial class SettingViewModel : ViewModelBase
public int Port
{
get => _settings.Database.Port;
get => _settings.Db.Port;
set
{
if (_settings.Database.Port != value)
if (_settings.Db.Port != value)
{
_settings.Database.Port = value;
_settings.Db.Port = value;
OnPropertyChanged();
_settings.Save();
}
@@ -81,12 +81,12 @@ public partial class SettingViewModel : ViewModelBase
public string UserId
{
get => _settings.Database.UserId;
get => _settings.Db.UserId;
set
{
if (_settings.Database.UserId != value)
if (_settings.Db.UserId != value)
{
_settings.Database.UserId = value;
_settings.Db.UserId = value;
OnPropertyChanged();
_settings.Save();
}
@@ -95,26 +95,26 @@ public partial class SettingViewModel : ViewModelBase
public string Password
{
get => _settings.Database.Password;
get => _settings.Db.Password;
set
{
if (_settings.Database.Password != value)
if (_settings.Db.Password != value)
{
_settings.Database.Password = value;
_settings.Db.Password = value;
OnPropertyChanged();
_settings.Save();
}
}
}
public string Database
public string DbName
{
get => _settings.Database.Database;
get => _settings.Db.DbName;
set
{
if (_settings.Database.Database != value)
if (_settings.Db.DbName != value)
{
_settings.Database.Database = value;
_settings.Db.DbName = value;
OnPropertyChanged();
_settings.Save();
}
@@ -157,7 +157,7 @@ public partial class SettingViewModel : ViewModelBase
// 使用当前配置测试数据库连接
using var db = new SqlSugar.SqlSugarScope(new SqlSugar.ConnectionConfig()
{
DbType = (SqlSugar.DbType)Enum.Parse(typeof(SqlSugar.DbType), _settings.Database.DbType),
DbType = (SqlSugar.DbType)Enum.Parse(typeof(SqlSugar.DbType), _settings.Db.DbType),
ConnectionString = _settings.ToConnectionString(),
IsAutoCloseConnection = true
});