SW/SystemX.Web
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[성현모] Config 기능 추가, Socket Recv Json, string 기능 분리

Browse Source
This commit is contained in:
SHM
2025-04-21 12:00:24 +09:00
parent a12a3949bf
commit aaf104a915
21 changed files with 550 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Projects/HubX/Config/HubX.WebApiConfig.json Normal file
View File

@ -0,0 +1,32 @@
{
"Server": {
"Address": "https://*",
"Port": 9000,
"IIS": false
},
"Socket": {
"Address": "*",
"Port": 9010,
"IIS": false
},
"DataBase": [
{
"IP": "127.0.0.1",
"Port": 1433,
"DBName": "HubX",
"DBID": 1,
"DBContext": "HubXContext",
"UserID": "alis",
"Password": "Kefico!@34"
},
{
"IP": "127.0.0.1",
"Port": 1433,
"DBName": "HubX_DEV",
"DBID": 2,
"DBContext": "HubXContext",
"UserID": "alis",
"Password": "Kefico!@34"
}
]
}

77
Projects/HubX/Config/log4net.config Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<log4net>
<root>
<level value="ALL"/>
<appender-ref ref="Console"/>
<appender-ref ref="file"/>
<appender-ref ref="fatal_file"/>
</root>
<appender name="Console" type="log4net.Appender.ManagedColoredConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date] [%thread] %-6level: %message%newline" />
</layout>
<mapping>
<level value="FATAL" />
<foreColor value="White" />
<backColor value="Red" />
</mapping>
<mapping>
<level value="ERROR" />
<foreColor value="Red" />
</mapping>
<mapping>
<level value="WARN" />
<foreColor value="Yellow" />
</mapping>
<mapping>
<level value="INFO" />
<foreColor value="Green" />
</mapping>
<mapping>
<level value="DEBUG" />
<foreColor value="Blue" />
</mapping>
<mapping>
<level value="DB" />
<foreColor value="DarkMagenta" />
</mapping>
<mapping>
<level value="HTTP" />
<foreColor value="DarkYellow" />
</mapping>
<mapping>
<level value="SOCKET" />
<foreColor value="DarkCyan" />
</mapping>
</appender>
<appender name="file" type="log4net.Appender.RollingFileAppender">
<file value="log/" />
<datepattern value="yyyy////MM////yyyy-MM-dd'.log'"/>
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date] [%thread] %level %logger - %message%newline" />
</layout>
</appender>
<appender name="fatal_file" type="log4net.Appender.RollingFileAppender">
<file value="log/" />
<datepattern value="yyyy////MM////yyyy-MM-dd'_fatal.log'"/>
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
<filter type="log4net.Filter.LevelRangeFilter">
<param name="LevelMin" value="FATAL" />
<param name="LevelMax" value="FATAL" />
</filter>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date] [%thread] %level %logger - %message%newline" />
</layout>
</appender>
</log4net>
</configuration>

BIN
Projects/HubX/DBPatch/sqlScripts/dacpac/HubX.DB.dacpac
View File

Binary file not shown.

20
Projects/HubX/HubX.Library/Config/WebApiConfig.cs Normal file
View File

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using SystemX.Core.Config;
using SystemX.Core.Config.Model;
namespace HubX.Library.Config
{
public class WebApiConfig : WebCommonConfig
{
[JsonPropertyName("DataBase")]
public List<SystemX.Core.Config.Model.DataBase>? DataBase { get; set; }
[JsonPropertyName("Socket")]
public Server Socket { get; set; }
}
}

29
Projects/HubX/HubX.Library/DataBase/DBManager.cs Normal file
View File

@ -0,0 +1,29 @@
using Azure.Core;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HubX.Library.DataBase
{
public class DBManager
{
public DBManager()
{
}
public async Task Insert<T>(T context) where T : DbContext
{
//using (var transaction = await context.CreateTransactionAsync())
//{
// if (context.TCertificates.ToList().Exists(x => x.CCuid == tbscsr.CCuid) == false)
// {
// await context.AddAsync(certificate);
// }
// transactionResult = await context.CloseTransactionAsync(transaction);
//}
}
}
}

48
Projects/HubX/HubX.Library/Socket/Packet/PacketHandler.cs
View File

