xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【修复】修复 lua proto 对于bytes类型，生成writeString和readString的bug 

【调整】将Gen.Client连接超时由100ms延长到3s,生成超时由30s延长到120s
【调整】生成的docker映象由 luban.server 改成 luban-server
【新增】新增 tag_and_push.bat 发布luban-server到 docker hub
main
walon 2020-12-14 12:34:38 +08:00
parent 623fdee881
commit 8988f57035
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Luban.Client/Source/Net/GenClient.cs
View File

@ -39,7 +39,7 @@ namespace Luban.Client.Common.Net
var c = new TcpClientBootstrap var c = new TcpClientBootstrap
{ {
RemoteAddress = new IPEndPoint(IPAddress.Parse(host), port), RemoteAddress = new IPEndPoint(IPAddress.Parse(host), port),
ConnectTimeoutMills = 100, ConnectTimeoutMills = 3000,
EventLoop = new EventLoop(null), EventLoop = new EventLoop(null),
InitHandler = ch => InitHandler = ch =>
{ {

2
src/Luban.Client/Source/Program.cs
View File

@ -177,7 +177,7 @@ Options:
Environment.Exit(exitCode); Environment.Exit(exitCode);
} }
const int GEN_JOB_TIMEOUT = 30; const int GEN_JOB_TIMEOUT = 120;
private static int SubmitGenJob(CommandLineOptions options) private static int SubmitGenJob(CommandLineOptions options)
{ {

2
src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs
View File

@ -68,7 +68,7 @@ namespace Luban.Job.Common.TypeVisitors
public string Accept(TBytes type) public string Accept(TBytes type)
{ {
return "readString"; return "readBytes";
} }
public string Accept(TText type) public string Accept(TText type)

2
src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs
View File

@ -68,7 +68,7 @@ namespace Luban.Job.Common.TypeVisitors
public string Accept(TBytes type) public string Accept(TBytes type)
{ {
return "writeString"; return "writeBytes";
} }
public string Accept(TText type) public string Accept(TText type)

6
src/Luban.Job.Proto/Luban.Job.Proto.csproj
View File

@ -6,11 +6,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Luban.Job.Common\Luban.Job.Common.csproj" /> <Compile Remove="Source\TypeVisitors\**" />
<EmbeddedResource Remove="Source\TypeVisitors\**" />
<None Remove="Source\TypeVisitors\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Source\TypeVisitors\" /> <ProjectReference Include="..\Luban.Job.Common\Luban.Job.Common.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Luban.Server/Scripts/build_docker.bat
View File

@ -1,2 +1,2 @@
docker build -t luban.server:latest -f Dockerfile ../.. docker build -t luban-server:latest -f Dockerfile ../..
pause pause

3
src/Luban.Server/Scripts/tag_and_push.bat 100644
View File

@ -0,0 +1,3 @@
docker tag luban-server:latest focuscreativegames/luban-server:latest
docker push focuscreativegames/luban-server:latest
pause