chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复租户端机构id插入更新问题

Browse Source
master
ZR20090193-陈敬勇 8 months ago
parent a085e94557
commit 16950d3a59
12 changed files with 215 additions and 10 deletions
Show Stats Download Patch File Download Diff File

5
ds-wms-service/DS.Module.Core/Data/UserInfo.cs
Unescape Escape View File

@ -24,7 +24,10 @@ public class UserInfo
/// 公司ID
/// </summary>
public string CompanyId { get; set; }
/// <summary>
/// 机构Id
/// </summary>
public string OrgId { get; set; }
/// <summary>
/// 公司名称
/// </summary>

14
ds-wms-service/DS.Module.PrintModule/DS.Module.PrintModule.csproj
Unescape Escape View File

@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\DS.Module.Core\DS.Module.Core.csproj" />
<ProjectReference Include="..\DS.Module.UserModule\DS.Module.UserModule.csproj" />
</ItemGroup>
</Project>

12
ds-wms-service/DS.Module.PrintModule/IPrintService.cs
Unescape Escape View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.Module.PrintModule
{
public interface IPrintService
{
}
}

27
ds-wms-service/DS.Module.PrintModule/PrintModuleInstall.cs
Unescape Escape View File

@ -0,0 +1,27 @@
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.Module.PrintModule
{
/// <summary>
/// 注入打印服务
/// </summary>
public static class PrintModuleInstall
{
/// <summary>
///
/// </summary>
/// <param name="services"></param>
/// <exception cref="ArgumentNullException"></exception>
public static void AddPrintModuleInstall(this IServiceCollection services)
{
if (services == null) throw new ArgumentNullException(nameof(services));
services.AddScoped<IPrintService, PrintService>();
}
}
}

37
ds-wms-service/DS.Module.PrintModule/PrintService.cs
Unescape Escape View File

@ -0,0 +1,37 @@
using DS.Module.Core;
using DS.Module.UserModule;
using Microsoft.Extensions.DependencyInjection;
using NLog;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.Module.PrintModule
{
public class PrintService: IPrintService
{
private readonly IServiceProvider _serviceProvider;
private readonly ISqlSugarClient db;
private readonly IUser user;
private readonly string accessKeyId;
private readonly string accessSecret;
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
/// <summary>
/// 构造函数
/// </summary>
/// <param name="serviceProvider"></param>
public PrintService(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
user = _serviceProvider.GetRequiredService<IUser>();
accessKeyId = AppSetting.app(new string[] { "AliSMS", "AccessKeyId" });
accessSecret = AppSetting.app(new string[] { "AliSMS", "AccessKeySecret" });
}
}
}

6
ds-wms-service/DS.Module.SqlSugar/SqlsugarHelper.cs
Unescape Escape View File

@ -44,6 +44,12 @@ namespace DS.Module.SqlSugar
if (tenantId == null || tenantId == 0)
entityInfo.SetValue(user.GetTenantId());
}
if (entityInfo.PropertyName == "OrgId")
{
var orgId = ((dynamic)entityInfo.EntityValue).OrgId;
if (orgId == null || orgId == 0)
entityInfo.SetValue(user.GetOrgId());
}
if (entityInfo.PropertyName == "CreateBy")
{

2
ds-wms-service/DS.Module.UserModule/AspNetUser.cs
Unescape Escape View File

@ -228,7 +228,7 @@ public class AspNetUser : IUser
if (_orgId == null)
{
var orgIdClaim = GetClaimValueByType("OrgId").FirstOrDefault();
_orgId = orgIdClaim != null ? orgIdClaim.ObjToString() : "1111111111";
_orgId = orgIdClaim != null ? orgIdClaim.ObjToString() : "0";
}
return _orgId;
}

2
ds-wms-service/DS.WMS.Core/Code/Method/CodeFormCopyService.cs
Unescape Escape View File