@ -13,31 +13,37 @@ namespace HubX.Library.Socket.Packet
public class PacketHandler
{
public static void C2S_INSERT_UniqueKeyHandler(PacketSession session, IMessage packet)
{
C2S_INSERT_UniqueKey movePacket = packet as C2S_INSERT_UniqueKey;
ClientSession clientSession = session as ClientSession;
public static void C2S_INSERT_UniqueKeyHandler(PacketSession session, ArraySegment<byte> buffer)
{
var recvData = Encoding.UTF8.GetString(buffer);
//convert to object
var jsonObject = recvData.ToObject<C2S_INSERT_UniqueKey>();
if (jsonObject == null)
{
var recvDataList = recvData.Split(",");
jsonObject = new C2S_INSERT_UniqueKey
{
Identity = recvDataList[0],
Data1 = recvDataList[1],
Data2 = recvDataList[2],
Data3 = recvDataList[3],
Data4 = recvDataList[4],
Data5 = recvDataList[5],
};
}
//insert DB
if(jsonObject != null)
{
}
ClientSession clientSession = session as ClientSession;
Client client = clientSession.Client;
if (client == null)
return;
}
public static void C_SkillHandler(PacketSession session, IMessage packet)
{
//C_Skill skillPacket = packet as C_Skill;
//ClientSession clientSession = session as ClientSession;
//Player player = clientSession.MyPlayer;
//if (player == null)
// return;
//GameRoom room = player.Room;
//if (room == null)
// return;
//room.Push(room.HandleSkill, player, skillPacket);
}
}
}

4
Projects/HubX/HubX.Library/Socket/Packet/Protocol.cs
View File

@ -12,12 +12,12 @@ namespace HubX.Library.Socket.Packet
public class C2S : IMessage
{
public EnumMessageId MessageId { get; set; }
// public EnumMessageId MessageId { get; set; }
}
public class S2C : IMessage
{
public EnumMessageId MessageId { get; set; }
// public EnumMessageId MessageId { get; set; }
public EnumMessageResult Result { get; set; }
}

27
Projects/HubX/HubX.Library/Socket/Packet/ServerPacketManager.cs
View File

