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

Merge branch 'master'

Browse Source
This commit is contained in:
Waldi
2016-08-08 09:06:52 +02:00
parent 6c90ad6bc9 dbf9c538db
commit 8af90882d6
29 changed files with 586 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BeWoChatServer/Multitenancy/demo.config
View File

@@ -15,13 +15,13 @@
NHibernate.Driver.MySqlDataDriver
</property>
<property name="connection.connection_string">
<!-- <property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=bewodemo
</property>
</property>-->
<!--<property name="connection.connection_string">
<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=1234567890
</property>-->
</property>
<property name="dialect">
NHibernate.Dialect.MySQLDialect

13
BeWoChatServer/Server.cs
View File

@@ -131,7 +131,7 @@ namespace BeWoChatServer
}
// Boradcast
var abc = clientList.Select(s => s.Value).Distinct().ToList();
var abc = clientList.Where(w => w.Value != dataPacket.SenderPersonOid).Select(s => s.Value).Distinct().ToList();
var msg = "";
foreach(var oid in abc)
@@ -144,9 +144,12 @@ namespace BeWoChatServer
}
}
var packet = new Packet {ChatMessage = msg, ClientName = dataPacket.ClientName, DataIdentifier = DataIdentifier.StatusNotificationLoginBroadcast, MessageTimeStamp = DateTime.Now, Tenant = dataPacket.Tenant, SenderPersonOid = dataPacket.SenderPersonOid};
if(msg.Length > 0)
{
var packet = new Packet {ChatMessage = msg, ClientName = dataPacket.ClientName, DataIdentifier = DataIdentifier.StatusNotificationLoginBroadcast, MessageTimeStamp = DateTime.Now, Tenant = dataPacket.Tenant, SenderPersonOid = dataPacket.SenderPersonOid};
dataPacket.Socket.Send(packet.GetDataStream());
dataPacket.Socket.Send(packet.GetDataStream());
}
break;
case DataIdentifier.Message:
@@ -198,6 +201,10 @@ namespace BeWoChatServer
{
recipient.Key.Send(dataPacket.GetDataStream());
}
var packet = new Packet {ClientseitigeOid = dataPacket.ClientseitigeOid, ServerseitigeOid = dataPacket.ServerseitigeOid, DataIdentifier = DataIdentifier.MessageResponse};
dataPacket.Socket.Send(packet.GetDataStream());
}
}
finally