@ -63,7 +63,7 @@ public class CodeFormCopyService : IFormCopyService
if (req.Id == 0)
{
if (tenantDb.Queryable<CodeFormCopy>()
.Where(x => x.OrgId == long.Parse(user.OrgId) && x.PermissionId == req.PermissionId && x.CreateBy == long.Parse(user.UserId)).Any())
.Where(x => x.OrgId == user.GetOrgId() && x.PermissionId == req.PermissionId && x.CreateBy == long.Parse(user.UserId)).Any())
{
return DataResult.Failed("表单复制字段设置已存在!", MultiLanguageConst.FormCopyExist);
}

3
ds-wms-service/DS.WMS.Core/Code/Method/CodeFormSetService.cs
Unescape Escape View File

@ -56,10 +56,11 @@ public class CodeFormSetService : IFormSetService
public DataResult EditFormSet(CodeFormSetReq req)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
//var orgId = user.GetOrgId();
if (req.Id == 0)
{
if (tenantDb.Queryable<CodeFormSet>()
.Where(x => x.OrgId == long.Parse(user.OrgId) && x.PermissionId == req.PermissionId).Any())
.Where(x => x.OrgId == user.GetOrgId() && x.PermissionId == req.PermissionId).Any())
{
return DataResult.Failed("表单设置已存在!", MultiLanguageConst.FormSetExist);
}

4
ds-wms-service/DS.WMS.Core/System/Method/CommonService.cs
Unescape Escape View File