@ -20,9 +20,9 @@ namespace HubX.Library.Socket.Packet
}
Dictionary<ushort, Action<PacketSession, ArraySegment<byte>, ushort>> _onRecv = new Dictionary<ushort, Action<PacketSession, ArraySegment<byte>, ushort>>();
Dictionary<ushort, Action<PacketSession, IMessage>> _handler = new Dictionary<ushort, Action<PacketSession, IMessage>>();
Dictionary<ushort, Action<PacketSession, ArraySegment<byte>>> _handler = new Dictionary<ushort, Action<PacketSession, ArraySegment<byte>>>();
public Action<PacketSession, IMessage, ushort> CustomHandler { get; set; }
public Action<PacketSession, ArraySegment<byte>, ushort> CustomHandler { get; set; }
public void Register()
{
@ -39,31 +39,34 @@ namespace HubX.Library.Socket.Packet
ushort id = BitConverter.ToUInt16(buffer.Array, buffer.Offset + count);
count += 2;
Action<PacketSession, ArraySegment<byte>, ushort> action = null;
if (_onRecv.TryGetValue(id, out action))
action.Invoke(session, buffer, id);
ushort packetSize = (ushort)(buffer.Count - count);
byte[] packet = new byte[packetSize];
Array.Copy(buffer.ToArray(), count, packet, 0, packetSize);
if (_onRecv.TryGetValue(id, out var action))
action.Invoke(session, packet, id);
}
void MakePacket<T>(PacketSession session, ArraySegment<byte> buffer, ushort id) where T : IMessage, new()
void MakePacket<T>(PacketSession session, ArraySegment<byte> buffer, ushort id) where T : new()
{
T pkt = new T();
// T pkt = new T();
//pkt.MergeFrom(buffer.Array, buffer.Offset + 4, buffer.Count - 4);
if (CustomHandler != null)
{
CustomHandler.Invoke(session, pkt, id);
CustomHandler.Invoke(session, buffer, id);
}
else
{
Action<PacketSession, IMessage> action = null;
Action<PacketSession, ArraySegment<byte>> action = null;
if (_handler.TryGetValue(id, out action))
action.Invoke(session, pkt);
action.Invoke(session, buffer);
}
}
public Action<PacketSession, IMessage> GetPacketHandler(ushort id)
public Action<PacketSession, ArraySegment<byte>> GetPacketHandler(ushort id)
{
Action<PacketSession, IMessage> action = null;
Action<PacketSession, ArraySegment<byte>> action = null;
if (_handler.TryGetValue(id, out action))
return action;
return null;

98
Projects/HubX/HubX.Server/Program.cs
View File

@ -1,7 +1,23 @@
using HubX.Library.Config;
using HubX.Library.Socket.Session;
using HubX.Server;
using HubX.Server.TaskManager;
using System.Net;
using System.Net.Sockets;
using SystemX.Core.Communication;
using SystemX.Core.Services;
string configDir = @"../Config";
//raed log4net config
if (Log4net.IsConfigLoad == true)
{
Log4net.WriteLine("Log4net Init Success");
}
else
{
Log4net.WriteLine("Log4net Init Failed", LogType.Error);
}
var builder = WebApplication.CreateBuilder(args);
@ -12,41 +28,61 @@ builder.Services.AddControllers();
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
//singleton
builder.Services.AddSingleton<ConfigService<WebApiConfig>>();
//config preload
ConfigService<WebApiConfig> preloadConfig = new ConfigService<WebApiConfig>();
if (preloadConfig.OpenConfig($@"{configDir}/HubX.WebApiConfig.json") == true)
{
var config = preloadConfig.GetConfig();
}
else
{
Console.WriteLine("Config Preload Load Error.");
return;
}
var app = builder.Build();
//read api config and set
string serverUrl = string.Empty;
var configService = app.Services.GetService<ConfigService<WebApiConfig>>();
bool isIIS = false;
int socketPort = 0;
if (configService?.OpenConfig($@"{configDir}/HubX.WebApiConfig.json") == true)
{
Log4net.WriteLine("WebApi Config Success.");
var apiConfig = ConfigService<WebApiConfig>.Config;
if (apiConfig != null)
{
serverUrl = $"{apiConfig.Server.Address}:{apiConfig.Server.Port}";
isIIS = apiConfig.Server.IIS;
//socket
socketPort = apiConfig.Socket.Port;
}
}
else
{
Log4net.WriteLine("WebApi Config Error.");
return;
}
// Configure the HTTP request pipeline.
if (app.Environment.IsDevelopment())
{
Log4net.WriteLine($"IsDevelopment:{app.Environment.IsDevelopment()}");
Log4net.WriteLine($"Swagger Url: {serverUrl}/swagger");
app.UseSwagger();
app.UseSwaggerUI();
}
Log4net.WriteLine("Run");
Log4net.WriteLine("Custom LogLevel",LogType.DB);
WeatherForecast weatherForecast = new WeatherForecast();
weatherForecast.Summary = "so hot";
var strJson = weatherForecast.ToJson();
var deep = weatherForecast.DeepCopy();
deep.Summary = "so cool";
var rr = strJson.ToObject<WeatherForecast>();
Task.Run(async() =>
{
await Task.Delay(2000);
Listener _listener = new Listener();
// string host = Dns.GetHostName();
IPHostEntry ipHost = Dns.GetHostEntry("127.0.0.1");
IPAddress ipAddr = ipHost.AddressList[0];
IPEndPoint endPoint = new IPEndPoint(ipAddr, 7777);
_listener.Init(endPoint, () => { return SessionManager.Instance.Generate(); });
Console.WriteLine("Listening...");
});
TaskSocket taskSocket = new TaskSocket();
taskSocket?.Run(socketPort);
app.UseHttpsRedirection();
@ -54,4 +90,12 @@ app.UseAuthorization();
app.MapControllers();
app.Run();
if (isIIS == true)
{
app.Run();
}
else
{
Log4net.WriteLine($"Operation Url: {serverUrl}");
app.Run($"{serverUrl}");
}

29
Projects/HubX/HubX.Server/TaskManager/TaskSocket.cs Normal file
View File

@ -0,0 +1,29 @@
using HubX.Library.Socket.Session;
using System.Net;
using SystemX.Core.Communication;
namespace HubX.Server.TaskManager
{
public class TaskSocket
{
public async Task Run(int socketPort = 7777)
{
try
{
await Task.Delay(1000);
Listener _listener = new Listener();
IPEndPoint endPoint = new IPEndPoint(IPAddress.Any, socketPort);
_listener.Init(endPoint, () => { return SessionManager.Instance.Generate(); });
Log4net.WriteLine($"Address:{endPoint.Address}, Port:{socketPort}", LogType.SOCKET);
Log4net.WriteLine($"Socket Listening Start", LogType.SOCKET);
}
catch (Exception e)
{
Log4net.WriteLine("Socket Run Failed",LogType.Error);
Log4net.WriteLine(e);
}
}
}
}

9
Projects/HubX/HubX.sln
View File

@ -7,9 +7,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HubX.Server", "HubX.Server\
EndProject
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "HubX.DB", "HubX.DB\HubX.DB.sqlproj", "{514DDCCF-6B50-49F8-B212-70498396CF19}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HubX.Library", "HubX.Library\HubX.Library.csproj", "{E6FA1D27-A644-4E50-BF16-DCCA59AA378D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HubX.Library", "HubX.Library\HubX.Library.csproj", "{E6FA1D27-A644-4E50-BF16-DCCA59AA378D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HubX.Library.DB", "HubX.Library.DB\HubX.Library.DB.csproj", "{C43CF1F1-9CB0-44DC-89D7-3514F18EAD46}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HubX.Library.DB", "HubX.Library.DB\HubX.Library.DB.csproj", "{C43CF1F1-9CB0-44DC-89D7-3514F18EAD46}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{18B1BDDB-B76F-43A4-BBE8-805CEEF35CE0}"
ProjectSection(SolutionItems) = preProject
Config\HubX.WebApiConfig.json = Config\HubX.WebApiConfig.json
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution