ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Waldi
2016-12-08 14:18:30 +01:00
parent b1fe39b26f af1e2ac131
commit 82a32c469d
38 changed files with 334 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
BeWoChatServer/Server.cs
View File

@@ -123,7 +123,7 @@ namespace BeWoChatServer
var dataPacket = (Packet) asyncResult.AsyncState;
Console.WriteLine(DateTime.Now + ": Empfange Nachricht");
Console.WriteLine(DateTime.Now + ": Empfange Nachricht (" + dataPacket.DataIdentifier.ToString() + ")");
LogAllClients();
@@ -307,7 +307,7 @@ namespace BeWoChatServer
DAOFactory.GenericDAO.Insert(chatMessage);
var newestMessage = DAOFactory.SearchDAO.GetNewestChatMessageForConversation(dataPacket.RecipientPersonOid, dataPacket.SenderPersonOid, false);
var newestChatMessage = new NewestChatMessage()
var newestChatMessage = new NewestChatMessage
{
ChatMessageOid = chatMessage.Oid,
IsTeam = false,
@@ -437,7 +437,7 @@ namespace BeWoChatServer
DAOFactory.GenericDAO.Insert(chatMessage);
var newestMessage = DAOFactory.SearchDAO.GetNewestChatMessageForConversation(dataPacket.RecipientPersonOid, dataPacket.SenderPersonOid, true);
var newestChatMessage = new NewestChatMessage()
var newestChatMessage = new NewestChatMessage
{
ChatMessageOid = chatMessage.Oid,
IsTeam = true,
@@ -604,6 +604,14 @@ namespace BeWoChatServer
}
}
private static Random random = new Random();
public static string RandomString(int length)
{
const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
return new string(Enumerable.Repeat(chars, length)
.Select(s => s[random.Next(s.Length)]).ToArray());
}
private static void SendNotificationPacket(Packet dataPacket, DataIdentifier dataIdentifier)
{
var notificationPacket = new Packet(dataPacket.Socket, dataPacket.ClientName, dataPacket.SenderPersonOid, 0, dataPacket.IsEmployee) { DataIdentifier = DataIdentifier.StatusNotificationLogout, Tenant = dataPacket.Tenant};