@ -376,7 +376,7 @@ public class CommonService : ICommonService
OrgId = orgRelation.OrgId.ToString(),
TenantId = userInfo.TenantId.ToString(),
};
var token = JwtHelper.Encrypt(tokenModel, false, false);
var token = JwtHelper.Encrypt(tokenModel, false, true);
var visLog = new SysLogVisit()
{
@ -416,7 +416,7 @@ public class CommonService : ICommonService
OrgId = user.GetOrgId().ToString(),
TenantId = tenantId.ToString(),
};
var refreshToken = JwtHelper.Encrypt(tokenModel, true, false);
var refreshToken = JwtHelper.Encrypt(tokenModel, true, true);
var data = db.Queryable<SysUser>().Filter(null, true).Where(x => x.Id == userId)
.Select(a => new CurrentUserViewModel

98
ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt
Unescape Escape View File

@ -1034,3 +1034,101 @@
2024-04-08 14:09:10.4667 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 14:09:10.4872 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 14:09:10.4984 Info Configuration initialized.
2024-04-08 16:31:07.8305 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 16:31:07.8948 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 16:31:07.9053 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 16:31:07.9344 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 16:31:07.9491 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Release\net8.0\nlog.config
2024-04-08 16:31:07.9569 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 16:31:07.9718 Info Configuration initialized.
2024-04-08 16:32:10.0449 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 16:32:10.0760 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 16:32:10.0851 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 16:32:10.1065 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 16:32:10.1221 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 16:32:10.1296 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 16:32:10.1557 Info Configuration initialized.
2024-04-08 16:49:18.7836 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 16:49:18.8033 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 16:49:18.8033 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 16:49:18.8239 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 16:49:18.8339 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 16:49:18.8339 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 16:49:18.8479 Info Configuration initialized.
2024-04-08 16:59:46.1775 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 16:59:46.2039 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 16:59:46.2039 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 16:59:46.2319 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 16:59:46.2496 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 16:59:46.2496 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 16:59:46.2763 Info Configuration initialized.
2024-04-08 17:00:46.4418 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:00:46.4811 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:00:46.4965 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:00:46.5235 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:00:46.5410 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:00:46.5514 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:00:46.5731 Info Configuration initialized.
2024-04-08 17:05:46.5592 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:05:46.6040 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:05:46.6178 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:05:46.6540 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:05:46.6829 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:05:46.6950 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:05:46.7298 Info Configuration initialized.
2024-04-08 17:07:52.1587 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:07:52.1890 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:07:52.1890 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:07:52.2210 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:07:52.2403 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:07:52.2483 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:07:52.2483 Info Configuration initialized.
2024-04-08 17:11:15.7620 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:11:15.8124 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:11:15.8330 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:11:15.8637 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:11:15.8786 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:11:15.8786 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:11:15.9038 Info Configuration initialized.
2024-04-08 17:14:25.1661 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:14:25.2291 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:14:25.2460 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:14:25.2810 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:14:25.3114 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:14:25.3307 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:14:25.3619 Info Configuration initialized.
2024-04-08 17:15:30.5101 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:15:30.6174 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:15:30.6373 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:15:30.7669 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:15:30.8144 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:15:30.8382 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:15:30.8714 Info Configuration initialized.
2024-04-08 17:21:34.7371 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:21:35.0378 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:21:35.0595 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:21:35.1049 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:21:35.1372 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:21:35.1616 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:21:35.2097 Info Configuration initialized.
2024-04-08 17:37:32.8181 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:37:32.8443 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:37:32.8443 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:37:32.8728 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:37:32.8728 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:37:32.8939 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:37:32.9082 Info Configuration initialized.
2024-04-08 17:40:12.3325 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:40:12.3641 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:40:12.3732 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:40:12.4012 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:40:12.4320 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:40:12.4464 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:40:12.4719 Info Configuration initialized.
2024-04-08 17:44:13.5165 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-04-08 17:44:13.5602 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-04-08 17:44:13.5602 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-04-08 17:44:13.5999 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-04-08 17:44:13.6177 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-04-08 17:44:13.6281 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-04-08 17:44:13.6504 Info Configuration initialized.

15
ds-wms-service/ds-wms-service.sln
Unescape Escape View File

@ -61,13 +61,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ds.WMS.WebCore", "Ds.WMS.We
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ds.WMS.MogonDb", "Ds.WMS.MogonDb\Ds.WMS.MogonDb.csproj", "{47702656-3E62-4477-B72C-ADA39034B5A7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.WMS.Test", "DS.WMS.Test\DS.WMS.Test.csproj", "{A8749917-1B4C-4976-98F7-C0A1B043DE38}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.Test", "DS.WMS.Test\DS.WMS.Test.csproj", "{A8749917-1B4C-4976-98F7-C0A1B043DE38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.Module.MultiLanguage", "DS.Module.MultiLanguage\DS.Module.MultiLanguage.csproj", "{FE82ABD4-CE11-49F6-823C-6E0B64135FFC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.MultiLanguage", "DS.Module.MultiLanguage\DS.Module.MultiLanguage.csproj", "{FE82ABD4-CE11-49F6-823C-6E0B64135FFC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.Module.Log", "DS.Module.Log\DS.Module.Log.csproj", "{739899DE-D41F-4083-94E1-EDA349344ECC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.Log", "DS.Module.Log\DS.Module.Log.csproj", "{739899DE-D41F-4083-94E1-EDA349344ECC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.Module.Middleware", "DS.Module.Middleware\DS.Module.Middleware.csproj", "{B0351554-748F-4DF8-8C22-152646937EFE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.Middleware", "DS.Module.Middleware\DS.Module.Middleware.csproj", "{B0351554-748F-4DF8-8C22-152646937EFE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.Module.PrintModule", "DS.Module.PrintModule\DS.Module.PrintModule.csproj", "{F7ACC016-4181-4B26-9550-FB18A2053503}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -191,6 +193,10 @@ Global
{B0351554-748F-4DF8-8C22-152646937EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B0351554-748F-4DF8-8C22-152646937EFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B0351554-748F-4DF8-8C22-152646937EFE}.Release|Any CPU.Build.0 = Release|Any CPU
{F7ACC016-4181-4B26-9550-FB18A2053503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7ACC016-4181-4B26-9550-FB18A2053503}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7ACC016-4181-4B26-9550-FB18A2053503}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7ACC016-4181-4B26-9550-FB18A2053503}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -225,6 +231,7 @@ Global
{FE82ABD4-CE11-49F6-823C-6E0B64135FFC} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{739899DE-D41F-4083-94E1-EDA349344ECC} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{B0351554-748F-4DF8-8C22-152646937EFE} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{F7ACC016-4181-4B26-9550-FB18A2053503} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {66115F23-94B4-43C0-838E-33B5CF77F788}

Write Preview
Loading…
Cancel
Save