Ilfedotov.01/ISEbd-21.Fedotov.I.A.Diner
Ilfedotov.01/ISEbd-21.Fedotov.I.A.Diner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-21.Fedotov.I.A.LabWork08 #8

Closed
Ilfedotov.01 wants to merge 5 commits from ISEbd-21.Fedotov.I.A.LabWork08 into ISEbd-21.Fedotov.I.A.LabWork07
pull from: ISEbd-21.Fedotov.I.A.LabWork08
merge into: Ilfedotov.01:ISEbd-21.Fedotov.I.A.LabWork07
Conversation 1 Commits 5 Files Changed 66 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 03b8907a2f - Show all commits

1
Diner/DinerDataBaseImplement/Models/Food.cs
View File

@ -9,7 +9,6 @@ using System.Linq;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq;
namespace DinerDataBaseImplement.Models namespace DinerDataBaseImplement.Models
{ {

8
Diner/DineryBusinessLogic/BusinessLogic/BackUpLogic.cs
View File

@ -11,6 +11,7 @@ using System.Linq;
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Reflection; using System.Reflection;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -32,7 +33,7 @@ namespace DineryBusinessLogic.BusinessLogic {
} }
try { try {
_logger.LogDebug("Clera folder"); _logger.LogDebug("Clear folder");
// зачистка папки и удаление старого архива // зачистка папки и удаление старого архива
var dirInfo = new DirectoryInfo(model.FolderName); var dirInfo = new DirectoryInfo(model.FolderName);
if (dirInfo.Exists) { if (dirInfo.Exists) {
@ -81,8 +82,9 @@ namespace DineryBusinessLogic.BusinessLogic {
if (records == null) { if (records == null) {
_logger.LogWarning($"{typeof(T).Name} type get null list"); _logger.LogWarning($"{typeof(T).Name} type get null list");
} }
var jsonFormatter = new DataContractSerializer(typeof(List<T>)); var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
using var fs = new FileStream(string.Format($"{folderName}/{typeof(T).Name}.json"), FileMode.OpenOrCreate);
using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
jsonFormatter.WriteObject(fs, records); jsonFormatter.WriteObject(fs, records);
} }
} }